From 48dde310ae386e36f30cd4ba1b25f544421aea03 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 24 Mar 2021 20:40:22 -0500 Subject: [PATCH] =?UTF-8?q?Add=20Norwegian=20Bokm=C3=A5l=20to=20the=20buil?= =?UTF-8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/app.pro | 3 ++- app/gui/SettingsView.qml | 4 ++++ app/resources.qrc | 2 ++ app/settings/streamingpreferences.cpp | 2 ++ app/settings/streamingpreferences.h | 3 ++- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/app.pro b/app/app.pro index 2d7cc079..1fa02647 100644 --- a/app/app.pro +++ b/app/app.pro @@ -327,7 +327,8 @@ RESOURCES += \ TRANSLATIONS += \ languages/qml_zh_cn.ts \ languages/qml_de.ts \ - languages/qml_fr.ts + languages/qml_fr.ts \ + languages/qml_nb_NO.ts # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = diff --git a/app/gui/SettingsView.qml b/app/gui/SettingsView.qml index 3df8b864..99c9016b 100644 --- a/app/gui/SettingsView.qml +++ b/app/gui/SettingsView.qml @@ -781,6 +781,10 @@ Flickable { text: "简体中文" //Simplified Chinese val: StreamingPreferences.LANG_ZH_CN } + ListElement { + text: "Norwegian Bokmål" + val: StreamingPreferences.LANG_NB_NO + } } // ::onActivated must be used, as it only listens for when the index is changed by a human onActivated : { diff --git a/app/resources.qrc b/app/resources.qrc index 0dc11a53..bd79828f 100644 --- a/app/resources.qrc +++ b/app/resources.qrc @@ -23,6 +23,8 @@ languages/qml_fr.qm languages/qml_zh_cn.ts languages/qml_zh_cn.qm + languages/qml_nb_NO.ts + languages/qml_nb_NO.qm SDL_GameControllerDB/gamecontrollerdb.txt diff --git a/app/settings/streamingpreferences.cpp b/app/settings/streamingpreferences.cpp index 33b8c183..e712625c 100644 --- a/app/settings/streamingpreferences.cpp +++ b/app/settings/streamingpreferences.cpp @@ -189,6 +189,8 @@ QString StreamingPreferences::getSuffixFromLanguage(StreamingPreferences::Langua return "fr"; case LANG_ZH_CN: return "zh_cn"; + case LANG_NB_NO: + return "nb_NO"; case LANG_AUTO: default: return QLocale::system().name(); diff --git a/app/settings/streamingpreferences.h b/app/settings/streamingpreferences.h index 095f11e8..751f180a 100644 --- a/app/settings/streamingpreferences.h +++ b/app/settings/streamingpreferences.h @@ -69,7 +69,8 @@ public: LANG_EN, LANG_FR, LANG_ZH_CN, - LANG_DE + LANG_DE, + LANG_NB_NO }; Q_ENUM(Language);