From e4ec18df26c83f43fe8ad60fa881b575d9af1f06 Mon Sep 17 00:00:00 2001
From: olorinmaia <alfeinarj@gmail.com>
Date: Wed, 18 Oct 2023 21:59:48 +0200
Subject: [PATCH] add 5 missing translations to wear

---
 core/ui/src/main/res/values/strings.xml              |  5 +++++
 .../sync/wear/wearintegration/DataHandlerMobile.kt   | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml
index dffde23751..9db2e9d211 100644
--- a/core/ui/src/main/res/values/strings.xml
+++ b/core/ui/src/main/res/values/strings.xml
@@ -51,6 +51,7 @@
     <string name="extended_bolus">Extended bolus</string>
     <string name="paused">Paused</string>
     <string name="tdd_total">TDD Total</string>
+    <string name="tdd_old_data">Old data</string>
     <string name="goingtodeliver">Going to deliver %1$.2f U</string>
     <string name="waitingforpump">Waiting for pump</string>
     <string name="androidaps_start">AAPS started</string>
@@ -168,6 +169,8 @@
     <string name="virtualpump_uploadstatus_title">Upload pump status to NS or Tidepool</string>
     <string name="suspendloop_label">Disabled/Suspended loop</string>
     <string name="iob_label">Insulin on Board (IOB)</string>
+    <string name="loopstatus_targets">TARGETS:</string>
+    <string name="loopstatus_OAPS_result">OAPS RESULT:</string>
 
     <!--    Protection-->
     <string name="wrongpassword">Wrong password</string>
@@ -492,6 +495,8 @@
     <string name="bolus_recorded_only">Bolus will be recorded only (not delivered by pump)</string>
     <string name="advisoralarm">Run alarm when is time to eat</string>
     <string name="no_action_selected">No action selected, nothing will happen</string>
+    <string name="carb_equal_zero_no_action">Carbs = 0. No action taken!</string>
+    <string name="wizard_no_insulin_required">No insulin required!</string>
     <string name="wizard_no_actual_bg">No recent BG to base calculation on!</string>
     <string name="wizard_no_active_profile">No active profile set!</string>
     <string name="wizard_no_cob">Unknown COB! BG reading missing or recent app restart?</string>
diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/wear/wearintegration/DataHandlerMobile.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/wear/wearintegration/DataHandlerMobile.kt
index 8724ca92af..927e891e67 100644
--- a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/wear/wearintegration/DataHandlerMobile.kt
+++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/wear/wearintegration/DataHandlerMobile.kt
@@ -175,7 +175,7 @@ class DataHandlerMobile @Inject constructor(
                                EventMobileToWear(
                                    EventData.ConfirmAction(
                                        rh.gs(R.string.loop_status).uppercase(),
-                                       "TARGETS:\n$targetsStatus\n\n$loopStatus\n\nOAPS RESULT:\n$oAPSResultStatus",
+                                       "$targetsStatus\n\n$loopStatus\n\n$oAPSResultStatus",
                                        returnCommand = null
                                    )
                                )
@@ -336,7 +336,7 @@ class DataHandlerMobile @Inject constructor(
         val dummies: MutableList<TotalDailyDose> = LinkedList()
         val historyList = getTDDList(dummies)
         if (isOldData(historyList)) {
-            message = "OLD DATA - "
+            message = rh.gs(app.aaps.core.ui.R.string.tdd_old_data) + ", "
             //if pump is not busy: try to fetch data
             if (activePump.isBusy()) {
                 message += rh.gs(app.aaps.core.ui.R.string.pump_busy)
@@ -434,7 +434,7 @@ class DataHandlerMobile @Inject constructor(
             return
         }
         if (bolusWizard.calculatedTotalInsulin <= 0 && bolusWizard.carbs <= 0) {
-            sendError("No insulin required")
+            sendError(rh.gs(app.aaps.core.ui.R.string.wizard_no_insulin_required))
             return
         }
         val message =
@@ -540,7 +540,7 @@ class DataHandlerMobile @Inject constructor(
             message += "\n" + rh.gs(app.aaps.core.ui.R.string.constraint_applied)
         }
         if (carbsAfterConstraints <= 0) {
-            sendError("Carbs = 0! No action taken!")
+            sendError(rh.gs(app.aaps.core.ui.R.string.carb_equal_zero_no_action))
             return
         }
         rxBus.send(
@@ -998,7 +998,7 @@ class DataHandlerMobile @Inject constructor(
     private
     val targetsStatus: String
         get() {
-            var ret = ""
+            var ret = rh.gs(app.aaps.core.ui.R.string.loopstatus_targets) + "\n"
             if (!config.APS) {
                 return rh.gs(R.string.target_only_aps_mode)
             }
@@ -1020,7 +1020,7 @@ class DataHandlerMobile @Inject constructor(
     private
     val oAPSResultStatus: String
         get() {
-            var ret = ""
+            var ret = rh.gs(app.aaps.core.ui.R.string.loopstatus_OAPS_result) + "\n"
             if (!config.APS)
                 return rh.gs(R.string.aps_only)
             val usedAPS = activePlugin.activeAPS