mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 22:05:59 +00:00
l10n: translate the Back button's order labels
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.
This commit is contained in:
1 parent
4a19ee9e55
commit
7f63c514a8
11 files changed
+27
-10
No files matched your search
@@ -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)
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -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,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -259,6 +259,8 @@
|
||||
<string name="mode_controller_x360">Mando Xbox 360</string>
|
||||
<string name="mode_controller_note">Deck: botón de Quick Access y giroscopio. Xbox 360: abre Quick Access con Guide+A.</string>
|
||||
<string name="mode_back">Atrás</string>
|
||||
<string name="back_menu_then_qam">Menú → QAM</string>
|
||||
<string name="back_qam_then_menu">QAM → Menú</string>
|
||||
<string name="mode_session">Sesión</string>
|
||||
<string name="mode_suspend">Comportamiento en segundo plano</string>
|
||||
<string name="mode_suspend_hint">Cuando la app se oculta o la pantalla se apaga.</string>
|
||||
|
||||
@@ -259,6 +259,8 @@
|
||||
<string name="mode_controller_x360">Xbox 360コントローラー</string>
|
||||
<string name="mode_controller_note">Deck:クイックアクセスボタンとジャイロを提供します。Xbox 360:Guide+Aでクイックアクセスを開きます。</string>
|
||||
<string name="mode_back">戻る</string>
|
||||
<string name="back_menu_then_qam">メニュー → QAM</string>
|
||||
<string name="back_qam_then_menu">QAM → メニュー</string>
|
||||
<string name="mode_session">セッション</string>
|
||||
<string name="mode_suspend">バックグラウンド動作</string>
|
||||
<string name="mode_suspend_hint">アプリが非表示または画面オフ時の動作。</string>
|
||||
|
||||
@@ -259,6 +259,8 @@
|
||||
<string name="mode_controller_x360">Xbox 360 컨트롤러</string>
|
||||
<string name="mode_controller_note">Deck: 빠른 액세스 버튼과 자이로스코프를 제공합니다. Xbox 360: Guide+A로 빠른 액세스를 엽니다.</string>
|
||||
<string name="mode_back">뒤로</string>
|
||||
<string name="back_menu_then_qam">메뉴 → QAM</string>
|
||||
<string name="back_qam_then_menu">QAM → 메뉴</string>
|
||||
<string name="mode_session">세션</string>
|
||||
<string name="mode_suspend">백그라운드 동작</string>
|
||||
<string name="mode_suspend_hint">앱이 숨겨지거나 화면이 꺼졌을 때의 동작입니다.</string>
|
||||
|
||||
@@ -259,6 +259,8 @@
|
||||
<string name="mode_controller_x360">Xbox 360 手柄</string>
|
||||
<string name="mode_controller_note">Deck:快捷访问按钮与陀螺仪。Xbox 360:用 Guide+A 打开快捷访问。</string>
|
||||
<string name="mode_back">返回</string>
|
||||
<string name="back_menu_then_qam">菜单 → QAM</string>
|
||||
<string name="back_qam_then_menu">QAM → 菜单</string>
|
||||
<string name="mode_session">会话</string>
|
||||
<string name="mode_suspend">后台行为</string>
|
||||
<string name="mode_suspend_hint">应用被隐藏或屏幕关闭时。</string>
|
||||
|
||||
@@ -259,6 +259,8 @@
|
||||
<string name="mode_controller_x360">Xbox 360 控制器</string>
|
||||
<string name="mode_controller_note">Deck:提供快速存取按鈕和陀螺儀。Xbox 360:按 Guide+A 開啟快速存取。</string>
|
||||
<string name="mode_back">返回</string>
|
||||
<string name="back_menu_then_qam">選單 → QAM</string>
|
||||
<string name="back_qam_then_menu">QAM → 選單</string>
|
||||
<string name="mode_session">會話</string>
|
||||
<string name="mode_suspend">背景行為</string>
|
||||
<string name="mode_suspend_hint">應用程式被隱藏或螢幕關閉時。</string>
|
||||
|
||||
@@ -259,6 +259,8 @@
|
||||
<string name="mode_controller_x360">Xbox 360 控制器</string>
|
||||
<string name="mode_controller_note">Deck:提供快速存取按鈕和陀螺儀。Xbox 360:使用 Guide+A 開啟快速存取。</string>
|
||||
<string name="mode_back">返回</string>
|
||||
<string name="back_menu_then_qam">選單 → QAM</string>
|
||||
<string name="back_qam_then_menu">QAM → 選單</string>
|
||||
<string name="mode_session">工作階段</string>
|
||||
<string name="mode_suspend">背景行為</string>
|
||||
<string name="mode_suspend_hint">應用程式隱藏或螢幕關閉時的行為。</string>
|
||||
|
||||
@@ -259,6 +259,8 @@
|
||||
<string name="mode_controller_x360">Xbox 360 controller</string>
|
||||
<string name="mode_controller_note">Deck: Quick Access button and gyro. Xbox 360: open Quick Access with Guide+A.</string>
|
||||
<string name="mode_back">Back</string>
|
||||
<string name="back_menu_then_qam">Menu → QAM</string>
|
||||
<string name="back_qam_then_menu">QAM → Menu</string>
|
||||
<string name="mode_session">Session</string>
|
||||
<string name="mode_suspend">Background behavior</string>
|
||||
<string name="mode_suspend_hint">When the app is hidden or the screen turns off.</string>
|
||||
|
||||
Reference in new issue
Block a user