Skip to content

馃З Modernizer: Replace hardcoded strings in AdvancedScreen dialogs #645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LeanBitLab wants to merge 1 commit into from
Closed

馃З Modernizer: Replace hardcoded strings in AdvancedScreen dialogs #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions app/src/main/java/helium314/keyboard/settings/screens/AdvancedScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ fun createAdvancedSettings(context: Context) = listOfNotNull(
if (showCustomDialog) {
TextInputDialog(
onDismissRequest = { showCustomDialog = false },
textInputLabel = { Text("Language name or code (e.g. Esperanto, Malayalam, de)") },
textInputLabel = { Text(stringResource(R.string.custom_language_hint)) },
initialText = "",
onConfirmed = { customLang ->
val trimmed = customLang.trim()
Expand All @@ -672,7 +672,7 @@ fun createAdvancedSettings(context: Context) = listOfNotNull(
}
showCustomDialog = false
},
title = { Text("Add Custom Language") }
title = { Text(stringResource(R.string.add_custom_language)) }
)
}
},
Expand Down Expand Up @@ -812,7 +812,7 @@ fun createAdvancedSettings(context: Context) = listOfNotNull(
if (showCustomDialog) {
TextInputDialog(
onDismissRequest = { showCustomDialog = false },
textInputLabel = { Text("Language name or code (e.g. Esperanto, Malayalam, de)") },
textInputLabel = { Text(stringResource(R.string.custom_language_hint)) },
initialText = "",
onConfirmed = { customLang ->
val trimmed = customLang.trim()
Expand All @@ -827,7 +827,7 @@ fun createAdvancedSettings(context: Context) = listOfNotNull(
}
showCustomDialog = false
},
title = { Text("Custom Target Language") }
title = { Text(stringResource(R.string.custom_target_language)) }
)
}
},
Expand Down Expand Up @@ -886,7 +886,7 @@ fun createAdvancedSettings(context: Context) = listOfNotNull(
if (showDialog) {
TextInputDialog(
onDismissRequest = { showDialog = false },
textInputLabel = { Text("model-name") },
textInputLabel = { Text(stringResource(R.string.model_name_hint)) },
initialText = service.getTranslateHuggingFaceModel(),
onConfirmed = { service.setTranslateHuggingFaceModel(it) },
title = { Text(stringResource(R.string.translate_model_title)) }
Expand Down Expand Up @@ -950,7 +950,7 @@ fun createAdvancedSettings(context: Context) = listOfNotNull(
if (showDialog) {
TextInputDialog(
onDismissRequest = { showDialog = false },
textInputLabel = { Text("model-name") },
textInputLabel = { Text(stringResource(R.string.model_name_hint)) },
initialText = service.getVoiceHuggingFaceModel(),
onConfirmed = { service.setVoiceHuggingFaceModel(it) },
title = { Text(stringResource(R.string.voice_model_title)) }
Expand Down Expand Up @@ -1018,7 +1018,7 @@ fun createAdvancedSettings(context: Context) = listOfNotNull(
var showSystemPromptDialog by remember { mutableStateOf(false) }
if (showSystemPromptDialog) {
TextInputDialog(
title = { Text("System Instruction") },
title = { Text(stringResource(R.string.system_instruction)) },
initialText = service.getSystemPrompt(),
checkTextValid = { true },
onConfirmed = {
Expand All @@ -1030,15 +1030,15 @@ fun createAdvancedSettings(context: Context) = listOfNotNull(
}

Preference(
name = "System Instruction",
name = stringResource(R.string.system_instruction),
description = service.getSystemPrompt().takeIf { it.isNotBlank() } ?: "Default",
onClick = { showSystemPromptDialog = true }
)

var showTranslateSystemPromptDialog by remember { mutableStateOf(false) }
if (showTranslateSystemPromptDialog) {
TextInputDialog(
title = { Text("Translate System Instruction") },
title = { Text(stringResource(R.string.translate_system_instruction)) },
initialText = service.getTranslateSystemPrompt(),
checkTextValid = { true },
onConfirmed = {
Expand All @@ -1050,7 +1050,7 @@ fun createAdvancedSettings(context: Context) = listOfNotNull(
}

Preference(
name = "Translate Instruction",
name = stringResource(R.string.translate_system_instruction),
description = service.getTranslateSystemPrompt().takeIf { it.isNotBlank() } ?: "Default",
onClick = { showTranslateSystemPromptDialog = true }
)
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2397,4 +2397,11 @@ New dictionary:
<string name="gif_disable">Disable</string>
<string name="gif_switched_to">Switched to %s</string>
<string name="gif_disabled_message">GIF search is disabled</string>

<string name="custom_language_hint" translatable="false" tools:ignore="MissingTranslation">Language name or code (e.g. Esperanto, Malayalam, de)</string>
<string name="add_custom_language" translatable="false" tools:ignore="MissingTranslation">Add Custom Language</string>
<string name="custom_target_language" translatable="false" tools:ignore="MissingTranslation">Custom Target Language</string>
<string name="model_name_hint" translatable="false" tools:ignore="MissingTranslation">model-name</string>
<string name="system_instruction" translatable="false" tools:ignore="MissingTranslation">System Instruction</string>
<string name="translate_system_instruction" translatable="false" tools:ignore="MissingTranslation">Translate System Instruction</string>
</resources>
Loading