Move push notification interval text to string so that it can be tran…

…slated
microg · Aug 29, 2023 · 7335ef2 · 7335ef2 · Vavun · Sep 12, 2023
1 parent fcdeb0a
commit 7335ef2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAdvancedFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAdvancedFragment.kt
@@ -107,15 +107,15 @@ class PushNotificationAdvancedFragment : PreferenceFragmentCompat() {
     }
 
     private fun getSummaryString(value: Int, learnt: Int): String = when (value) {
-        -1 -> "OFF"
-        0 -> "ON / Automatic: " + getHeartbeatString(learnt)
-        else -> "ON / Manual: " + getHeartbeatString(value * 60000)
+        -1 -> getString(R.string.push_notifications_summary_off)
+        0 -> getString(R.string.push_notifications_summary_automatic, getHeartbeatString(learnt))
+        else -> getString(R.string.push_notifications_summary_manual, getHeartbeatString(value * 60000))
     }
 
     private fun getHeartbeatString(heartbeatMs: Int): String {
         return if (heartbeatMs < 120000) {
-            (heartbeatMs / 1000).toString() + " seconds"
-        } else (heartbeatMs / 60000).toString() + " minutes"
+            getString(R.string.push_notifications_summary_values_seconds, (heartbeatMs / 1000).toString())
+        } else getString(R.string.push_notifications_summary_values_minutes, (heartbeatMs / 60000).toString())
     }
 
     companion object {

diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
@@ -220,4 +220,9 @@ This can take a couple of minutes."</string>
     <string name="pref_safetynet_test_no_result">No result</string>
     <string name="pref_safetynet_test_invalid_json">Invalid JSON</string>
 
+    <string name="push_notifications_summary_off">OFF</string>
+    <string name="push_notifications_summary_automatic">ON / Automatic: %s</string>
+    <string name="push_notifications_summary_manual">ON / Manual: %s</string>
+    <string name="push_notifications_summary_values_seconds">%s seconds</string>
+    <string name="push_notifications_summary_values_minutes">%s minutes</string>
 </resources>