From 5ced6d7c29eb8f2eac510f7088a5f9e538601ca4 Mon Sep 17 00:00:00 2001
From: Nishant Mishra <nishant.28@outlook.com>
Date: Thu, 4 Dec 2025 09:52:55 +0530
Subject: [PATCH] fix(localization): make hours/minutes format strings ordered

---
 app/src/main/java/org/nsh07/pomodoro/utils/Utils.kt | 2 +-
 app/src/main/res/values/strings.xml                 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/nsh07/pomodoro/utils/Utils.kt b/app/src/main/java/org/nsh07/pomodoro/utils/Utils.kt
index 592b368..1497fb8 100644
--- a/app/src/main/java/org/nsh07/pomodoro/utils/Utils.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/utils/Utils.kt
@@ -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)
     return String.format(
         Locale.getDefault(),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ce1e60a..112488e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -46,8 +46,8 @@
     <string name="focus_per_day_avg">focus per day (avg)</string>
     <string name="get_plus">Get Tomato+</string>
     <string name="help_with_translation">Help translate Tomato</string>
-    <string name="hours_and_minutes_format">%dh %dm</string>
-    <string name="hours_format">%dh</string>
+    <string name="hours_and_minutes_format">%1$dh %2$dm</string>
+    <string name="hours_format">%1$dh</string>
     <string name="language">Language</string>
     <string name="last_month">Last month</string>
     <string name="last_week">Last week</string>
@@ -55,7 +55,7 @@
     <string name="light">Light</string>
     <string name="long_break">Long break</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="more">More</string>
     <string name="more_info">More info</string>