From efa2944c4cd19fc795e990ffb56efc0fdea49cf0 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 11 Jul 2016 22:52:23 +0200
Subject: [PATCH] translations & fixes

---
 .../nightscout/androidaps/db/TempBasal.java   |  3 ++-
 .../ConfigBuilder/ConfigBuilderFragment.java  |  1 +
 .../plugins/DanaR/DanaRFragment.java          |  2 +-
 .../plugins/OpenAPSMA/OpenAPSMAFragment.java  |  6 ++---
 app/src/main/res/values-bg/strings.xml        | 17 --------------
 app/src/main/res/values-cs/strings.xml        | 22 +++++++++++++++++++
 6 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/db/TempBasal.java b/app/src/main/java/info/nightscout/androidaps/db/TempBasal.java
index df19b1faec..4b326c85fd 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TempBasal.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/TempBasal.java
@@ -184,9 +184,10 @@ public class TempBasal {
 
     public String toString() {
         DateFormat formatDateToJustTime = new SimpleDateFormat("HH:mm");
+        String extended = isExtended ? "E " : "";
 
         if (isAbsolute) {
-            return DecimalFormatter.to2Decimal(absolute) + "U/h @" +
+            return extended + DecimalFormatter.to2Decimal(absolute) + "U/h @" +
                     formatDateToJustTime.format(timeStart) +
                     " " + getRealDuration() + "/" + duration + "min";
         } else { // percent
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
index 17a192c56f..660a9ff4c7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
@@ -863,6 +863,7 @@ public class ConfigBuilderFragment extends Fragment implements PluginBase, PumpI
 
     public static void uploadTempBasalStartPercent(Integer percent, double durationInMinutes) {
         try {
+            // TODO: upload as absolute if in settings
             Context context = MainApp.instance().getApplicationContext();
             JSONObject data = new JSONObject();
             data.put("eventType", "Temp Basal");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRFragment.java
index 75776a0f2a..052580921f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRFragment.java
@@ -311,7 +311,7 @@ public class DanaRFragment extends Fragment implements PluginBase, PumpInterface
             } else {
                 Double baseRate = getBaseBasalRate();
                 Double tempRate = baseRate * (getRealTempBasal().percent / 100d);
-                return baseRate + tempRate;
+                return tempRate;
             }
         }
         if (isExtendedBoluslInProgress() && useExtendedBoluses) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java
index 30cd7b1488..7a4125f27c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAFragment.java
@@ -259,9 +259,9 @@ public class OpenAPSMAFragment extends Fragment implements View.OnClickListener,
         double maxIob = SafeParse.stringToDouble(SP.getString("openapsma_max_iob", "1.5"));
         double maxBasal = SafeParse.stringToDouble(SP.getString("openapsma_max_basal", "1"));
         double minBg = NSProfile.toMgdl(SafeParse.stringToDouble(SP.getString("openapsma_min_bg", minBgDefault)), units);
-        double maxBg = NSProfile.toMgdl(SafeParse.stringToDouble(SP.getString("openapsma_max_bg", minBgDefault)), units);
-        minBg = Round.roundTo(minBg, 1d);
-        maxBg = Round.roundTo(maxBg, 1d);
+        double maxBg = NSProfile.toMgdl(SafeParse.stringToDouble(SP.getString("openapsma_max_bg", maxBgDefault)), units);
+        minBg = Round.roundTo(minBg, 0.1d);
+        maxBg = Round.roundTo(maxBg, 0.1d);
 
         TreatmentsInterface treatments = MainApp.getConfigBuilder().getActiveTreatments();
         TempBasalsInterface tempBasals = MainApp.getConfigBuilder().getActiveTempBasals();
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 442061a6ea..65f3981f9f 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -67,7 +67,6 @@
     <string name="en_lang">English</string>
     <string name="entertreatmentquestion">Въведи ново treatment:</string>
     <string name="glucose">КЗ:</string>
-    <string name="limits_title">Лимит</string>
     <string name="loop">Loop </string>
     <string name="loop_aps_label">APS</string>
     <string name="loop_constraintsprocessed_label">След приложени ограничения</string>
@@ -77,10 +76,6 @@
     <string name="lowsuspend_low_title">Граница за ниска КЗ</string>
     <string name="manualenacts">Manual enacts</string>
     <string name="lowsuspend_lowprojected">Low projected</string>
-    <string name="maxbasal_summary">Макс. ед./час на временен базал може да бъде до:</string>
-    <string name="maxbasal_title">Макс. базал</string>
-    <string name="maxbasaliob_summary">Макс. стойност на не-болус IOB зададена от OpenAPS</string>
-    <string name="maxbasaliob_title">Макс. базал IOB</string>
     <string name="minimalduration">Минимална продължителност</string>
     <string name="nav_backup">Архивиране</string>
     <string name="nav_exit">Изход</string>
@@ -91,7 +86,6 @@
     <string name="noapsselected">Не е избран APS или  </string>
     <string name="nochangerequested">Не се изискват промени</string>
     <string name="noprofile">Не е зареден профил от NS</string>
-    <string name="ns_sync_use_absolute_summary">Изполване абсолютни стойности вместо % за качване в NS</string>
     <string name="ns_sync_use_absolute_title">Използване на абсолютни стойности</string>
     <string name="nsclient">NSClient</string>
     <string name="nsprofileview_activeprofile_label">Активен профил:</string>
@@ -135,8 +129,6 @@
     <string name="reason">Основание</string>
     <string name="refreshfromnightscout">Искате ли да обновите treatments от Nightscout</string>
     <string name="safety">Безопасност</string>
-    <string name="safety_useextended_summary">Използвай удължен болус за високите стойности (над 200%)</string>
-    <string name="safety_useextended_title">Използвай удължен болус</string>
     <string name="setextendedbolusquestion">Задай нов комб. болусs:</string>
     <string name="setbasalquestion">Приложи нов временен базал:</string>
     <string name="simpleprofile">Simple profile</string>
@@ -146,7 +138,6 @@
     <string name="tempbasals_netinsulin_label_string">Инс:</string>
     <string name="tempbasals_netratio_label_string">Коефициент:</string>
     <string name="tempbasals_realduration_label_string">Продължителност:</string>
-    <string name="title_activity_preferences">Опции</string>
     <string name="treatmentdeliveryerror">Грешка при болус</string>
     <string name="treatments">Treatments</string>
     <string name="treatments_activity_string">Активен:</string>
@@ -188,7 +179,6 @@
     <string name="lowsuspend_low">Low Suspend</string>
     <string name="careportal_newnstreatment_eventtype">Тип събитие</string>
     <string name="careportal_newnstreatment_glucosetype">КЗ тип</string>
-    <string name="title_activity_main">AndroidAPS</string>
     <string name="openapsma">OpenAPS MA</string>
     <string name="configbuilder_nightscoutversion_label">Nightscout версия:</string>
     <string name="configbuilder_nsclientversion_label">NSClient версия:</string>
@@ -205,22 +195,15 @@
     <string name="nav_export">Експорт настройки</string>
     <string name="nav_import">Импорт настройки</string>
     <string name="de_lang">Deutsch</string>
-    <string name="openapsma_apslimits_label">APS лимит</string>
     <string name="openapsma_high_summary">Максимална стойност, която е в границите</string>
-    <string name="openapsma_high_title">Горна граница</string>
     <string name="openapsma_low_summary">Минимална стойност, която е в границите</string>
-    <string name="openapsma_low_title">Долна граница</string>
     <string name="openapsma_maxbasal_summary">Макс. временен базал [Е/ч] може да бъде до</string>
-    <string name="openapsma_maxbasal_title">Максимален базал</string>
-    <string name="openapsma_maxbasaliob_title">Максимален базал IOB</string>
-    <string name="openapsma_targetrange_label">APS целева зона</string>
     <string name="bg_lang">Български</string>
     <string name="openapsma_maxiob_summary">Максимална стойност на не болус IOB, който openAPS може да зададе</string>
     <string name="minago">min ago</string>
     <string name="connected">Свързан</string>
     <string name="devicenotfound">Избраното устройство не съществува</string>
     <string name="disconnected">Прекъснат</string>
-    <string name="alert">Внимание</string>
     <string name="connecting">Свързва се</string>
     <string name="connectionerror">Грешка при свързване с помпа</string>
     <string name="danar_bt_name_title">DanaR Bluetooth устройство</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index b4e914fb75..ab2136cc30 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -212,4 +212,26 @@
     <string name="danar_pump_settings">DanaR nastavení</string>
     <string name="syncprofiletopump_title">Synchronizovat NS profil do pumpy</string>
     <string name="nightscout">Nightscout</string>
+    <string name="absolute">Absolutní</string>
+    <string name="comment">Komentář</string>
+    <string name="connectionerror">Chyba připojování pumpy</string>
+    <string name="danar_dailyunits">Jednotek za den:</string>
+    <string name="danar_invalidinput">Chybná vstupní data</string>
+    <string name="danar_iob_label">IOB z pumpy:</string>
+    <string name="danar_lastbolus">Poslední bolus</string>
+    <string name="danar_valuenotsetproperly">Hodnota nenastavena správně</string>
+    <string name="danar_viewprofile">Zobrazit profil</string>
+    <string name="devicenotfound">Vybrané zařízení nenalezeno</string>
+    <string name="enacted">Provedeno</string>
+    <string name="end_user_license_agreement"></string>
+    <string name="end_user_license_agreement_i_understand">ROZUMÍM A PORVZUJI</string>
+    <string name="hoursago">h zpět</string>
+    <string name="limits_title"></string>
+    <string name="nobtadapter">Nenalezen bluetooth adaptér</string>
+    <string name="percent">Procent</string>
+    <string name="reloadprofile">Obnovit profil</string>
+    <string name="save">Uložit</string>
+    <string name="success">Úspěch</string>
+    <string name="tempcancel">Zrušit dočasný bazál</string>
+    <string name="virtualpump_lastconnection_label">Poslední spojení:</string>
 </resources>
\ No newline at end of file