supported-languages, nemo-qml-plugin-systemsettings: Install locale...

supported-languages, nemo-qml-plugin-systemsettings: Install locale descriptions in /usr/share/supported-languages/ and don't require region names

recipes-asteroid/supported-languages/supported-languages_git.bb

@@ -11,7 +11,7 @@ PR = "r1"
 PV = "+git${SRCREV}"
 S = "${WORKDIR}/git"
 
-FILES_${PN} += "/etc/systemd/system/user@.service.d/ /usr/lib/systemd/user/ /usr/share/jolla-supported-languages/"
+FILES_${PN} += "/etc/systemd/system/user@.service.d/ /usr/lib/systemd/user/ /usr/share/supported-languages/"
 
 INSANE_SKIP_${PN} += "host-user-contaminated"
 
@@ -26,6 +26,6 @@ do_install_append() {
     # that others apps cannot set environment variables
     chown 1000:1000 ${D}/var/lib/environment/ceres/locale.conf # ceres:ceres
 
-    install -d ${D}/usr/share/jolla-supported-languages/
-    cp ${S}/*.conf ${D}/usr/share/jolla-supported-languages/
+    install -d ${D}/usr/share/supported-languages/
+    cp ${S}/*.conf ${D}/usr/share/supported-languages/
 }

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-systemsettings/0002-languagemodel-install-languages-in-usr-share-support.patch

+From a2196099a90fadcd1ace547fe20ea27a0bea0de6 Mon Sep 17 00:00:00 2001
+From: Florent Revest <revestflo@gmail.com>
+Date: Mon, 16 Jan 2017 13:01:23 +0100
+Subject: [PATCH 1/2] languagemodel: install languages in
+ /usr/share/supported-languages
+
+---
+ src/languagemodel.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/languagemodel.cpp b/src/languagemodel.cpp
+index a054d00..2ea0d72 100644
+--- a/src/languagemodel.cpp
++++ b/src/languagemodel.cpp
+@@ -43,7 +43,7 @@
+ 
+ 
+ namespace {
+-const char * const LanguageSupportDirectory = "/usr/share/jolla-supported-languages";
++const char * const LanguageSupportDirectory = "/usr/share/supported-languages";
+ 
+ bool nameLessThan(const Language &lang1, const Language &lang2)
+ {
+-- 
+2.11.0
+

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-systemsettings/0003-languagemodel-don-t-require-region-names.patch

+From ec2014d39983c0a879a4190faf792169743a60c3 Mon Sep 17 00:00:00 2001
+From: Florent Revest <revestflo@gmail.com>
+Date: Mon, 16 Jan 2017 13:01:39 +0100
+Subject: [PATCH 2/2] languagemodel: don't require region names
+
+---
+ src/languagemodel.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/languagemodel.cpp b/src/languagemodel.cpp
+index 2ea0d72..4b493f4 100644
+--- a/src/languagemodel.cpp
++++ b/src/languagemodel.cpp
+@@ -222,7 +222,7 @@ QList<Language> LanguageModel::supportedLanguages()
+         QString region = settings.value("Region").toString();
+         //% "Region: %1"
+         QString regionLabel = settings.value("RegionLabel", qtTrId("settings_system-la-region")).toString();
+-        if (name.isEmpty() || localeCode.isEmpty() || region.isEmpty()) {
++        if (name.isEmpty() || localeCode.isEmpty()) {
+             continue;
+         }
+         Language newLanguage(name, localeCode, region, regionLabel);
+-- 
+2.11.0
+

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-systemsettings_git.bb

@@ -4,7 +4,9 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://src/displaysettings.cpp;beginline=1;endline=31;md5=99ff23884718e3e2c85992a9294d18df"
 
 SRC_URI = "git://git.merproject.org/mer-core/nemo-qml-plugin-systemsettings.git;protocol=https \
-    file://0001-Update-QStorageInfo-API-usage.patch"
+    file://0001-Update-QStorageInfo-API-usage.patch \
+    file://0002-languagemodel-install-languages-in-usr-share-support.patch \
+    file://0003-languagemodel-don-t-require-region-names.patch"
 SRCREV = "8e98f8c8069592d3dd21011743fdfb4d2efcc50a"
 PR = "r1"
 PV = "+git${SRCREV}"