allow sms string to be translated separately

app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java

@@ -209,13 +209,13 @@ public class SmsCommunicatorPlugin implements PluginBase {
                     int agoMin = (int) (agoMsec / 60d / 1000d);
 
                     if (actualBG != null) {
-                        reply = MainApp.sResources.getString(R.string.actualbg) + " " + actualBG.valueToUnitsToString(units) + ", ";
+                        reply = MainApp.sResources.getString(R.string.sms_actualbg) + " " + actualBG.valueToUnitsToString(units) + ", ";
                     } else if (lastBG != null) {
-                        reply = MainApp.sResources.getString(R.string.lastbg) + " " + lastBG.valueToUnitsToString(units) + " " + String.format(MainApp.sResources.getString(R.string.minago), agoMin) + ", ";
+                        reply = MainApp.sResources.getString(R.string.sms_lastbg) + " " + lastBG.valueToUnitsToString(units) + " " + String.format(MainApp.sResources.getString(R.string.sms_minago), agoMin) + ", ";
                     }
                     DatabaseHelper.GlucoseStatus glucoseStatus = MainApp.getDbHelper().getGlucoseStatusData();
                     if (glucoseStatus != null)
-                        reply += MainApp.sResources.getString(R.string.delta) + ": " + NSProfile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units + ", ";
+                        reply += MainApp.sResources.getString(R.string.sms_delta) + " " + NSProfile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units + ", ";
 
                     MainApp.getConfigBuilder().getActiveTreatments().updateTotalIOB();
                     IobTotal bolusIob = MainApp.getConfigBuilder().getActiveTreatments().getLastCalculation().round();
@@ -224,9 +224,9 @@ public class SmsCommunicatorPlugin implements PluginBase {
                     IobTotal basalIob = MainApp.getConfigBuilder().getActiveTempBasals().getLastCalculation().round();
                     if (basalIob == null) basalIob = new IobTotal();
 
-                    reply += MainApp.sResources.getString(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U ("
+                    reply += MainApp.sResources.getString(R.string.sms_iob) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U ("
-                            + MainApp.sResources.getString(R.string.bolus) + ": " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U "
+                            + MainApp.sResources.getString(R.string.sms_bolus) + " " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U "
-                            + MainApp.sResources.getString(R.string.basal) + ": " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U)";
+                            + MainApp.sResources.getString(R.string.sms_basal) + " " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U)";
 
                     sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date()));
                     receivedSms.processed = true;
@@ -314,7 +314,7 @@ public class SmsCommunicatorPlugin implements PluginBase {
                                 resetWaitingMessages();
                                 sendSMS(cancelTempBasalWaitingForConfirmation = new Sms(receivedSms.phoneNumber, reply, new Date(), passCode));
                             } else {
-                                reply = MainApp.sResources.getString(R.string.remotebasalnotallowed);
+                                reply = MainApp.sResources.getString(R.string.smscommunicator_remotebasalnotallowed);
                                 sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date()));
                             }
                         } else {
@@ -328,7 +328,7 @@ public class SmsCommunicatorPlugin implements PluginBase {
                                 sendSMS(tempBasalWaitingForConfirmation = new Sms(receivedSms.phoneNumber, reply, new Date(), passCode));
                                 tempBasalWaitingForConfirmation.tempBasal = tempBasal;
                             } else {
-                                reply = MainApp.sResources.getString(R.string.remotebasalnotallowed);
+                                reply = MainApp.sResources.getString(R.string.smscommunicator_remotebasalnotallowed);
                                 sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date()));
                             }
                         }
@@ -336,7 +336,7 @@ public class SmsCommunicatorPlugin implements PluginBase {
                     break;
                 case "BOLUS":
                     if (new Date().getTime() - lastRemoteBolusTime.getTime() < Constants.remoteBolusMinDistance) {
-                        reply = MainApp.sResources.getString(R.string.remotebolusnotallowed);
+                        reply = MainApp.sResources.getString(R.string.smscommunicator_remotebolusnotallowed);
                         sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date()));
                     } else if (splited.length > 1) {
                         amount = SafeParse.stringToDouble(splited[1]);
@@ -350,7 +350,7 @@ public class SmsCommunicatorPlugin implements PluginBase {
                             sendSMS(bolusWaitingForConfirmation = new Sms(receivedSms.phoneNumber, reply, new Date(), passCode));
                             bolusWaitingForConfirmation.bolusRequested = amount;
                         } else {
-                            reply = MainApp.sResources.getString(R.string.remotebolusnotallowed);
+                            reply = MainApp.sResources.getString(R.string.smscommunicator_remotebolusnotallowed);
                             sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date()));
                         }
                     }
@@ -364,12 +364,12 @@ public class SmsCommunicatorPlugin implements PluginBase {
                             danaRPlugin = (DanaRPlugin) MainApp.getSpecificPlugin(DanaRPlugin.class);
                             PumpEnactResult result = pumpInterface.deliverTreatment(bolusWaitingForConfirmation.bolusRequested, 0, null);
                             if (result.success) {
-                                reply = String.format(MainApp.sResources.getString(R.string.bolusdelivered), result.bolusDelivered);
+                                reply = String.format(MainApp.sResources.getString(R.string.smscommunicator_bolusdelivered), result.bolusDelivered);
                                 if (danaRPlugin != null) reply += "\n" + danaRPlugin.shortStatus();
                                 lastRemoteBolusTime = new Date();
                                 sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, new Date()));
                             } else {
-                                reply = MainApp.sResources.getString(R.string.bolusfailed);
+                                reply = MainApp.sResources.getString(R.string.smscommunicator_bolusfailed);
                                 if (danaRPlugin != null) reply += "\n" + danaRPlugin.shortStatus();
                                 sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date()));
                             }

app/src/main/res/values-bg/strings.xml

@@ -213,7 +213,7 @@
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="bolusdelivered" formatted="false">Болус %.2fU беше подаден успешно</string>
-    <string name="bolusfailed">Болусът не е доставен</string>
+    <string name="smscommunicator_bolusfailed">Болусът не е доставен</string>
     <string name="canceltemp">Откажи временен базал</string>
     <string name="virtualpump_lastconnection_label">Последно свързване:</string>
     <string name="waitingforpumpresult">Изчаква резултат</string>
@@ -221,7 +221,7 @@
     <string name="smscommunicator_allowednumbers">Позволени телефонни номера</string>
     <string name="success">Успех</string>
     <string name="smscommunicator_bolusreplywithcode" formatted="false">За да доставите болус %.2fU отговорете с код  %s</string>
-    <string name="remotebolusnotallowed">Отдалечен болус не е разрешен</string>
+    <string name="smscommunicator_remotebolusnotallowed">Отдалечен болус не е разрешен</string>
     <string name="reloadprofile">Обнови профила</string>
     <string name="percent">Процент</string>
     <string name="glucosetype_sensor">Сензор</string>
@@ -307,7 +307,7 @@
     <string name="overview_quickwizard_item_remove_button">Премахни</string>
     <string name="quickwizard">Бърз болус</string>
     <string name="quickwizardsettings">Настройки за бърз болус</string>
-    <string name="remotebasalnotallowed">Не са позволени отдалечени настройки</string>
+    <string name="smscommunicator_remotebasalnotallowed">Не са позволени отдалечени настройки</string>
     <string name="smscommunicator_basalreplywithcode" formatted="false">To start basal %.2fU/h reply with code %s</string>
     <string name="smscommunicator_basalstopreplywithcode" formatted="false">To stop temp basal reply with code %s</string>
     <string name="smscommunicator_loophasbeendisabled">Loop has been disabled</string>
@@ -355,13 +355,13 @@
     <string name="basal_rate">Базал:</string>
     <string name="basalvaluebelowminimum">Базалните стойности са под минимума. Не е зададен профил!</string>
     <string name="batterydischarged">Батерията на помпата е изтощена</string>
-    <string name="actualbg">КЗ:</string>
+    <string name="sms_actualbg">КЗ:</string>
     <string name="danar_disableeasymode">Забрани EasyUI режим в помпата</string>
     <string name="danar_enableextendedbolus">Разреши удължен болус в помпата</string>
     <string name="danar_switchtouhmode">Промени режима от U/d на U/h в помпата</string>
     <string name="danarkoreanpump">DanaR за Корея</string>
     <string name="high_mark">Горна линия</string>
-    <string name="lastbg">Последна КЗ:</string>
+    <string name="sms_lastbg">Последна КЗ:</string>
     <string name="low_mark">Долна линия</string>
     <string name="lowbattery">Изтощена батерия</string>
     <string name="open_settings_on_wear">Отвори Опции на часовника</string>

app/src/main/res/values-cs/strings.xml

@@ -226,8 +226,8 @@
     <string name="virtualpump_lastconnection_label">Poslední spojení:</string>
     <string name="canceltemp">Zrušit dočasný bazál</string>
     <string name="bolusdelivered" formatted="false">Bolus %.2fU aplikován úspěšně</string>
-    <string name="bolusfailed">Chyba při aplikování bolusu</string>
+    <string name="smscommunicator_bolusfailed">Chyba při aplikování bolusu</string>
-    <string name="remotebolusnotallowed">Vzdálený bolus není momentálně povolen</string>
+    <string name="smscommunicator_remotebolusnotallowed">Vzdálený bolus není momentálně povolen</string>
     <string name="smscommunicator_bolusreplywithcode" formatted="false">K potvzení bolusu %.2fU odpověz SMS s kódem %s</string>
     <string name="smscommunicator">SMS komunikátor</string>
     <string name="smscommunicator_allowednumbers">Povolená tel. čísla</string>
@@ -300,7 +300,7 @@
     <string name="es_lang">Spanish</string>
     <string name="noprofileselected">Není vybrán žádný profil</string>
     <string name="openapsma_valueoutofrange" formatted="false">Hodnota %s je mimo přednastavený rozsah</string>
-    <string name="remotebasalnotallowed">Vzdálené posílání příkazů není povoleno</string>
+    <string name="smscommunicator_remotebasalnotallowed">Vzdálené posílání příkazů není povoleno</string>
     <string name="smscommunicator_basalreplywithcode" formatted="false">Na spuštění bazálu %.2fU/h odpověz SMS s kódem %s</string>
     <string name="smscommunicator_basalstopreplywithcode" formatted="false">Na ukončení bazálu odpověz SMS s kódem %s</string>
     <string name="smscommunicator_tempbasalcanceled">Dočaný bazál zastaven</string>
@@ -373,7 +373,15 @@
     <string name="wrongpumpdriverselected">Vybrán špatný ovladač pumpy</string>
     <string name="basalvaluebelowminimum">Hodnota bazálu pod minimem. Nenastaveno!</string>
     <string name="mdi">Pera</string>
-    <string name="actualbg">Glykémie:</string>
+    <string name="sms_actualbg">Glykémie:</string>
-    <string name="lastbg">Poslední glykémie:</string>
+    <string name="sms_lastbg">Poslední glykémie:</string>
     <string name="minago">před %d min</string>
+    <string name="sms_basal">Bazál:</string>
+    <string name="sms_bolus">Bolus:</string>
+    <string name="sms_delta">Rozdíl:</string>
+    <string name="sms_iob">IOB:</string>
+    <string name="sms_minago">před %d min</string>
+    <string name="smscommunicator_bolusdelivered">Bolus %.2fU aplikován úspěšně</string>
+    <string name="ongoingnotificaction">Průběžné oznámení</string>
+    <string name="old_data">ZASTARALÉ</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -197,7 +197,7 @@
     <string name="nightscout">Nightscout</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="absolute">Absolut</string>
-    <string name="bolusfailed">Bolus fehlgeschlagen</string>
+    <string name="smscommunicator_bolusfailed">Bolus fehlgeschlagen</string>
     <string name="canceltemp">Temp Basal abbrechen</string>
     <string name="careportal_temporarytarget">Temoräres Ziel</string>
     <string name="careportal_temporarytargetcancel">Temoräres Ziel abbrechen</string>
@@ -240,7 +240,7 @@
     <string name="syncprofiletopump_title">Nightscout Profil zur Pumpe synchronisieren</string>
     <string name="waitingforpumpresult">auf Pumpenergebnis warten</string>
     <string name="nobtadapter">Kein Bluetoothadapter gefunden</string>
-    <string name="remotebolusnotallowed">Remote Bolus nicht erlaubt</string>
+    <string name="smscommunicator_remotebolusnotallowed">Remote Bolus nicht erlaubt</string>
     <string formatted="false" name="smscommunicator_bolusreplywithcode">Um Bolus %.2fU bitte mit  %s antworten</string>
     <string name="ko_lang">Korean</string>
     <string name="youareonallowedlimit">Limit erreicht</string>

app/src/main/res/values-es/strings.xml

@@ -239,10 +239,10 @@
     <string name="smscommunicator_allowednumbers">Números de teléfono permitidos</string>
     <string name="smscommunicator_allowednumbers_summary">XXXXXXXXXX +; + YYYYYYYYYY</string>
     <string formatted="false" name="smscommunicator_bolusreplywithcode">Para entregar bolo% .2fU responder con código% s</string>
-    <string name="bolusfailed">bolo falló</string>
+    <string name="smscommunicator_bolusfailed">bolo falló</string>
     <string formatted="false" name="bolusdelivered">Bolo% .2fU entregado con éxito</string>
     <string formatted="false" name="bolusdelivering">Entregando% .2fU</string>
-    <string name="remotebolusnotallowed">Bolo remoto no permitido</string>
+    <string name="smscommunicator_remotebolusnotallowed">Bolo remoto no permitido</string>
     <string name="glucosetype_finger">Dedo</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="glucosetype_manual">Manual</string>
@@ -333,7 +333,7 @@
     <string name="ns_upload_only_summary">NS solo subida. No efectivo con SGV salvo que este seleccionada una fuente local como xDrip. No efectivo en perfiles usando perfiles NS</string>
     <string name="othersettings_title">Otros</string>
     <string name="pumpNotInitialized">¡Bomba no iniciada!</string>
-    <string name="remotebasalnotallowed">No permitidos ajustes basales remotos</string>
+    <string name="smscommunicator_remotebasalnotallowed">No permitidos ajustes basales remotos</string>
     <string name="reset_db_confirm">¿Realmente quiere resetear la base de datos?</string>
     <string name="smscommunicator_unknowncommand">Comando desconocido o respuesta incorrecta</string>
     <string name="fillwarning">¡Por favor asegurar que la cantidad coincide con la especificación del set de infusión!</string>

app/src/main/res/values-ko/strings.xml

@@ -241,11 +241,11 @@
     <string name="smscommunicator_allowednumbers">허가된 전화번호</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode" formatted="false">식사주입 %.2fU 을 실행하려면 %s 를 입력하고 답장하세요</string>
-    <string name="bolusfailed">Bolus failed</string>
+    <string name="smscommunicator_bolusfailed">Bolus failed</string>
     <string name="bolusdelivered" formatted="false">Bolus %.2fU delivered successfully</string>
     <string name="bolusdelivering" formatted="false">%.2fU 주입중</string>
     <string name="smscommunicator_remotecommandsallowed">SMS 원격 명령 사용하기</string>
-    <string name="remotebolusnotallowed">원격 식사주입 허용되지 않음</string>
+    <string name="smscommunicator_remotebolusnotallowed">원격 식사주입 허용되지 않음</string>
     <string name="glucosetype_finger">Finger</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="glucosetype_manual">Manual</string>
@@ -310,7 +310,7 @@
     <string name="smscommunicator_loopisdisabled">Loop가 중지중입니다.</string>
     <string name="smscommunicator_loopisenabled">Loop가 실행중입니다.</string>
     <string name="openapsma_valueoutofrange" formatted="false">값 %s 은 하드리밋(Hard Limit)를 벗어났습니다</string>
-    <string name="remotebasalnotallowed">원격 기초주입설정이 허가되지 않았습니다</string>
+    <string name="smscommunicator_remotebasalnotallowed">원격 기초주입설정이 허가되지 않았습니다</string>
     <string name="smscommunicator_basalreplywithcode" formatted="false">기초주입 %.2fU/h 을 실행하려면 %s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_tempbasalset" formatted="false">Temp basal %.2fU/h for %d min started successfully</string>
     <string name="smscommunicator_tempbasalfailed">Temp basal start failed</string>
@@ -379,7 +379,7 @@
     <string name="danar_enableextendedbolus">펌프에서 확장식사기능을 활성화 하세요</string>
     <string name="danar_switchtouhmode">펌프에서 U/d에서 U/h로 모드를 변경하세요</string>
     <string name="basalvaluebelowminimum">기초주입값이 최소값 이하입니다. 프로파일이 설정되지 않습니다!</string>
-    <string name="actualbg">BG:</string>
+    <string name="sms_actualbg">BG:</string>
-    <string name="lastbg">Last BG:</string>
+    <string name="sms_lastbg">Last BG:</string>
     <string name="mdi">MDI</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -31,6 +31,7 @@
     <string name="treatments_insulin_label_string">Insulin:</string>
     <string name="treatments_carbs_label_string">Carbs:</string>
     <string name="treatments_iob_label_string">IOB:</string>
+    <string name="sms_iob">IOB:</string>
     <string name="treatments_activity_string">Activity:</string>
     <string name="treatments_iobtotal_label_string">Toal IOB:</string>
     <string name="treatments_iobactivitytotal_label_string">Total IOB activity:</string>
@@ -75,6 +76,7 @@
     <string name="reason">Reason</string>
     <string name="glucose">Glucose</string>
     <string name="delta">Delta</string>
+    <string name="sms_delta">Delta:</string>
     <string name="avgdelta">Avg. delta</string>
 
     <string name="configbuilder">Config Builder</string>
@@ -122,7 +124,9 @@
     <string name="confirmation">Confirmation</string>
     <string name="entertreatmentquestion">Enter new treatment:</string>
     <string name="bolus">Bolus</string>
+    <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
+    <string name="sms_basal">Basal:</string>
     <string name="carbs">Carbs</string>
     <string name="changeyourinput">Change your input!</string>
     <string name="setextendedbolusquestion">Set new extended bolus:</string>
@@ -244,11 +248,12 @@
     <string name="smscommunicator_allowednumbers">Allowed phone numbers</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode" formatted="false">To deliver bolus %.2fU reply with code %s</string>
-    <string name="bolusfailed">Bolus failed</string>
+    <string name="smscommunicator_bolusfailed">Bolus failed</string>
     <string name="bolusdelivered" formatted="false">Bolus %.2fU delivered successfully</string>
+    <string name="smscommunicator_bolusdelivered" formatted="false">Bolus %.2fU delivered successfully</string>
     <string name="bolusdelivering" formatted="false">Delivering %.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Allow remote commands via SMS</string>
-    <string name="remotebolusnotallowed">Remote bolus not allowed</string>
+    <string name="smscommunicator_remotebolusnotallowed">Remote bolus not allowed</string>
     <string name="glucosetype_finger">Finger</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="glucosetype_manual">Manual</string>
@@ -313,7 +318,7 @@
     <string name="smscommunicator_loopisdisabled">Loop is disabled</string>
     <string name="smscommunicator_loopisenabled">Loop is enabled</string>
     <string name="openapsma_valueoutofrange" formatted="false">Value %s is out of hard limits</string>
-    <string name="remotebasalnotallowed">Remote basal setting is not allowed</string>
+    <string name="smscommunicator_remotebasalnotallowed">Remote basal setting is not allowed</string>
     <string name="smscommunicator_basalreplywithcode" formatted="false">To start basal %.2fU/h reply with code %s</string>
     <string name="smscommunicator_tempbasalset" formatted="false">Temp basal %.2fU/h for %d min started successfully</string>
     <string name="smscommunicator_tempbasalfailed">Temp basal start failed</string>
@@ -383,10 +388,11 @@
     <string name="danar_enableextendedbolus">Enable extended boluses on pump</string>
     <string name="danar_switchtouhmode">Change mode from U/d to U/h on pump</string>
     <string name="basalvaluebelowminimum">Basal value below minimum. Profile not set!</string>
-    <string name="actualbg">BG:</string>
+    <string name="sms_actualbg">BG:</string>
-    <string name="lastbg">Last BG:</string>
+    <string name="sms_lastbg">Last BG:</string>
     <string name="mdi">MDI</string>
     <string name="ongoingnotificaction">Ongoing Notification</string>
     <string name="old_data">OLD DATA</string>
     <string name="minago">%dmin ago</string>
+    <string name="sms_minago">%dmin ago</string>
 </resources>