caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'pull/2185' into dev

Browse source
This commit is contained in:
Milos Kozak 2019-11-22 16:10:55 +01:00
commit f537c0090a
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
View file

@ -100,8 +100,8 @@ public class CareportalEvent implements DataPointWithLabelInterface, Interval {
String hours = " " + MainApp.gs(R.string.hours) + " ";
if (useShortText) {
days = "d";
hours = "h";
days = MainApp.gs(R.string.shortday);
hours = MainApp.gs(R.string.shorthour);
}
return diff.get(TimeUnit.DAYS) + days + diff.get(TimeUnit.HOURS) + hours;

2
app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
View file

@ -185,7 +185,7 @@ public class DateUtil {
long remainingTimeMinutes = timeInMillis / (1000 * 60);
long remainingTimeHours = remainingTimeMinutes / 60;
remainingTimeMinutes = remainingTimeMinutes % 60;
return "(" + ((remainingTimeHours > 0) ? (remainingTimeHours + "h ") : "") + remainingTimeMinutes + "')";
return "(" + ((remainingTimeHours > 0) ? (remainingTimeHours + MainApp.gs(R.string.shorthour) + " ") : "") + remainingTimeMinutes + "')";
}
public static String sinceString(long timestamp) {

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

@ -778,6 +778,7 @@
<string name="shortgramm">g</string>
<string name="shortminute">m</string>
<string name="shorthour">h</string>
<string name="shortday">d</string>
<string name="none"><![CDATA[<none>]]></string>
<string name="shortkilojoul">kJ</string>
<string name="shortenergy">En</string>

2
app/src/test/java/info/AAPSMocker.java
View file

@ -107,6 +107,8 @@ public class AAPSMocker {
when(MainApp.gs(R.string.configbuilder_insulin)).thenReturn("Insulin");
when(MainApp.gs(R.string.bolusdelivering)).thenReturn("Delivering 0.0U");
when(MainApp.gs(R.string.profile_per_unit)).thenReturn("/U");
when(MainApp.gs(R.string.shortday)).thenReturn("d");
when(MainApp.gs(R.string.shorthour)).thenReturn("h");
when(MainApp.gs(R.string.profile_carbs_per_unit)).thenReturn("g/U");
when(MainApp.gs(R.string.profile_ins_units_per_hour)).thenReturn("U/h");
when(MainApp.gs(R.string.sms_wrongcode)).thenReturn("Wrong code. Command cancelled.");