Commit e9ff5988 authored by pvuorela's avatar pvuorela

Merge branch 'master' into 'master'

Make locale region optional



See merge request !7
parents 528dfb2c d24967f5
Name: nemo-qml-plugin-systemsettings Name: nemo-qml-plugin-systemsettings
Summary: System settings plugin for Nemo Mobile Summary: System settings plugin for Nemo Mobile
Version: 0.2.0 Version: 0.2.8
Release: 1 Release: 1
Group: System/Libraries Group: System/Libraries
License: BSD License: BSD
......
...@@ -222,7 +222,7 @@ QList<Language> LanguageModel::supportedLanguages() ...@@ -222,7 +222,7 @@ QList<Language> LanguageModel::supportedLanguages()
QString region = settings.value("Region").toString(); QString region = settings.value("Region").toString();
//% "Region: %1" //% "Region: %1"
QString regionLabel = settings.value("RegionLabel", qtTrId("settings_system-la-region")).toString(); QString regionLabel = settings.value("RegionLabel", qtTrId("settings_system-la-region")).toString();
if (name.isEmpty() || localeCode.isEmpty() || region.isEmpty()) { if (name.isEmpty() || localeCode.isEmpty()) {
continue; continue;
} }
Language newLanguage(name, localeCode, region, regionLabel); Language newLanguage(name, localeCode, region, regionLabel);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment