caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

move strings

Browse source
This commit is contained in:
Milos Kozak 2022-10-31 21:54:53 +01:00
parent 950fedfef3
commit 32f3aee6ef
11 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
View file

@ -210,7 +210,7 @@ class CareDialog : DialogFragmentWithDate() {
valuesWithUnit.add(ValueWithUnit.TherapyEventMeterType(meterType)) valuesWithUnit.add(ValueWithUnit.TherapyEventMeterType(meterType))
} }
if (options == EventType.NOTE || options == EventType.EXERCISE) { if (options == EventType.NOTE || options == EventType.EXERCISE) {
actions.add(rh.gs(R.string.careportal_newnstreatment_duration_label) + ": " + rh.gs(R.string.format_mins, binding.duration.value.toInt())) actions.add(rh.gs(R.string.duration_label) + ": " + rh.gs(R.string.format_mins, binding.duration.value.toInt()))
therapyEvent.duration = T.mins(binding.duration.value.toLong()).msecs() therapyEvent.duration = T.mins(binding.duration.value.toLong()).msecs()
valuesWithUnit.add(ValueWithUnit.Minute(binding.duration.value.toInt()).takeIf { !binding.duration.value.equals(0.0) } ) valuesWithUnit.add(ValueWithUnit.Minute(binding.duration.value.toInt()).takeIf { !binding.duration.value.equals(0.0) } )
} }

2
app/src/main/res/layout/autotune_fragment.xml
View file

@ -90,7 +90,7 @@
android:layout_weight="1" android:layout_weight="1"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
app:customContentDescription="@string/careportal_newnstreatment_duration_label" /> app:customContentDescription="@string/duration_label" />
</LinearLayout> </LinearLayout>

4
app/src/main/res/layout/dialog_care.xml
View file

@ -128,7 +128,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:width="120dp" android:width="120dp"
android:padding="10dp" android:padding="10dp"
android:text="@string/careportal_newnstreatment_duration_label" android:text="@string/duration_label"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="bold" /> android:textStyle="bold" />
@ -136,7 +136,7 @@
android:id="@+id/duration" android:id="@+id/duration"
android:layout_width="130dp" android:layout_width="130dp"
android:layout_height="40dp" android:layout_height="40dp"
app:customContentDescription="@string/careportal_newnstreatment_duration_label" /> app:customContentDescription="@string/duration_label" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

4
app/src/main/res/layout/dialog_extendedbolus.xml
View file

@ -92,7 +92,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:width="120dp" android:width="120dp"
android:padding="10dp" android:padding="10dp"
android:text="@string/careportal_newnstreatment_duration_label" android:text="@string/duration_label"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="bold" /> android:textStyle="bold" />
@ -100,7 +100,7 @@
android:id="@+id/duration" android:id="@+id/duration"
android:layout_width="130dp" android:layout_width="130dp"
android:layout_height="40dp" android:layout_height="40dp"
app:customContentDescription="@string/careportal_newnstreatment_duration_label" /> app:customContentDescription="@string/duration_label" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

4
app/src/main/res/layout/dialog_profileswitch.xml
View file

@ -93,7 +93,7 @@
android:width="120dp" android:width="120dp"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:text="@string/careportal_newnstreatment_duration_label" android:text="@string/duration_label"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="bold" /> android:textStyle="bold" />
@ -102,7 +102,7 @@
android:layout_width="130dp" android:layout_width="130dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
app:customContentDescription="@string/careportal_newnstreatment_duration_label" /> app:customContentDescription="@string/duration_label" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

4
app/src/main/res/layout/dialog_tempbasal.xml
View file

@ -131,7 +131,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:width="120dp" android:width="120dp"
android:padding="10dp" android:padding="10dp"
android:text="@string/careportal_newnstreatment_duration_label" android:text="@string/duration_label"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="bold" /> android:textStyle="bold" />
@ -139,7 +139,7 @@
android:id="@+id/duration" android:id="@+id/duration"
android:layout_width="130dp" android:layout_width="130dp"
android:layout_height="40dp" android:layout_height="40dp"
app:customContentDescription="@string/careportal_newnstreatment_duration_label" /> app:customContentDescription="@string/duration_label" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

4
app/src/main/res/layout/dialog_temptarget.xml
View file

@ -94,7 +94,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:width="120dp" android:width="120dp"
android:padding="10dp" android:padding="10dp"
android:text="@string/careportal_newnstreatment_duration_label" android:text="@string/duration_label"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="bold" /> android:textStyle="bold" />
@ -102,7 +102,7 @@
android:id="@+id/duration" android:id="@+id/duration"
android:layout_width="130dp" android:layout_width="130dp"
android:layout_height="40dp" android:layout_height="40dp"
app:customContentDescription="@string/careportal_newnstreatment_duration_label" /> app:customContentDescription="@string/duration_label" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

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

@ -171,7 +171,6 @@
<string name="careportal_newnstreatment_meter">Meter</string> <string name="careportal_newnstreatment_meter">Meter</string>
<string name="careportal_newnstreatment_sensor">Sensor</string> <string name="careportal_newnstreatment_sensor">Sensor</string>
<string name="carb_time_label">Carb time</string> <string name="carb_time_label">Carb time</string>
<string name="careportal_newnstreatment_duration_label">Duration</string>
<string name="profile_label">Profile</string> <string name="profile_label">Profile</string>
<string name="careportal_newnstreatment_glucosetype">Glucose type</string> <string name="careportal_newnstreatment_glucosetype">Glucose type</string>
<string name="overview_tempbasal_button">TempBasal</string> <string name="overview_tempbasal_button">TempBasal</string>
@ -547,7 +546,6 @@
<string name="wearcontrol_title">Controls from Watch</string> <string name="wearcontrol_title">Controls from Watch</string>
<string name="wearcontrol_summary">Set Temp-Targets and enter Treatments from the watch.</string> <string name="wearcontrol_summary">Set Temp-Targets and enter Treatments from the watch.</string>
<string name="food">Food</string> <string name="food">Food</string>
<string name="shortgramm">g</string>
<string name="none"><![CDATA[<none>]]></string> <string name="none"><![CDATA[<none>]]></string>
<string name="shortkilojoul">kJ</string> <string name="shortkilojoul">kJ</string>
<string name="shortenergy">En</string> <string name="shortenergy">En</string>
@ -655,8 +653,6 @@
<string name="allow_automated_crash_reporting">Allow automated crash reporting and feature usage data to be sent to the developers via the fabric.io service.</string> <string name="allow_automated_crash_reporting">Allow automated crash reporting and feature usage data to be sent to the developers via the fabric.io service.</string>
<string name="g5appnotdetected">Please update your Dexcom app to supported version</string> <string name="g5appnotdetected">Please update your Dexcom app to supported version</string>
<string name="dexcom_app_not_installed">Dexcom app is not installed.</string> <string name="dexcom_app_not_installed">Dexcom app is not installed.</string>
<string name="start_activity_tt">Start Activity TT</string>
<string name="start_eating_soon_tt">Start Eating soon TT</string>
<string name="do_not_bolus_record_only">Do not bolus, record only</string> <string name="do_not_bolus_record_only">Do not bolus, record only</string>
<string name="category">Category</string> <string name="category">Category</string>
<string name="subcategory">Subcategory</string> <string name="subcategory">Subcategory</string>
@ -669,7 +665,6 @@
<string name="overview_show_cob">Carbs On Board</string> <string name="overview_show_cob">Carbs On Board</string>
<string name="overview_show_iob">Insulin On Board</string> <string name="overview_show_iob">Insulin On Board</string>
<string name="overview_show_basals">Basals</string> <string name="overview_show_basals">Basals</string>
<string name="start_hypo_tt">Start Hypo TT</string>
<string name="closed_loop_disabled_on_dev_branch">Running dev version. Closed loop is disabled.</string> <string name="closed_loop_disabled_on_dev_branch">Running dev version. Closed loop is disabled.</string>
<string name="engineering_mode_enabled">Engineering mode enabled</string> <string name="engineering_mode_enabled">Engineering mode enabled</string>
<string name="profileswitch_ismissing">ProfileSwitch missing. Please do a profile switch or press \"Activate Profile\" in the LocalProfile.</string> <string name="profileswitch_ismissing">ProfileSwitch missing. Please do a profile switch or press \"Activate Profile\" in the LocalProfile.</string>
@ -829,8 +824,6 @@
<string name="nav_logsettings">Log settings</string> <string name="nav_logsettings">Log settings</string>
<string name="resettodefaults">Reset to defaults</string> <string name="resettodefaults">Reset to defaults</string>
<string name="nsmalfunction">NSClient malfunction. Consider NS and NSClient restart.</string> <string name="nsmalfunction">NSClient malfunction. Consider NS and NSClient restart.</string>
<string name="time_offset">Time offset</string>
<string name="remind_to_bolus_later">Remind to bolus later</string>
<string name="key_aps_mode" translatable="false">aps_mode</string> <string name="key_aps_mode" translatable="false">aps_mode</string>
<string name="setupwizard_preferred_aps_mode">Preferred APS mode</string> <string name="setupwizard_preferred_aps_mode">Preferred APS mode</string>
<string name="treatments_wizard_total_label">Total</string> <string name="treatments_wizard_total_label">Total</string>
@ -906,7 +899,6 @@
<string name="format_carbs_ic">%1$.0fg IC: %2$.1f</string> <string name="format_carbs_ic">%1$.0fg IC: %2$.1f</string>
<string name="format_cob_ic">%1$.1fg IC: %2$.1f</string> <string name="format_cob_ic">%1$.1fg IC: %2$.1f</string>
<string name="format_percent">%1$d%%</string> <string name="format_percent">%1$d%%</string>
<string name="unit_minute_short">min</string>
<string name="profile_name">Profile name:</string> <string name="profile_name">Profile name:</string>
<string name="selected_profile">Selected:</string> <string name="selected_profile">Selected:</string>
<string name="unitsnosemicolon">Units</string> <string name="unitsnosemicolon">Units</string>
@ -1131,7 +1123,6 @@
<string name="a11y_insulin_label">insulin</string> <string name="a11y_insulin_label">insulin</string>
<string name="a11y_blood_glucose">blood glucose</string> <string name="a11y_blood_glucose">blood glucose</string>
<string name="a11y_bg_outdated">outdated</string> <string name="a11y_bg_outdated">outdated</string>
<string name="a11y_carb_reminder">set reminder</string>
<string name="a11y_add_new_profile">add new profile</string> <string name="a11y_add_new_profile">add new profile</string>
<string name="a11y_clone_profile">clone current profile</string> <string name="a11y_clone_profile">clone current profile</string>
<string name="a11y_delete_current_profile">delete current profile</string> <string name="a11y_delete_current_profile">delete current profile</string>

2
core/src/main/res/values/strings.xml
View file

@ -199,6 +199,8 @@
<string name="alarminxmin">Run alarm in %1$d min</string> <string name="alarminxmin">Run alarm in %1$d min</string>
<string name="treatmentdeliveryerror">Bolus reported an error. Manually check real delivered amount</string> <string name="treatmentdeliveryerror">Bolus reported an error. Manually check real delivered amount</string>
<string name="bolus_reminder">Bolus reminder</string> <string name="bolus_reminder">Bolus reminder</string>
<string name="duration_label">Duration</string>
<string name="shortgramm">g</string>
<!-- Constraints--> <!-- Constraints-->
<string name="limitingbasalratio">Limiting max basal rate to %1$.2f U/h because of %2$s</string> <string name="limitingbasalratio">Limiting max basal rate to %1$.2f U/h because of %2$s</string>

4
ui/src/main/res/layout/dialog_carbs.xml
View file

@ -148,7 +148,7 @@
android:layout_weight="1" android:layout_weight="1"
android:padding="10dp" android:padding="10dp"
android:width="120dp" android:width="120dp"
android:text="@string/careportal_newnstreatment_duration_label" android:text="@string/duration_label"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="bold" /> android:textStyle="bold" />
@ -158,7 +158,7 @@
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
app:customContentDescription="@string/careportal_newnstreatment_duration_label" /> app:customContentDescription="@string/duration_label" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

8
ui/src/main/res/values/strings.xml
View file

@ -6,5 +6,13 @@
<string name="carbs_constraint_applied">Carbs constraint applied</string> <string name="carbs_constraint_applied">Carbs constraint applied</string>
<string name="temp_target_short">TT</string> <string name="temp_target_short">TT</string>
<string name="dialog_canceled">Dialog canceled</string> <string name="dialog_canceled">Dialog canceled</string>
<string name="start_activity_tt">Start Activity TT</string>
<string name="start_eating_soon_tt">Start Eating soon TT</string>
<string name="start_hypo_tt">Start Hypo TT</string>
<string name="time_offset">Time offset</string>
<string name="unit_minute_short">min</string>
<string name="remind_to_bolus_later">Remind to bolus later</string>
<string name="a11y_carb_reminder">set reminder</string>
</resources> </resources>