lostecho/Tomato
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(localization): make hours/minutes format strings ordered

Browse Source
This commit is contained in:
Nishant Mishra
2025-12-04 09:52:55 +05:30
parent 98db112c5b
commit 5ced6d7c29
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/nsh07/pomodoro/utils/Utils.kt
View File

@@ -49,7 +49,7 @@ fun millisecondsToMinutes(t: Long, format: String = "%dm"): String {
) )
} }
fun millisecondsToHoursMinutes(t: Long, format: String = "%dh %dm"): String { fun millisecondsToHoursMinutes(t: Long, format: String = $$"%1$dh %2$dm"): String {
require(t >= 0L) require(t >= 0L)
return String.format( return String.format(
Locale.getDefault(), Locale.getDefault(),

6
app/src/main/res/values/strings.xml
View File

@@ -46,8 +46,8 @@
<string name="focus_per_day_avg">focus per day (avg)</string> <string name="focus_per_day_avg">focus per day (avg)</string>
<string name="get_plus">Get Tomato+</string> <string name="get_plus">Get Tomato+</string>
<string name="help_with_translation">Help translate Tomato</string> <string name="help_with_translation">Help translate Tomato</string>
<string name="hours_and_minutes_format">%dh %dm</string> <string name="hours_and_minutes_format">%1$dh %2$dm</string>
<string name="hours_format">%dh</string> <string name="hours_format">%1$dh</string>
<string name="language">Language</string> <string name="language">Language</string>
<string name="last_month">Last month</string> <string name="last_month">Last month</string>
<string name="last_week">Last week</string> <string name="last_week">Last week</string>
@@ -55,7 +55,7 @@
<string name="light">Light</string> <string name="light">Light</string>
<string name="long_break">Long break</string> <string name="long_break">Long break</string>
<string name="min_remaining_notification">%1$s min remaining</string> <string name="min_remaining_notification">%1$s min remaining</string>
<string name="minutes_format">%dm</string> <string name="minutes_format">%1$dm</string>
<string name="monthly_productivity_analysis">Monthly productivity analysis</string> <string name="monthly_productivity_analysis">Monthly productivity analysis</string>
<string name="more">More</string> <string name="more">More</string>
<string name="more_info">More info</string> <string name="more_info">More info</string>