Add arabic translation for slate by wow2006 · Pull Request #126 · mitchcurtis/slate

wow2006 · 2019-06-09T15:09:53Z

I just want to make sure that I working on the right direction.

mitchcurtis · 2019-06-09T17:44:47Z

app/qml/ui/OptionsDialog.qml

+                            },
+                            {
+                                value: "Norwegian",
+                                display: "Norsh"


mitchcurtis · 2019-06-09T17:45:33Z

translations/lupdate.sh

    -ts $translationDir/slate_en_GB.ts \
-    $translationDir/slate_no_NB.ts
+    $translationDir/slate_no_NB.ts \
+	$translationDir/slate_ar_EG.ts


Please make the indenting for $translationDir/slate_ar_EG.ts align with the previous line.

mitchcurtis · 2019-06-09T17:47:27Z

Looks good so far, just a few nitpicks.

By the way, if you don't intend to add any translated strings in the .ts file yet, it would be good to change the name of the pull request to "Add beginnings of Arabic translation for Slate" or something, just to indicate that the work is ongoing. :) I think the pull request title shows up in the merge commit, that's all.

wow2006 · 2019-06-09T18:20:28Z

I am willing to add arabic string. I just want to know how to switch to arabic first :D

mitchcurtis · 2019-06-09T19:59:15Z

Oh, does it still not work? You will need to do something like:

const QLocale locale(mSettings->language());

https://github.com/mitchcurtis/slate/blob/master/app/application.cpp#L138

wow2006 · 2019-06-10T21:26:12Z

I run slate from qtcreator. mSettings->language() return English every time what every I do. I pass language manually for now. Still, Did not change the language. I passed Arabic ts file manually so I can preview. I am working on the translation still It's so boring.

mitchcurtis · 2019-06-11T07:51:43Z

I run slate from qtcreator. mSettings->language() return English every time what every I do. I pass language manually for now. Still, Did not change the language. I passed Arabic ts file manually so I can preview.

Hmmm, that's odd. I'll have to give it a try later today. :)

I am working on the translation still It's so boring.

Haha yeah, it is! :D

mitchcurtis · 2019-06-11T17:12:59Z

OK, I got it working. Please apply this patch:

commit f1248d727b9c1fb269e7d4e10349f43ad8f048fa
Author: Mitch Curtis <[email protected]>
Date:   Tue Jun 11 19:10:45 2019 +0200

    Get it working

diff --git a/app/application.cpp b/app/application.cpp
index 983c821..2af55db 100644
--- a/app/application.cpp
+++ b/app/application.cpp
@@ -135,7 +135,7 @@ Application::Application(int &argc, char **argv, const QString &applicationName)
     }
 
     QTranslator translator;
-    const QLocale locale;
+    const QLocale locale(mSettings->language());
     QDir translationsDir = QDir::current();
     translationsDir.cdUp();
     translationsDir.cd(QStringLiteral("Translations"));
diff --git a/app/qml/ui/OptionsDialog.qml b/app/qml/ui/OptionsDialog.qml
index 4647c0c..bee4158 100644
--- a/app/qml/ui/OptionsDialog.qml
+++ b/app/qml/ui/OptionsDialog.qml
@@ -22,6 +22,7 @@ Dialog {
     onAboutToShow: clearChanges()
 
     function applyAllSettings() {
+        settings.language = languageComboBox.model[languageComboBox.currentIndex].value
         settings.loadLastOnStartup = loadLastCheckBox.checked
         settings.gesturesEnabled = enableGesturesCheckBox.checked
         settings.penToolRightClickBehaviour =
@@ -42,6 +43,7 @@ Dialog {
     }
 
     function clearChanges() {
+        languageComboBox.currentIndex = languageComboBox.indexForValue(settings.language)
         loadLastCheckBox.checked = settings.loadLastOnStartup
         enableGesturesCheckBox.checked = settings.gesturesEnabled
         penToolRightClickBehaviourComboBox.currentIndex =
@@ -112,29 +114,30 @@ Dialog {
                         textRole: "display"
                         currentIndex: indexForValue(settings.language)
 
+                        Layout.fillWidth: true
+
+                        function indexForValue(value) {
+                            for (var i = 0; i < model.length; ++i) {
+                                if (model[i].value === value)
+                                    return i;
+                            }
+                            return -1;
+                        }
+
                         model: [
                             {
-                                value: "English",
+                                value: "en_GB",
                                 display: "English"
                             },
                             {
-                                value: "Norwegian",
-                                display: "Norsh"
+                                value: "nb_NO",
+                                display: "Norsk"
                             },
                             {
-                                value: "Arabic",
+                                value: "ar_EG",
                                 display: "العربيه"
                             }
                         ]
-
-                        Layout.fillWidth: true
-                        function indexForValue(value) {
-                            for (var i = 0; i < model.length; ++i) {
-                                if (model[i].value === value)
-                                    return i;
-                            }
-                            return -1;
-                        }
                     }
 
                     Label {
diff --git a/lib/applicationsettings.cpp b/lib/applicationsettings.cpp
index 784af55..b542571 100644
--- a/lib/applicationsettings.cpp
+++ b/lib/applicationsettings.cpp
@@ -33,6 +33,30 @@ ApplicationSettings::ApplicationSettings(QObject *parent) :
     qCDebug(lcApplicationSettings) << "Loading settings from" << fileName();
 }
 
+QString ApplicationSettings::defaultLanguage() const
+{
+    return "en_GB";
+}
+
+QString ApplicationSettings::language() const
+{
+     return contains("language") ? value("language").toString() : defaultLanguage();
+}
+
+void ApplicationSettings::setLanguage(const QString &language)
+{
+    const QVariant existingValue = value("language");
+    QString existingStringValue = defaultLanguage();
+    if (contains("language"))
+        existingStringValue = existingValue.toBool();
+
+    if (language == existingStringValue)
+        return;
+
+    setValue("language", language);
+    emit languageChanged();
+}
+
 bool ApplicationSettings::loadLastOnStartup() const
 {
     return contains("loadLastOnStartup") ? value("loadLastOnStartup").toBool() : defaultLoadLastOnStartup();
@@ -1069,20 +1093,3 @@ void ApplicationSettings::setFullScreenToggleShortcut(const QString &shortcut)
 {
     SET_SHORTCUT("fullScreenToggleShortcut", defaultFullScreenToggleShortcut, fullScreenToggleShortcutChanged)
 }
-
-constexpr char LanguageName[] = "language";
-QString ApplicationSettings::defaultLanguage() const {
-    return "English";
-}
-
-QString ApplicationSettings::language() const {
-     return contains(LanguageName) ? value(LanguageName).toString() : defaultLanguage();
-}
-
-void ApplicationSettings::setLanguage(const QString &value) {
-    if (language() == value)
-        return;
-
-    setValue(LanguageName, QVariant(value));
-    emit languageChanged();
-}
diff --git a/lib/applicationsettings.h b/lib/applicationsettings.h
index 7d1e733..0d26d5a 100644
--- a/lib/applicationsettings.h
+++ b/lib/applicationsettings.h
@@ -51,6 +51,7 @@ class SLATE_EXPORT ApplicationSettings : public QSettings
     Q_PROPERTY(QColor checkerColour1 READ checkerColour1 WRITE setCheckerColour1 NOTIFY checkerColour1Changed)
     Q_PROPERTY(QColor checkerColour2 READ checkerColour2 WRITE setCheckerColour2 NOTIFY checkerColour2Changed)
     Q_PROPERTY(int penToolRightClickBehaviour READ penToolRightClickBehaviour WRITE setPenToolRightClickBehaviour NOTIFY penToolRightClickBehaviourChanged)
+    Q_PROPERTY(QString language READ language WRITE setLanguage NOTIFY languageChanged)
 
     Q_PROPERTY(QString quitShortcut READ quitShortcut WRITE setQuitShortcut NOTIFY quitShortcutChanged)
     Q_PROPERTY(QString newShortcut READ newShortcut WRITE setNewShortcut NOTIFY newShortcutChanged)
@@ -90,11 +91,14 @@ class SLATE_EXPORT ApplicationSettings : public QSettings
     Q_PROPERTY(QString swatchUpShortcut READ swatchUpShortcut WRITE setSwatchUpShortcut NOTIFY swatchUpShortcutChanged)
     Q_PROPERTY(QString swatchDownShortcut READ swatchDownShortcut WRITE setSwatchDownShortcut NOTIFY swatchDownShortcutChanged)
     Q_PROPERTY(QString fullScreenToggleShortcut READ fullScreenToggleShortcut WRITE setFullScreenToggleShortcut NOTIFY fullScreenToggleShortcutChanged)
-    Q_PROPERTY(QString language READ language WRITE setLanguage NOTIFY languageChanged)
 
 public:
     explicit ApplicationSettings(QObject *parent = nullptr);
 
+    QString defaultLanguage() const;
+    QString language() const;
+    void setLanguage(const QString &language);
+
     bool loadLastOnStartup() const;
     void setLoadLastOnStartup(bool loadLastOnStartup);
     bool defaultLoadLastOnStartup() const;
@@ -312,11 +316,8 @@ public:
     QString fullScreenToggleShortcut() const;
     void setFullScreenToggleShortcut(const QString &shortcut);
 
-    QString defaultLanguage() const;
-    QString language() const;
-    void setLanguage(const QString &value);
-
 signals:
+    void languageChanged();
     void loadLastOnStartupChanged();
     void recentFilesChanged();
     void gridVisibleChanged();
@@ -371,7 +372,6 @@ signals:
     void swatchUpShortcutChanged();
     void swatchDownShortcutChanged();
     void fullScreenToggleShortcutChanged();
-    void languageChanged();
 };
 
 #endif // APPLICATIONSETTINGS_H

mitchcurtis · 2019-06-11T17:13:56Z

And yeah, I removed the languageName optimisation - I know it's not good to do it the way I'm currently doing it, but I'd rather be consistent and fix all of the strings in that file at once. :)

wow2006 · 2019-06-13T14:41:41Z

I can not translate any more :D

mitchcurtis · 2019-06-13T15:27:46Z

I can not translate any more :D

Haha, understandable! Nice work!

Should I merge it as it is now and apply the patch I mentioned above afterwards?

mitchcurtis · 2019-06-13T20:15:15Z

Let's get it in and I will fix it up afterwards.

wow2006 · 2019-06-14T09:59:10Z

@mitchcurtis Sorry I forget about the patch. I will add it :)

mitchcurtis · 2019-06-14T11:12:50Z

No worries, I already fixed it. :D

ahmedhussein89 added 5 commits June 9, 2019 13:06

Add Language to OptionsDialog.qml

0907e54

Add Language to ApplicationSettings

ffa7341

Use settings object to load and save language preset

7a45e40

Add Norwegian to Options Dialog

01c6886

Generate ts file for arabic

5da8323

mitchcurtis reviewed Jun 9, 2019

View reviewed changes

app/qml/ui/OptionsDialog.qml

},

{

value: "Norwegian",

display: "Norsh"

Copy link
Copy Markdown

Owner

mitchcurtis Jun 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Norsk

mitchcurtis reviewed Jun 9, 2019

View reviewed changes

WIP translation Arabic

85fe7fd

WIP translating 2

9aa3afc

WIP translation

684bd56

mitchcurtis merged commit 7b3f174 into mitchcurtis:master Jun 13, 2019

Conversation

wow2006 commented Jun 9, 2019

Uh oh!

mitchcurtis Jun 9, 2019

Choose a reason for hiding this comment

Uh oh!

mitchcurtis Jun 9, 2019

Choose a reason for hiding this comment

Uh oh!

mitchcurtis commented Jun 9, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wow2006 commented Jun 9, 2019

Uh oh!

mitchcurtis commented Jun 9, 2019

Uh oh!

wow2006 commented Jun 10, 2019

Uh oh!

mitchcurtis commented Jun 11, 2019

Uh oh!

mitchcurtis commented Jun 11, 2019

Uh oh!

mitchcurtis commented Jun 11, 2019

Uh oh!

wow2006 commented Jun 13, 2019

Uh oh!

mitchcurtis commented Jun 13, 2019

Uh oh!

mitchcurtis commented Jun 13, 2019

Uh oh!

wow2006 commented Jun 14, 2019

Uh oh!

mitchcurtis commented Jun 14, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mitchcurtis commented Jun 9, 2019 •

edited

Loading