caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

More loop results cleanup and i18n.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2018-03-19 13:10:09 +01:00
parent 706bb913e9
commit f918a5f303
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
17 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
View file

@ -97,7 +97,8 @@ public class PumpEnactResult {
if (bolusDelivered > 0) {
ret += "\n" + MainApp.sResources.getString(R.string.enacted) + ": " + enacted;
ret += "\n" + MainApp.sResources.getString(R.string.comment) + ": " + comment;
ret += "\n" + MainApp.sResources.getString(R.string.smb_shortname) + ": " + bolusDelivered + "U";
ret += "\n" + MainApp.sResources.getString(R.string.smb_shortname)
+ ": " + bolusDelivered + " " + MainApp.gs(R.string.insulin_unit_shortname);
} else if (isTempCancel) {
ret += "\n" + MainApp.sResources.getString(R.string.enacted) + ": " + enacted;
if (!comment.isEmpty())
@ -131,7 +132,7 @@ public class PumpEnactResult {
ret += "<br><b>" + MainApp.sResources.getString(R.string.enacted) + "</b>: " + enacted;
if (!comment.isEmpty())
ret += "<br><b>" + MainApp.sResources.getString(R.string.comment) + "</b>: " + comment;
ret += "<br><b>" + MainApp.sResources.getString(R.string.smb_shortname) + "</b>: " + bolusDelivered + "U";
ret += "<br><b>" + MainApp.sResources.getString(R.string.smb_shortname) + "</b>: " + bolusDelivered + " " + MainApp.gs(R.string.insulin_unit_shortname);
} else if (isTempCancel) {
ret += "<br><b>" + MainApp.sResources.getString(R.string.enacted) + "</b>: " + enacted;
ret += "<br><b>" + MainApp.sResources.getString(R.string.comment) + "</b>: " + comment +

7
app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
View file

@ -389,7 +389,8 @@ public class ConfigBuilderPlugin implements PluginBase, ConstraintsInterface, Tr
if (Config.logCongigBuilderActions)
log.debug("applyAPSRequest: Basal set correctly");
if (callback != null) {
callback.result(new PumpEnactResult().absolute(request.rate).duration(0).enacted(false).success(true).comment("Basal set correctly")).run();
callback.result(new PumpEnactResult().absolute(request.rate).duration(0)
.enacted(false).success(true).comment(MainApp.gs(R.string.basal_set_correctly))).run();
}
}
} else if (activeTemp != null
@ -398,7 +399,9 @@ public class ConfigBuilderPlugin implements PluginBase, ConstraintsInterface, Tr
if (Config.logCongigBuilderActions)
log.debug("applyAPSRequest: Temp basal set correctly");
if (callback != null) {
callback.result(new PumpEnactResult().absolute(activeTemp.tempBasalConvertedToAbsolute(now, profile)).duration(activeTemp.getPlannedRemainingMinutes()).enacted(false).success(true).comment("Temp basal set correctly")).run();
callback.result(new PumpEnactResult().absolute(activeTemp.tempBasalConvertedToAbsolute(now, profile))
.enacted(false).success(true).duration(activeTemp.getPlannedRemainingMinutes())
.comment(MainApp.gs(R.string.let_temp_basal_run))).run();
}
} else {
if (Config.logCongigBuilderActions)

4
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
View file

@ -233,7 +233,7 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
// reservoir
int reservoirLevel = plugin.getPump().reservoirLevel;
if (reservoirLevel != -1) {
reservoirView.setText(reservoirLevel + " " + MainApp.sResources.getString(R.string.treatments_wizard_unit_label));
reservoirView.setText(reservoirLevel + " " + MainApp.sResources.getString(R.string.insulin_unit_shortname));
} else if (ps.insulinState == PumpState.LOW) {
reservoirView.setText(MainApp.gs(R.string.combo_reservoir_low));
} else if (ps.insulinState == PumpState.EMPTY) {
@ -275,7 +275,7 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
if (bolus != null) {
long agoMsc = System.currentTimeMillis() - bolus.timestamp;
double bolusMinAgo = agoMsc / 60d / 1000d;
String unit = MainApp.gs(R.string.treatments_wizard_unit_label);
String unit = MainApp.gs(R.string.insulin_unit_shortname);
String ago;
if ((agoMsc < 60 * 1000)) {
ago = MainApp.gs(R.string.combo_pump_connected_now);

2
app/src/main/res/layout/overview_wizard_dialog.xml
View file

@ -108,7 +108,7 @@
android:gravity="left"
android:minWidth="45dp"
android:paddingLeft="5dp"
android:text="@string/treatments_wizard_unit_label"
android:text="@string/insulin_unit_shortname"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>

2
app/src/main/res/values-bg/strings.xml
View file

@ -40,7 +40,7 @@
<string name="treatments_wizard_bg_label">КЗ</string>
<string name="treatments_wizard_carbs_label">ВХ</string>
<string name="treatments_wizard_correction_label">Корекция</string>
<string name="treatments_wizard_unit_label">Ед</string>
<string name="insulin_unit_shortname">Ед</string>
<string name="treatments_wizard_bolusiob_label">IOB от болуси</string>
<string name="openapsma_run">Старт сега</string>
<string name="pump_basebasalrate_label">Базова базална стойност</string>

2
app/src/main/res/values-cs/strings.xml
View file

@ -139,7 +139,7 @@
<string name="treatments_wizard_bolusiob_label">Bolusové IOB</string>
<string name="treatments_wizard_carbs_label">Sacharidy</string>
<string name="treatments_wizard_correction_label">Korekce</string>
<string name="treatments_wizard_unit_label">U</string>
<string name="insulin_unit_shortname">U</string>
<string name="treatmentssafety_maxbolus_title">Maximální povolený bolus [U]</string>
<string name="treatmentssafety_maxcarbs_title">Maximální povolené sacharidy [g]</string>
<string name="treatmentssafety_title">Bezpečnost zadání ošetřeni</string>

2
app/src/main/res/values-de/strings.xml
View file

@ -84,7 +84,7 @@
<string name="treatments_iobactivitytotal_label_string">Aktives Gesamt-IOB:</string>
<string name="treatments_iobtotal_label_string">Gesamt-IOB:</string>
<string name="treatments_wizard_basaliob_label">Basal-IOB</string>
<string name="treatments_wizard_unit_label">IE</string>
<string name="insulin_unit_shortname">IE</string>
<string name="virtualpump">Virtuelle Pumpe</string>
<string name="pump_reservoir_label">Reservoir</string>
<string name="xdrip">xDrip</string>

2
app/src/main/res/values-el/strings.xml
View file

@ -42,7 +42,7 @@
<string name="treatments_wizard_tt_label">TT</string>
<string name="treatments_wizard_carbs_label">Υδατάνθρακες</string>
<string name="treatments_wizard_correction_label">Διόρθωση</string>
<string name="treatments_wizard_unit_label">U</string>
<string name="insulin_unit_shortname">U</string>
<string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
<string name="openapsma_run">Έναρξη τώρα</string>
<string name="vitualpump_label">ΕΙΚΟΝΙΚΗ ΑΝΤΛΙΑ</string>

2
app/src/main/res/values-es/strings.xml
View file

@ -36,7 +36,7 @@
<string name="treatments_wizard_bg_label">Glucosa</string>
<string name="treatments_wizard_carbs_label">Hidratos Carbono</string>
<string name="treatments_wizard_correction_label">Corrección</string>
<string name="treatments_wizard_unit_label">U</string>
<string name="insulin_unit_shortname">U</string>
<string name="treatments_wizard_bolusiob_label">Bolo IOB</string>
<string name="openapsma_run">Ejecutar ahora</string>
<string name="vitualpump_label">BOMBA VIRTUAL</string>

2
app/src/main/res/values-fr/strings.xml
View file

@ -42,7 +42,7 @@
<string name="treatments_wizard_tt_label">CT</string>
<string name="treatments_wizard_carbs_label">Glucides</string>
<string name="treatments_wizard_correction_label">Corr</string>
<string name="treatments_wizard_unit_label">U</string>
<string name="insulin_unit_shortname">U</string>
<string name="treatments_wizard_bolusiob_label">Bolus IR</string>
<string name="openapsma_run">"Exécuter maintenant "</string>
<string name="vitualpump_label">POMPE VIRTUELLE</string>

2
app/src/main/res/values-it/strings.xml
View file

@ -425,7 +425,7 @@
<string name="treatmentssafety_title">Sicurezza delle prestazioni</string>
<string name="treatmentssafety_maxcarbs_title">Valore massimo carbo (g)</string>
<string name="treatmentssafety_maxbolus_title">Bolo massimo (U)</string>
<string name="treatments_wizard_unit_label">U</string>
<string name="insulin_unit_shortname">U</string>
<string name="treatments_wizard_correction_label">Correzione</string>
<string name="treatments_wizard_cob_label">COB</string>
<string name="treatments_wizard_carbs_label">Carboidrati</string>

2
app/src/main/res/values-ko/strings.xml
View file

@ -40,7 +40,7 @@
<string name="treatments_wizard_bg_label">혈당</string>
<string name="treatments_wizard_carbs_label">탄수화물</string>
<string name="treatments_wizard_correction_label">교정</string>
<string name="treatments_wizard_unit_label">U</string>
<string name="insulin_unit_shortname">U</string>
<string name="treatments_wizard_bolusiob_label">식사주입 IOB</string>
<string name="openapsma_run">지금 실행</string>
<string name="vitualpump_label">가상 펌프</string>

2
app/src/main/res/values-nl/strings.xml
View file

@ -347,7 +347,7 @@
<string name="nsclientinternal_autoscroll">Autoscroll</string>
<string name="nsclientinternal_secret_dialogmessage">Geen NS API geheim op (min 12 kar.)</string>
<string name="treatmentssafety_maxbolus_title">Max toegestane bolus [E]</string>
<string name="treatments_wizard_unit_label">E</string>
<string name="insulin_unit_shortname">E</string>
<string name="treatments_wizard_correction_label">Correctie</string>
<string name="treatments_wizard_cob_label">COB</string>
<string name="treatments_wizard_carbs_label">Koolhydraten</string>

2
app/src/main/res/values-ro/strings.xml
View file

@ -42,7 +42,7 @@
<string name="treatments_wizard_bg_label">BG</string>
<string name="treatments_wizard_carbs_label">Carbohidrați</string>
<string name="treatments_wizard_correction_label">Corecție</string>
<string name="treatments_wizard_unit_label">U</string>
<string name="insulin_unit_shortname">U</string>
<string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
<string name="openapsma_run">Fă acum</string>
<string name="vitualpump_label">POMPĂ VIRTUALĂ</string>

2
app/src/main/res/values-ru/strings.xml
View file

@ -482,7 +482,7 @@
<string name="treatments_wizard_carbs_label">углеводы</string>
<string name="treatments_wizard_cob_label">активн углеводы</string>
<string name="treatments_wizard_correction_label">коррекция</string>
<string name="treatments_wizard_unit_label">ед</string>
<string name="insulin_unit_shortname">ед</string>
<string name="treatmentssafety_maxbolus_title">макс разрешенный болюс</string>
<string name="treatmentssafety_maxcarbs_title">макс разрешенные углеводы (г)</string>
<string name="treatmentssafety_title">безопасность назначений</string>

2
app/src/main/res/values-sv/strings.xml
View file

@ -303,7 +303,7 @@
<string name="treatmentssafety_title">Säkerhet vid behandling</string>
<string name="treatmentssafety_maxcarbs_title">Max tillåtna KH (g)</string>
<string name="treatmentssafety_maxbolus_title">Max tillåten bolus [E]</string>
<string name="treatments_wizard_unit_label">E</string>
<string name="insulin_unit_shortname">E</string>
<string name="treatments_wizard_correction_label">Korr</string>
<string name="treatments_wizard_cob_label">COB</string>
<string name="treatments_wizard_carbs_label">KH</string>

5
app/src/main/res/values/strings.xml
View file

@ -42,7 +42,7 @@
<string name="treatments_wizard_tt_label">TT</string>
<string name="treatments_wizard_carbs_label">Carbs</string>
<string name="treatments_wizard_correction_label">Corr</string>
<string name="treatments_wizard_unit_label">U</string>
<string name="insulin_unit_shortname">U</string>
<string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
<string name="openapsma_run">Run now</string>
<string name="vitualpump_label">VIRTUAL PUMP</string>
@ -889,7 +889,7 @@
<string name="enablesmbwithtemptarget_summary">Enable SMB when there is temp target active (eating soon, exercise)</string>
<string name="enablesmbwithhightemptarget">Enable SMB with high temp targets</string>
<string name="enablesmbwithhightemptarget_summary">Enable SMB when there is high temp target active (exercise)</string>
<string name="let_temp_basal_run">Let current temp basal run</string>
<string name="let_temp_basal_run">Let temp basal run</string>
<string name="mute">Mute</string>
<string name="overview_insulin_label">Insulin</string>
<string name="overview_carbs_label">Carbs</string>
@ -963,5 +963,6 @@
<string name="combo_bolus_count">Bolus count</string>
<string name="combo_tbr_count">TBR count</string>
<string name="smb_frequency_exceeded">A bolus was delivered within the last 3 minutes, skipping SMB</string>
<string name="basal_set_correctly">Basal set correctly</string>
</resources>