Add translations for the SpaceBar

Added SpaceBar translation with 'spaceIdentifier' property. The translation can be added to the map inside DeclarativeInputEngine.cpp, with 'space' as fallback.
amarula · Sep 24, 2024 · 7b96d76 · 7b96d76
1 parent 194f51f
commit 7b96d76
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/src/DeclarativeInputEngine.cpp b/src/DeclarativeInputEngine.cpp
@@ -17,6 +17,7 @@ struct DeclarativeInputEnginePrivate {
     struct LayoutData {
         QString layoutFile;
         QString description;
+        QString spaceIdentifier = "Space";
     };
 
     DeclarativeInputEngine *_this;
@@ -32,7 +33,7 @@ struct DeclarativeInputEnginePrivate {
         {DeclarativeInputEngine::Fr, {"FrLayout", "Français"}},
         {DeclarativeInputEngine::It, {"ItLayout", "Italiano"}},
         {DeclarativeInputEngine::Es, {"EsLayout", "Español"}},
-        {DeclarativeInputEngine::De, {"DeLayout", "Deutsch"}},
+        {DeclarativeInputEngine::De, {"DeLayout", "Deutsch", "Leerzeichen"}},
         {DeclarativeInputEngine::Nl, {"NlLayout", "Nederlands"}},
         {DeclarativeInputEngine::Pt, {"PtLayout", "Português"}},
         {DeclarativeInputEngine::Cs, {"CsLayout", "Čeština"}},
@@ -165,3 +166,18 @@ QString DeclarativeInputEngine::descriptionOfLayout(QString layout) {
     }
     return d->layoutFiles.value(layoutVal, {}).description;
 }
+
+QString DeclarativeInputEngine::spaceIdentifierOfLayout(QString layout)
+{
+    if (!inputLayoutValid(layout)) {
+        return "";
+    }
+    bool ok = false;
+    auto layoutVal = static_cast<InputLayouts>(
+        QMetaEnum::fromType<InputLayouts>().keyToValue(layout.toUtf8().data(),
+                                                       &ok));
+    if (!ok) {
+        return "";
+    }
+    return d->layoutFiles.value(layoutVal, {}).spaceIdentifier;
+}
diff --git a/src/DeclarativeInputEngine.h b/src/DeclarativeInputEngine.h
@@ -117,11 +117,15 @@ class DeclarativeInputEngine : public QObject {
     Q_INVOKABLE QString fileOfLayout(QString layout);
 
     /**
-     * Use this function to get the correct layout file for each language
-     * (only needed for languages that share one file)
+     * Use this function to get the correct description for each language
      */
     Q_INVOKABLE QString descriptionOfLayout(QString layout);
 
+    /**
+     * Use this function to get the correct 'space'-identifier for each language
+     */
+    Q_INVOKABLE QString spaceIdentifierOfLayout(QString layout);
+
    public slots:
     /**
      * Emits a key click event for the given key, text and modifiers.

diff --git a/src/qml/InputPanel.qml b/src/qml/InputPanel.qml
@@ -37,14 +37,17 @@ Item {
 
     function loadLettersLayout() {
         var description = InputEngine.descriptionOfLayout(languageLayout);
+        var spaceIdentifier = InputEngine.spaceIdentifierOfLayout(languageLayout);
         var source = InputEngine.fileOfLayout(languageLayout);
         if (description !== "" && source !== "") {
             layoutLoader.langDescription = description;
+            layoutLoader.spaceIdentifier = spaceIdentifier;
             layoutLoader.setSource(source + ".qml", {
                 "inputPanel": root
             });
         } else {
             layoutLoader.langDescription = "English";
+            layoutLoader.spaceIdentifier = "space";
             layoutLoader.setSource("EnLayout.qml", {
                 "inputPanel": root
             });
@@ -126,6 +129,8 @@ Item {
 
             // lang description only needed for layouts that share a file
             property string langDescription
+            // space identifier for the correct translation of the word "space"
+            property string spaceIdentifier
 
             anchors {
                 fill: parent

diff --git a/src/qml/QwertyLayout.qml b/src/qml/QwertyLayout.qml
@@ -225,6 +225,7 @@ ColumnLayout {
         SpaceKey {
             weight: 1168
             inputPanelRef: inputPanel
+            btnDisplayedText: spaceIdentifier
         }
 
         Key {

diff --git a/src/qml/SymbolLayout.qml b/src/qml/SymbolLayout.qml
@@ -244,6 +244,7 @@ Item {
             SpaceKey {
                 weight: 1168
                 inputPanelRef: inputPanel
+                btnDisplayedText: spaceIdentifier
             }
 
             Key {
@@ -492,6 +493,7 @@ Item {
             SpaceKey {
                 weight: 1168
                 inputPanelRef: inputPanel
+                btnDisplayedText: spaceIdentifier
             }
 
             Key {