From f08809ff9e9af819d1388b91dc4c279a74627800 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Wed, 4 Oct 2017 23:33:02 +0200 Subject: [PATCH] rename button to activate profile --- .../CircadianPercentageProfileFragment.java | 4 ---- .../androidaps/plugins/ProfileLocal/LocalProfileFragment.java | 4 ---- .../plugins/ProfileSimple/SimpleProfileFragment.java | 4 ---- .../main/res/layout/circadianpercentageprofile_fragment.xml | 2 +- app/src/main/res/layout/localprofile_fragment.xml | 2 +- app/src/main/res/layout/simpleprofile_fragment.xml | 2 +- app/src/main/res/values-bg/strings.xml | 3 +-- app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 16 files changed, 4 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java index 20f578a267..bcdd5ab252 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfileFragment.java @@ -500,11 +500,7 @@ public class CircadianPercentageProfileFragment extends SubscriberFragment { public void run() { if (!MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended()) { profileswitchButton.setVisibility(View.GONE); - } else if (!MainApp.getConfigBuilder().getPumpDescription().isSetBasalProfileCapable) { - profileswitchButton.setText(MainApp.instance().getText(R.string.activate_profile)); - profileswitchButton.setVisibility(View.VISIBLE); } else { - profileswitchButton.setText(MainApp.instance().getText(R.string.send_to_pump)); profileswitchButton.setVisibility(View.VISIBLE); } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java index da29008bf1..01fe7ad5f5 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java @@ -153,11 +153,7 @@ public class LocalProfileFragment extends SubscriberFragment { public void run() { if (!MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended()) { profileswitchButton.setVisibility(View.GONE); - } else if (!MainApp.getConfigBuilder().getPumpDescription().isSetBasalProfileCapable) { - profileswitchButton.setText(MainApp.instance().getText(R.string.activate_profile)); - profileswitchButton.setVisibility(View.VISIBLE); } else { - profileswitchButton.setText(MainApp.instance().getText(R.string.send_to_pump)); profileswitchButton.setVisibility(View.VISIBLE); } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java index b0cdd9e99c..deabd47e47 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java @@ -157,11 +157,7 @@ public class SimpleProfileFragment extends SubscriberFragment { public void run() { if (!MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended()) { profileswitchButton.setVisibility(View.GONE); - } else if (!MainApp.getConfigBuilder().getPumpDescription().isSetBasalProfileCapable) { - profileswitchButton.setText(MainApp.instance().getText(R.string.activate_profile)); - profileswitchButton.setVisibility(View.VISIBLE); } else { - profileswitchButton.setText(MainApp.instance().getText(R.string.send_to_pump)); profileswitchButton.setVisibility(View.VISIBLE); } } diff --git a/app/src/main/res/layout/circadianpercentageprofile_fragment.xml b/app/src/main/res/layout/circadianpercentageprofile_fragment.xml index a1dd3634cc..3e712004ff 100644 --- a/app/src/main/res/layout/circadianpercentageprofile_fragment.xml +++ b/app/src/main/res/layout/circadianpercentageprofile_fragment.xml @@ -114,7 +114,7 @@ android:layout_marginTop="3dp" android:paddingLeft="10dp" android:paddingRight="10dp" - android:text="@string/send_to_pump" + android:text="@string/activate_profile" android:textColor="@color/colorProfileSwitchButton" /> diff --git a/app/src/main/res/layout/localprofile_fragment.xml b/app/src/main/res/layout/localprofile_fragment.xml index 84d23fa709..7558d2f6ae 100644 --- a/app/src/main/res/layout/localprofile_fragment.xml +++ b/app/src/main/res/layout/localprofile_fragment.xml @@ -97,7 +97,7 @@ android:layout_weight="1" android:paddingLeft="10dp" android:paddingRight="10dp" - android:text="@string/send_to_pump" + android:text="@string/activate_profile" android:textColor="@color/colorProfileSwitchButton" /> diff --git a/app/src/main/res/layout/simpleprofile_fragment.xml b/app/src/main/res/layout/simpleprofile_fragment.xml index b7c3c3cac8..174f38f8bc 100644 --- a/app/src/main/res/layout/simpleprofile_fragment.xml +++ b/app/src/main/res/layout/simpleprofile_fragment.xml @@ -125,7 +125,7 @@ android:layout_weight="1" android:paddingLeft="10dp" android:paddingRight="10dp" - android:text="@string/send_to_pump" + android:text="@string/activate_profile" android:textColor="@color/colorProfileSwitchButton" /> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 4234a55d4f..98969b41c0 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -351,8 +351,7 @@ Бутон 3 % с който базовият профил ще бъде променен. Точен брой часове, с които ще бъде изместен профила! - ИЗПРАТИ КЪМ ПОМПАТА - Единици: + Единици: мг/дл ммол/л DIA: diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 20a54298c2..e023a8e81d 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -340,7 +340,6 @@ Pumpa vypnuta Znovu poslat všechny data Opravdu resetovat všechny databáze - POSLAT DO PUMPY Cílový rozsah: Čas v hodinách, o který bude bazál posunutý. Jednotky: diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c8317565ee..c01c25b549 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -288,7 +288,6 @@ Niedrige Batterie Pumpe ist beschäftigt Pumpenfehler - an Pumpe senden Zielbereich: Einheiten: Falscher Pumpentreiber ausgewählt diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 18cfbe75a4..71e911402b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -377,7 +377,6 @@ Apagando Bomba Eliminar registro: Enviar todos los datos - ENVIAR A BOMBA Media corta delta Bolo: Último BG: diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d57e7d5876..e4ed325e18 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -330,7 +330,6 @@ Salva Esci Accettare il nuovo basale temp - INVIARE ALLA POMPA Impostare il nuovo bollo esteso Impostazioni importate Impostazioni aggiuntive bolus diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 5dce573231..a591ac5c27 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -351,7 +351,6 @@ 버튼3 Percentage factor by which the base profile will be multiplied. Time in hours by which the profile will be shifted round robin. - SEND TO PUMP Units: mg/dl mmol/l diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e46d349236..eb6b45b33a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -185,7 +185,6 @@ Veiligheid VERZEND Verzend calibratie %.1f naar xDrip? - VERZEND NAAR POMP Vergeet niet alle gegeten koolhydraten in te geven bij het activeren van de Autosens functie. Anders zullen BG wijzigingen door maaltijden foutief geïnterpreteerd worden!! Gevoeligheid AAPS Gevoeligheid Oref0 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2964a144c1..1492740232 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -427,7 +427,6 @@ сохранить ОТПРАВИТЬ отправить калибровку %.1f на xdrip? - ОТПРАВИТЬ НА ПОМПУ принять новый врем базал: установить новый расширенн болюс: настройки импортированы diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index a4ef3e7b2e..03ac2aee36 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -413,7 +413,6 @@ inställningar importerade Ställ in ny förlängd bolus: Acceptera ny temp basal: - SKICKA TILL PUMP Skicka kalibrering %.1f till xDrip? SKICKA Spara diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 94bb54d57b..a014c8113d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -362,7 +362,6 @@ Button 3 Percentage factor by which the base profile will be multiplied. Time in hours by which the profile will be shifted round robin. - SEND TO PUMP Units: mg/dl mmol/l