From 4006aebf35feb4121c354fbe9b123a0011e7c3b2 Mon Sep 17 00:00:00 2001 From: davotoula Date: Sat, 23 Aug 2025 18:24:10 +0100 Subject: [PATCH] added I18n for new strings --- .../vitorpamplona/amethyst/ui/components/TextSpinner.kt | 9 +++++++-- .../amethyst/ui/navigation/topbars/FeedFilterSpinner.kt | 4 ++-- amethyst/src/main/res/values/strings.xml | 4 ++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt index bf97eafff..70ac08421 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt @@ -59,6 +59,8 @@ import androidx.compose.ui.semantics.stateDescription import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog +import com.vitorpamplona.amethyst.R +import com.vitorpamplona.amethyst.ui.stringRes import com.vitorpamplona.amethyst.ui.theme.DividerThickness import com.vitorpamplona.amethyst.ui.theme.Font14SP import kotlinx.collections.immutable.ImmutableList @@ -125,6 +127,8 @@ private fun BaseTextSpinner( "Dropdown menu, $currentText selected" } + val openDropdownLabel = stringRes(R.string.open_dropdown_menu) + Box( modifier = modifier, contentAlignment = Alignment.Center, @@ -146,7 +150,7 @@ private fun BaseTextSpinner( }.semantics { role = Role.DropdownList stateDescription = accessibilityDescription - onClick(label = "Open dropdown menu") { + onClick(label = openDropdownLabel) { optionsShowing = true focusRequester.requestFocus() return@onClick true @@ -227,6 +231,7 @@ fun SpinnerSelectionDialog( } } itemsIndexed(options) { index, item -> + val optionsOfLabel = stringRes(R.string.option_of, index + 1, options.size) Row( modifier = Modifier @@ -235,7 +240,7 @@ fun SpinnerSelectionDialog( .padding(16.dp, 16.dp) .semantics { role = Role.Button - contentDescription = "Option ${index + 1} of ${options.size}" + contentDescription = optionsOfLabel }, ) { Column { onRenderItem(item) } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt index 7b9edb425..163011d9c 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt @@ -120,9 +120,9 @@ fun FeedFilterSpinner( val accessibilityDescription = if (selected != null) { - "Feed filter, $currentText selected" + stringRes(R.string.feed_filter_selected, currentText) } else { - "Feed filter, $selectAnOption" + stringRes(R.string.feed_filter_select_an_option, selectAnOption) } Box( diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml index e89766e8e..6d334f05f 100644 --- a/amethyst/src/main/res/values/strings.xml +++ b/amethyst/src/main/res/values/strings.xml @@ -1231,4 +1231,8 @@ Languages shown here will not be translated. Select a language to remove it and have it translated again. Pause Play + Open dropdown menu + Option %1$s of %2$s + Feed filter, %1$s selected + Feed filter, %1$s