From 8412e960ecff5a6e71159b6de91deb835feff878 Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 6 Aug 2023 13:04:07 +0000 Subject: [PATCH] added tranlsation for action list items --- locales/de.json | 14 ++++++++++++++ locales/en.json | 14 ++++++++++++++ src/Screens/Device/scene.js | 33 +++++++++++++++++++++++++++------ src/utils.js | 12 ++++++------ 4 files changed, 61 insertions(+), 12 deletions(-) diff --git a/locales/de.json b/locales/de.json index 2c5ef0f..cb223e2 100644 --- a/locales/de.json +++ b/locales/de.json @@ -34,6 +34,20 @@ "infoNoSceneSelected": "Keine Szene ausgewählt", "infoNoActionsAvailableInScene": "Keine Aktionen in der Szene vorhanden", "buttonAddAction": "Aktion hinzufügen", + "modalDotsScene": { + "changeSceneName": "Szenennamen aktualisieren", + "deleteScene": "Szene löschen" + }, + "sceneActionsListItems": { + "layers": { + "applyToLayers": "Anwenden auf {{LAYER_GRAMMAR_FORM}} {{AFFECTED_LAYERS}}", + "setLayersTo": "{{LAYER_GRAMMAR_FORM}} {{AFFECTED_LAYERS}} setzen auf", + "layer_grammar_form": { + "oneLayer": "Ebene", + "multipleLayers": "Ebenen" + } + } + }, "modalChooseScene": { "pageTitle": "Wähle eine Szene aus", "textButtonAddScene": "Neue Szene erstellen", diff --git a/locales/en.json b/locales/en.json index 01224b2..1dcaa86 100644 --- a/locales/en.json +++ b/locales/en.json @@ -34,6 +34,20 @@ "infoNoSceneSelected": "No scene selected", "infoNoActionsAvailableInScene": "No actions available in the scene", "buttonAddAction": "Add action", + "modalDotsScene": { + "changeSceneName": "Change scene name", + "deleteScene": "Delete scene" + }, + "sceneActionsListItems": { + "layers": { + "applyToLayers": "Apply to {{LAYER_GRAMMAR_FORM}} {{AFFECTED_LAYERS}}", + "setLayersTo": "Set {{LAYER_GRAMMAR_FORM}} {{AFFECTED_LAYERS}} to", + "layer_grammar_form": { + "oneLayer": "layer", + "multipleLayers": "layers" + } + } + }, "modalChooseScene": { "pageTitle": "Choose a scene", "textButtonAddScene": "Create new scene", diff --git a/src/Screens/Device/scene.js b/src/Screens/Device/scene.js index dce49b1..4b80a37 100644 --- a/src/Screens/Device/scene.js +++ b/src/Screens/Device/scene.js @@ -157,7 +157,7 @@ export default function SceneView({ navigation }) { data={[ { icon: "pencil", - label: "Change scene name", + label: t("screens.device.scenes.modalDotsScene.changeSceneName"), onPress: () => navigation.navigate("modalUpdateSceneName", { deviceSelectedScene: device.selectedScene, @@ -166,7 +166,7 @@ export default function SceneView({ navigation }) { }, { icon: "trash-can", - label: "Delete scene", + label: t("screens.device.scenes.modalDotsScene.deleteScene"), onPress: () => { appContext.setDeviceScenes((scenes) => scenes.filter( @@ -207,6 +207,7 @@ export default function SceneView({ navigation }) { function ActionListItem({ drag, navigation, device, item }) { const appContext = useContext(AppContext); + const { t } = useTranslation(); const ListItemTitle = () => { return ( @@ -239,16 +240,36 @@ function ActionListItem({ drag, navigation, device, item }) { item.type === Constants.actionType.layers && item.modeAdjustments.layers !== undefined ) { + const layerGrammarForm = + item.modeAdjustments.layers.length > 1 + ? t( + "screens.device.scenes.sceneActionsListItems.layers.layer_grammar_form.multipleLayers" + ) + : t( + "screens.device.scenes.sceneActionsListItems.layers.layer_grammar_form.oneLayer" + ); + const affectedLayers = item.modeAdjustments.layers.join(", "); + adjustments.push( {appContext.deviceFirmwareModes.lightModes.find( (lM) => lM.id === item.modeId ).defaults.length === 0 - ? `Apply to layer ${item.modeAdjustments.layers.join(", ")}` - : ` Set layer ${item.modeAdjustments.layers.join(", ")} to ${ - item.modeAdjustments.colors.length === 0 ? "???" : "" - }`} + ? t( + "screens.device.scenes.sceneActionsListItems.layers.applyToLayers", + { + LAYER_GRAMMAR_FORM: layerGrammarForm, + AFFECTED_LAYERS: affectedLayers, + } + ) + : `${t( + "screens.device.scenes.sceneActionsListItems.layers.setLayersTo", + { + LAYER_GRAMMAR_FORM: layerGrammarForm, + AFFECTED_LAYERS: affectedLayers, + } + )} ${item.modeAdjustments.colors.length === 0 ? "???" : ""}`} {item.modeAdjustments.colors !== undefined && diff --git a/src/utils.js b/src/utils.js index 9942af3..83c7ece 100644 --- a/src/utils.js +++ b/src/utils.js @@ -265,8 +265,8 @@ const devDevicesFirmwareModes = { en: "Speed of the mode", }, min: 0, - max: 100, - defaultValue: 45, + max: 10, + defaultValue: 5, unitOfMeasurement: { de: "s", en: "s", @@ -317,8 +317,8 @@ const devDevicesFirmwareModes = { }, iconName: "repeat-variant", min: 1, - max: 60, - defaultValue: 30, + max: 6, + defaultValue: 4, unitOfMeasurement: { de: "s", en: "s", @@ -352,8 +352,8 @@ const devDevicesFirmwareModes = { }, iconName: "repeat-variant", min: 1, - max: 60, - defaultValue: 30, + max: 6, + defaultValue: 2, unitOfMeasurement: { de: "s", en: "s",