caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

DASH: extract string resources

Browse source
This commit is contained in:
Milos Kozak 2022-12-17 17:36:59 +01:00
parent f1499d1886
commit 161f519063
2 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
View file

@ -191,7 +191,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
if (podStateManager.isSuspended) { if (podStateManager.isSuspended) {
showNotification( showNotification(
Notification.OMNIPOD_POD_SUSPENDED, Notification.OMNIPOD_POD_SUSPENDED,
"Insulin delivery suspended", rh.gs(R.string.insulin_delivery_suspended),
Notification.NORMAL, Notification.NORMAL,
info.nightscout.core.ui.R.raw.boluserror info.nightscout.core.ui.R.raw.boluserror
) )
@ -200,9 +200,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
if (!podStateManager.sameTimeZone) { if (!podStateManager.sameTimeZone) {
uiInteraction.addNotification( uiInteraction.addNotification(
Notification.OMNIPOD_TIME_OUT_OF_SYNC, Notification.OMNIPOD_TIME_OUT_OF_SYNC,
"Timezone on pod is different from the timezone on phone. " + rh.gs(R.string.timezone_on_pod_is_different_from_the_timezone),
"Basal rate is incorrect" +
"Switch profile to fix",
Notification.NORMAL Notification.NORMAL
) )
} }
@ -425,22 +423,21 @@ class OmnipodDashPumpPlugin @Inject constructor(
if (deliverySuspended) { if (deliverySuspended) {
showNotification( showNotification(
Notification.FAILED_UPDATE_PROFILE, Notification.FAILED_UPDATE_PROFILE,
"Failed to set the new basal profile. Delivery suspended", rh.gs(R.string.failed_to_set_the_new_basal_profile),
Notification.URGENT, Notification.URGENT,
info.nightscout.core.ui.R.raw.boluserror info.nightscout.core.ui.R.raw.boluserror
) )
} else { } else {
showNotification( showNotification(
Notification.FAILED_UPDATE_PROFILE, Notification.FAILED_UPDATE_PROFILE,
"Setting basal profile might have failed. Delivery might be suspended!" + rh.gs(R.string.setting_basal_profile_might_have_failed),
" Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.",
Notification.URGENT, Notification.URGENT,
info.nightscout.core.ui.R.raw.boluserror info.nightscout.core.ui.R.raw.boluserror
) )
} }
Completable.error(java.lang.IllegalStateException("Command not confirmed")) Completable.error(java.lang.IllegalStateException("Command not confirmed"))
} else { } else {
showNotification(Notification.PROFILE_SET_OK, "Profile set OK", Notification.INFO, null) showNotification(Notification.PROFILE_SET_OK, rh.gs(R.string.profile_set_ok), Notification.INFO, null)
Completable.complete() Completable.complete()
} }
@ -466,8 +463,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
).doOnComplete { ).doOnComplete {
notifyOnUnconfirmed( notifyOnUnconfirmed(
Notification.FAILED_UPDATE_PROFILE, Notification.FAILED_UPDATE_PROFILE,
"Suspend delivery is unconfirmed! " + rh.gs(R.string.suspend_delivery_is_unconfirmed),
"Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.",
info.nightscout.core.ui.R.raw.boluserror, info.nightscout.core.ui.R.raw.boluserror,
) )
} }
@ -644,7 +640,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
) info.nightscout.core.ui.R.raw.boluserror ) info.nightscout.core.ui.R.raw.boluserror
else 0 else 0
showErrorDialog("Bolus delivery status uncertain. Refresh pod status to confirm or deny.", sound) showErrorDialog(rh.gs(R.string.bolus_delivery_status_uncertain), sound)
} }
} }
}.toSingle { }.toSingle {
@ -724,7 +720,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
} }
for (tryNumber in 1..BOLUS_RETRIES) { for (tryNumber in 1..BOLUS_RETRIES) {
updateBolusProgressDialog("Checking delivery status", 100) updateBolusProgressDialog(rh.gs(R.string.checking_delivery_status), 100)
val cmd = if (bolusCanceled) val cmd = if (bolusCanceled)
cancelBolus() cancelBolus()
@ -856,8 +852,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
).doOnComplete { ).doOnComplete {
notifyOnUnconfirmed( notifyOnUnconfirmed(
Notification.OMNIPOD_TBR_ALERTS, Notification.OMNIPOD_TBR_ALERTS,
"Setting temp basal might have basal failed. If a temp basal was previously running, " + rh.gs(R.string.setting_temp_basal_might_have_basal_failed),
"it has been cancelled. Please manually refresh the Pod status from the Omnipod tab.",
info.nightscout.core.ui.R.raw.boluserror, info.nightscout.core.ui.R.raw.boluserror,
) )
}.toPumpEnactResultImpl() }.toPumpEnactResultImpl()
@ -917,9 +912,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
).doOnComplete { ).doOnComplete {
notifyOnUnconfirmed( notifyOnUnconfirmed(
Notification.OMNIPOD_TBR_ALERTS, Notification.OMNIPOD_TBR_ALERTS,
"Cancelling temp basal might have failed." + rh.gs(R.string.cancelling_temp_basal_might_have_failed),
"If a temp basal was previously running, it might have been cancelled." +
"Please manually refresh the Pod status from the Omnipod tab.", // TODO: i8n
info.nightscout.core.ui.R.raw.boluserror, info.nightscout.core.ui.R.raw.boluserror,
) )
} }
@ -967,7 +960,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
).doOnComplete { ).doOnComplete {
notifyOnUnconfirmed( notifyOnUnconfirmed(
Notification.OMNIPOD_TBR_ALERTS, Notification.OMNIPOD_TBR_ALERTS,
"Cancel temp basal result is uncertain", // TODO: i8n, rh.gs(R.string.cancel_temp_basal_result_is_uncertain),
info.nightscout.core.ui.R.raw.boluserror, // TODO: add setting for this info.nightscout.core.ui.R.raw.boluserror, // TODO: add setting for this
) )
}.toPumpEnactResultImpl() }.toPumpEnactResultImpl()
@ -1188,7 +1181,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
).doFinally { ).doFinally {
notifyOnUnconfirmed( notifyOnUnconfirmed(
Notification.FAILED_UPDATE_PROFILE, Notification.FAILED_UPDATE_PROFILE,
"Unconfirmed resumeDelivery command. Please refresh pod status", rh.gs(R.string.unconfirmed_resumedelivery_command_please_refresh_pod_status),
info.nightscout.core.ui.R.raw.boluserror info.nightscout.core.ui.R.raw.boluserror
) )
}.toPumpEnactResultImpl() }.toPumpEnactResultImpl()

12
pump/omnipod-dash/src/main/res/values/strings.xml
View file

@ -53,5 +53,17 @@
<string name="unconfirmed_command" comment="26 characters max for translation">Unconfirmed command</string> <string name="unconfirmed_command" comment="26 characters max for translation">Unconfirmed command</string>
<string name="requested_by_user" comment="26 characters max for translation">Requested by user</string> <string name="requested_by_user" comment="26 characters max for translation">Requested by user</string>
<string name="profile_set_ok">Profile set OK</string>
<string name="suspend_delivery_is_unconfirmed">Suspend delivery is unconfirmed! Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.</string>
<string name="insulin_delivery_suspended">Insulin delivery suspended</string>
<string name="timezone_on_pod_is_different_from_the_timezone">Timezone on pod is different from the timezone on phone. Basal rate is incorrect. Switch profile to fix</string>
<string name="failed_to_set_the_new_basal_profile">Failed to set the new basal profile. Delivery suspended</string>
<string name="setting_basal_profile_might_have_failed">Setting basal profile might have failed. Delivery might be suspended! Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.</string>
<string name="bolus_delivery_status_uncertain">Bolus delivery status uncertain. Refresh pod status to confirm or deny.</string>
<string name="checking_delivery_status">Checking delivery status</string>
<string name="setting_temp_basal_might_have_basal_failed">Setting temp basal might have basal failed. If a temp basal was previously running, it has been cancelled. Please manually refresh the Pod status from the Omnipod tab.</string>
<string name="cancel_temp_basal_result_is_uncertain">Cancel temp basal result is uncertain</string>
<string name="unconfirmed_resumedelivery_command_please_refresh_pod_status">Unconfirmed resumeDelivery command. Please refresh pod status</string>
<string name="cancelling_temp_basal_might_have_failed">Cancelling temp basal might have failed. If a temp basal was previously running, it might have been cancelled. Please manually refresh the Pod status from the Omnipod tab.</string>
</resources> </resources>