diff --git a/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt b/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt index 919f1a9..bcb3e4f 100644 --- a/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt +++ b/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt @@ -194,7 +194,7 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere 1 -> getString(R.string.settings_notifications_min_priority_summary_any) 5 -> getString(R.string.settings_notifications_min_priority_summary_max) else -> { - val minPriorityString = toPriorityString(minPriorityValue) + val minPriorityString = toPriorityString(requireContext(), minPriorityValue) getString(R.string.settings_notifications_min_priority_summary_x_or_higher, minPriorityValue, minPriorityString) } } diff --git a/app/src/main/java/io/heckel/ntfy/util/Util.kt b/app/src/main/java/io/heckel/ntfy/util/Util.kt index 2316438..7df8718 100644 --- a/app/src/main/java/io/heckel/ntfy/util/Util.kt +++ b/app/src/main/java/io/heckel/ntfy/util/Util.kt @@ -84,14 +84,14 @@ fun toPriority(priority: Int?): Int { else return 3 } -fun toPriorityString(priority: Int): String { +fun toPriorityString(context: Context, priority: Int): String { return when (priority) { - 1 -> "min" - 2 -> "low" - 3 -> "default" - 4 -> "high" - 5 -> "max" - else -> "default" + 1 -> context.getString(R.string.settings_notifications_priority_min) + 2 -> context.getString(R.string.settings_notifications_priority_low) + 3 -> context.getString(R.string.settings_notifications_priority_default) + 4 -> context.getString(R.string.settings_notifications_priority_high) + 5 -> context.getString(R.string.settings_notifications_priority_max) + else -> context.getString(R.string.settings_notifications_priority_default) } } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8afa906..59f6ac6 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -148,6 +148,11 @@ Niedrige Priorität und höher Standard-Priorität und höher Hohe Priorität und höher + min + gering + standard + hoch + max Anhänge herunterladen Anhänge nie automatisch herunterladen Kleiner 1 MB diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9a3413d..42213d7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -236,6 +236,11 @@ Default priority and above High priority and above Only max priority + min + low + default + high + max Download attachments Auto-download all attachments Never auto-download attachments diff --git a/fastlane/metadata/android/en-US/changelog/25.txt b/fastlane/metadata/android/en-US/changelog/25.txt index 0bde82b..7ab58c5 100644 --- a/fastlane/metadata/android/en-US/changelog/25.txt +++ b/fastlane/metadata/android/en-US/changelog/25.txt @@ -7,17 +7,18 @@ Bugs: * IllegalStateException: Failed to build unique file (#177, thanks to @Fallenbagel for reporting) * SQLiteConstraintException: Crash during UP registration (#185) * Refresh preferences screen after settings import (#183, thanks to @cmeis for reporting) +* Add priority strings to strings.xml to make it translatable (#192, thanks to @StoyanDimitrov) Translations: * English language improvements (thanks to @comradekingu) * Bulgarian (thanks to @StoyanDimitrov) -* Dutch (incomplete, thanks to @diony](https://hosted.weblate.org/user/diony)) -* Chinese (incomplete, thanks to @poi) +* Chinese/Simplified (thanks to @poi and @PeterCxy) +* Dutch (incomplete, thanks to @diony) * French (incomplete, thanks to @Kusoneko) * German (thanks to @cmeis) * Italian (thanks to @theTranslator) * Norwegian (incomplete, thanks to @comradekingu) -* Portuguese (Brazil, thanks to @LW) +* Portuguese/Brazil (thanks to @LW) * Spanish (thanks to @rogeliodh) * Turkish (thanks to @ersen)