From b04cf3aedc21bc608fb63f8c91ee0c4a28b059d0 Mon Sep 17 00:00:00 2001 From: davotoula Date: Wed, 20 May 2026 23:56:54 +0200 Subject: [PATCH] i18n: convert calendar_reminder_settings_lead_choice to MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The lead-time chip label "%1$d min" pairs a count with a noun, which inflects in Slavic / Baltic languages. Switch it from to in the default locale and in the three locales that already have a translation (pl-rPL, zh-rCN, hu-rHU), and update the single caller in CalendarReminderSettingsScreen to use pluralStringResource. The abbreviation "min" / "min." / "perc" / "分钟" doesn't decline with the count in any of these specific languages, but the resource shape is now correct for future locales that do (e.g. Russian, Ukrainian). --- .../loggedIn/calendars/CalendarReminderSettingsScreen.kt | 3 ++- amethyst/src/main/res/values-hu-rHU/strings.xml | 5 ++++- amethyst/src/main/res/values-pl-rPL/strings.xml | 7 ++++++- amethyst/src/main/res/values-zh-rCN/strings.xml | 4 +++- amethyst/src/main/res/values/strings.xml | 5 ++++- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/calendars/CalendarReminderSettingsScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/calendars/CalendarReminderSettingsScreen.kt index 543fc987d5..8299ce35d4 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/calendars/CalendarReminderSettingsScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/calendars/CalendarReminderSettingsScreen.kt @@ -43,6 +43,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.unit.dp import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.commons.icons.symbols.Icon @@ -137,7 +138,7 @@ fun CalendarReminderSettingsScreen(nav: INav) { }, enabled = enabled, label = { - Text(stringRes(R.string.calendar_reminder_settings_lead_choice, choice)) + Text(pluralStringResource(R.plurals.calendar_reminder_settings_lead_choice, choice, choice)) }, ) } diff --git a/amethyst/src/main/res/values-hu-rHU/strings.xml b/amethyst/src/main/res/values-hu-rHU/strings.xml index 50f121cc3f..19bc977ff3 100644 --- a/amethyst/src/main/res/values-hu-rHU/strings.xml +++ b/amethyst/src/main/res/values-hu-rHU/strings.xml @@ -1771,7 +1771,10 @@ Értesítés, ha egy esemény, amin Ön részt vesz, hamarosan elkezdődik. Emlékeztető értesítési ideje Hány perccel az esemény előtt szeretne értesítést kapni. - %1$d perc + + %1$d perc + %1$d perc + Megosztás mint nostr-hivatkozás Naptár-hivatkozás megosztása Összes naptár diff --git a/amethyst/src/main/res/values-pl-rPL/strings.xml b/amethyst/src/main/res/values-pl-rPL/strings.xml index 5e504ddfdd..7664ed6efe 100644 --- a/amethyst/src/main/res/values-pl-rPL/strings.xml +++ b/amethyst/src/main/res/values-pl-rPL/strings.xml @@ -1783,7 +1783,12 @@ Zaplanowane posty z innych kont nie zostaną opublikowane, dopóki to konto jest Powiadomienie pojawia się, gdy zbliża się rozpoczęcie wydarzenia, w którym bierzesz udział. Przypomnienie o terminie realizacji Ile minut przed wydarzeniem chcesz zostać powiadomiony. - %1$d min. + + %1$d min. + %1$d min. + %1$d min. + %1$d min. + Udostępnij jako link nostr Udostępnij link do kalendarza Wszystkie kalendarze diff --git a/amethyst/src/main/res/values-zh-rCN/strings.xml b/amethyst/src/main/res/values-zh-rCN/strings.xml index a900073a34..f7274f778b 100644 --- a/amethyst/src/main/res/values-zh-rCN/strings.xml +++ b/amethyst/src/main/res/values-zh-rCN/strings.xml @@ -1763,7 +1763,9 @@ 您正参加的活动即将开始时发出通知。 提前相隔时间 您想要在活动前几分钟被通知。 - %1$d 分钟 + + %1$d 分钟 + 作为 nostr 链接分享 共享日历链接 所有日历 diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml index 11d207a6c3..557cfb208c 100644 --- a/amethyst/src/main/res/values/strings.xml +++ b/amethyst/src/main/res/values/strings.xml @@ -1995,7 +1995,10 @@ A notification fires when an event you\'re attending is about to start. Reminder lead time How many minutes before the event you want to be notified. - %1$d min + + %1$d min + %1$d min + Share as nostr link Share calendar link All calendars