caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Clean up string resource names.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-10-30 21:42:14 +01:00
parent 2198747feb
commit 522b5e9e1b
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,7 +94,7 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
// activity
String activity = plugin.getPump().activity;
activityView.setText(activity != null ? activity : getString(R.string.combo_action_idle));
activityView.setText(activity != null ? activity : getString(R.string.combo_pump_action_idle));
if (plugin.isInitialized()) {
// battery

6
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
View file

@ -479,7 +479,7 @@ public class ComboPlugin implements PluginBase, PumpInterface {
}
final int finalAdjustedPercent = adjustedPercent;
CommandResult commandResult = runCommand(MainApp.sResources.getString(R.string.combo_action_setting_tbr), () -> ruffyScripter.setTbr(finalAdjustedPercent, durationInMinutes));
CommandResult commandResult = runCommand(MainApp.sResources.getString(R.string.combo_pump_action_setting_tbr), () -> ruffyScripter.setTbr(finalAdjustedPercent, durationInMinutes));
if (commandResult.enacted) {
pump.tbrSetTime = System.currentTimeMillis();
@ -526,7 +526,7 @@ public class ComboPlugin implements PluginBase, PumpInterface {
if (activeTemp == null || userRequested) {
/* v1 compatibility to sync DB to pump if they diverged (activeTemp == null) */
log.debug("cancelTempBasal: hard-cancelling TBR since user requested");
commandResult = runCommand(MainApp.sResources.getString(R.string.combo_action_cancelling_tbr), ruffyScripter::cancelTbr);
commandResult = runCommand(MainApp.sResources.getString(R.string.combo_pump_action_cancelling_tbr), ruffyScripter::cancelTbr);
if (commandResult.enacted) {
tempBasal = new TemporaryBasal(System.currentTimeMillis());
@ -549,7 +549,7 @@ public class ComboPlugin implements PluginBase, PumpInterface {
// on whether the TBR we're cancelling is above or below 100%.
final int percentage = (activeTemp.percentRate > 100) ? 110 : 90;
log.debug("cancelTempBasal: changing TBR to " + percentage + "% for 15 mins.");
commandResult = runCommand(MainApp.sResources.getString(R.string.combo_action_setting_tbr), () -> ruffyScripter.setTbr(percentage, 15));
commandResult = runCommand(MainApp.sResources.getString(R.string.combo_pump_action_setting_tbr), () -> ruffyScripter.setTbr(percentage, 15));
if (commandResult.enacted) {
tempBasal = new TemporaryBasal(System.currentTimeMillis());

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

@ -690,7 +690,7 @@
<string name="combo_pump_state_normal">Normaler Betrieb</string>
<string name="combo_stats">Statistiken</string>
<string name="combo_programming_bolus">Bolusabgabe wird vorbereitet</string>
<string name="combo_action_cancelling_tbr">TBR wird abgebrochen</string>
<string name="combo_action_setting_tbr">TBR wird gesetzt</string>
<string name="combo_action_bolusing">Bolus wird abgegeben</string>
<string name="combo_pump_action_cancelling_tbr">TBR wird abgebrochen</string>
<string name="combo_pump_action_setting_tbr">TBR wird gesetzt</string>
<string name="combo_pump_action_bolusing">Bolus wird abgegeben</string>
</resources>

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

@ -771,10 +771,11 @@
<string name="combo_pump_state_suspended_by_user">Suspended by user</string>
<string name="combo_pump_state_normal">Normal</string>
<string name="combo_pump_action_checking_history">Checking pump history</string>
<string name="combo_action_cancelling_tbr">Cancelling TBR</string>
<string name="combo_action_setting_tbr">Setting TBR</string>
<string name="combo_action_bolusing">Bolusing</string>
<string name="combo_action_idle">Idle</string>
<string name="combo_pump_action_cancelling_tbr">Cancelling TBR</string>
<string name="combo_pump_action_setting_tbr">Setting TBR</string>
<string name="combo_pump_action_bolusing">Bolusing</string>
<string name="combo_pump_action_refreshing">Refreshing</string>
<string name="combo_pump_action_idle">Idle</string>
<string name="pump_unreachable">Pump unreachable</string>
<string name="missed_bg_readings">Missed BG readings</string>
<string name="key_raise_urgent_alarms_as_android_notification" translatable="false">raise_urgent_alarms_as_android_notification</string>