From 7f63c514a85d24c0a6040634768e57457cc41f79 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Mon, 5 Oct 2026 00:32:54 -0400 Subject: [PATCH] l10n: translate the Back button's order labels MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Session tab's Back setting showed "1: menu 2: QAM" in every language: the two orders were Kotlin constants. They are string resources now, written as "Menu → QAM" and "QAM → Menu" and translated. --- .../java/com/droiddeck/launcher/session/SessionPrefs.kt | 9 ++++++--- .../main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt | 6 +++--- .../java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt | 6 +++--- .../java/com/droiddeck/launcher/ui/SessionOverlay.kt | 2 +- app/src/main/res/values-es/strings.xml | 2 ++ app/src/main/res/values-ja/strings.xml | 2 ++ app/src/main/res/values-ko/strings.xml | 2 ++ app/src/main/res/values-zh-rCN/strings.xml | 2 ++ app/src/main/res/values-zh-rHK/strings.xml | 2 ++ app/src/main/res/values-zh-rTW/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 11 files changed, 27 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 4b0434801..423f63bb6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.session import android.content.Context +import androidx.annotation.StringRes import com.droiddeck.launcher.R import com.droiddeck.launcher.core.TextureFiltering import com.droiddeck.launcher.gpu.ScreenEffects @@ -19,10 +20,12 @@ object SessionPrefs { const val OSC_STEAM_QAM = "steam-qam" const val OSC_NEVER = "never" - const val BACK_MENU_THEN_QAM = "1: menu 2: QAM" - const val BACK_QAM_THEN_MENU = "1: QAM 2: menu" + /** What Back does in a Steam session, first press then second: the labels of the two orders. */ + val BACK_MENU_THEN_QAM = R.string.back_menu_then_qam + val BACK_QAM_THEN_MENU = R.string.back_qam_then_menu - fun backActionsOrder(inverted: Boolean): String = + @StringRes + fun backActionsOrder(inverted: Boolean): Int = if (inverted) BACK_QAM_THEN_MENU else BACK_MENU_THEN_QAM private fun prefs(context: Context) = context.getSharedPreferences("session", Context.MODE_PRIVATE) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 431a495a2..5c3394edf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -297,10 +297,10 @@ internal fun SetupPanel( 2 -> { SettingsGroup(stringResource(R.string.setup_session)) { ChoiceRow( - host, "back-actions", stringResource(R.string.mode_back), SessionPrefs.backActionsOrder(s.backActionsInverted), + host, "back-actions", stringResource(R.string.mode_back), stringResource(SessionPrefs.backActionsOrder(s.backActionsInverted)), listOf( - false to SessionPrefs.BACK_MENU_THEN_QAM, - true to SessionPrefs.BACK_QAM_THEN_MENU, + false to stringResource(SessionPrefs.BACK_MENU_THEN_QAM), + true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU), ), s.backActionsInverted, onPick = a.onBackActionsInverted, ) SettingsRow(stringResource(R.string.frame_gen_title), stringResource(R.string.frame_gen_hint)) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 01b66d382..06e7bfd27 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -274,10 +274,10 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { onPick = a.onSteamController, ) if (steam) ChoiceRow( - host, "back-actions", stringResource(R.string.mode_back), SessionPrefs.backActionsOrder(s.backActionsInverted), + host, "back-actions", stringResource(R.string.mode_back), stringResource(SessionPrefs.backActionsOrder(s.backActionsInverted)), listOf( - false to SessionPrefs.BACK_MENU_THEN_QAM, - true to SessionPrefs.BACK_QAM_THEN_MENU, + false to stringResource(SessionPrefs.BACK_MENU_THEN_QAM), + true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU), ), s.backActionsInverted, onPick = a.onBackActionsInverted, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 70488411d..791fe6857 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -410,7 +410,7 @@ fun SessionDrawer(open: Boolean, page: Int, controllerActive: Boolean, onPageCha chipModifier = focus.track(page, "keyboard-button"), onChange = a.onKeyboardButton) } if (a.steam) ChoiceRow(host, "back-actions", stringResource(R.string.mode_back), null, - listOf(false to SessionPrefs.BACK_MENU_THEN_QAM, true to SessionPrefs.BACK_QAM_THEN_MENU), + listOf(false to stringResource(SessionPrefs.BACK_MENU_THEN_QAM), true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU)), a.backActionsInverted, chipModifier = focus.track(page, "back-actions"), onPick = a.onBackActionsInverted) } SettingsGroup(stringResource(R.string.drawer_keyboard)) { diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 9ff241b7a..f6cf1cc41 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -259,6 +259,8 @@ Mando Xbox 360 Deck: botón de Quick Access y giroscopio. Xbox 360: abre Quick Access con Guide+A. Atrás + Menú → QAM + QAM → Menú Sesión Comportamiento en segundo plano Cuando la app se oculta o la pantalla se apaga. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 830c1842c..b4a6c896d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -259,6 +259,8 @@ Xbox 360コントローラー Deck:クイックアクセスボタンとジャイロを提供します。Xbox 360:Guide+Aでクイックアクセスを開きます。 戻る + メニュー → QAM + QAM → メニュー セッション バックグラウンド動作 アプリが非表示または画面オフ時の動作。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index b43c6e75c..2d1fab3f8 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -259,6 +259,8 @@ Xbox 360 컨트롤러 Deck: 빠른 액세스 버튼과 자이로스코프를 제공합니다. Xbox 360: Guide+A로 빠른 액세스를 엽니다. 뒤로 + 메뉴 → QAM + QAM → 메뉴 세션 백그라운드 동작 앱이 숨겨지거나 화면이 꺼졌을 때의 동작입니다. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0b27cefe3..c7b1f374c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -259,6 +259,8 @@ Xbox 360 手柄 Deck:快捷访问按钮与陀螺仪。Xbox 360:用 Guide+A 打开快捷访问。 返回 + 菜单 → QAM + QAM → 菜单 会话 后台行为 应用被隐藏或屏幕关闭时。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index ccc9e9397..aad608900 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -259,6 +259,8 @@ Xbox 360 控制器 Deck:提供快速存取按鈕和陀螺儀。Xbox 360:按 Guide+A 開啟快速存取。 返回 + 選單 → QAM + QAM → 選單 會話 背景行為 應用程式被隱藏或螢幕關閉時。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d294dd94e..5a30e4a5c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -259,6 +259,8 @@ Xbox 360 控制器 Deck:提供快速存取按鈕和陀螺儀。Xbox 360:使用 Guide+A 開啟快速存取。 返回 + 選單 → QAM + QAM → 選單 工作階段 背景行為 應用程式隱藏或螢幕關閉時的行為。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5266729cd..8640a812d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -259,6 +259,8 @@ Xbox 360 controller Deck: Quick Access button and gyro. Xbox 360: open Quick Access with Guide+A. Back + Menu → QAM + QAM → Menu Session Background behavior When the app is hidden or the screen turns off.