Merge lp:~seb128/ubuntu-system-settings/language-filter-translations into lp:ubuntu-system-settings

[Sebastien Bacher]

[language] list languages with translations rather than installed locales

[language] list languages with translations rather than installed locales

[Iain Lane (laney)]

This was discussed in #ubuntu-desktop: http://irclogs.ubuntu.com/2015/05/21/#ubuntu-desktop.html#t08:51 and we decided to wait with this change until we have a design for a region selector too. I think we'll be able to land this MP as-is or close to as-is then.

Thanks!

review: Needs Information

[Sebastien Bacher (seb128)]

Seems like we need to get a locale selector before we land that simplication of language, keep as work in progress meanwhile so it doesn't land by error

Unmerged revisions

1418. By Sebastien Bacher on 2015-05-21

[language] list languages with translations rather than installed locales

=== modified file 'plugins/language/language-plugin.cpp'
--- plugins/language/language-plugin.cpp	2015-04-10 11:22:10 +0000
+++ plugins/language/language-plugin.cpp	2015-05-21 08:33:40 +0000
@@ -291,6 +291,9 @@
     QHash<QString, QString> likelyLocaleForLanguage;
     QList<LanguageLocale> languageLocales;
 
+    QStringList installedTranslations(QDir("/usr/share/locale-langpack").
+                                      entryList(QDir::Dirs | QDir::NoDotAndDotDot));
+
     // Remove blacklisted locales.
     for (unsigned int
          i(0); i < sizeof(LOCALE_BLACKLIST) / sizeof(const char *); i++)
@@ -323,7 +326,14 @@
 
         languageLocale.likely = likelyLocaleForLanguage[language] ==
                                 i->left(i->indexOf('.'));
-        languageLocales += languageLocale;
+
+        /* Only list locales that are the main ones (=likely) for a language,
+           or that are a variant of the language which has translations on disk
+           (by looking if the langpack directories include the locale, without its '.utf-8') */
+        if (languageLocale.likely ||
+                installedTranslations.contains(languageLocale.localeName.split(".utf8")[0])) {
+            languageLocales += languageLocale;
+        }
     }
 
     qSort(languageLocales);