ensure all languages have Intl translations, otherwise do not use them

matomo-org · Jun 22, 2015 · 310be98 · 310be98
1 parent 0834daf
commit 310be98
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php
@@ -128,6 +128,12 @@ public function getAvailableLanguagesInfo()
                 }
                 return $res;
             };
+
+            // Skip languages not having Intl translations
+            if (empty($translations['Intl'])) {
+                continue;
+            }
+
             $translationStringsDone = $intersect($englishTranslation, $translations);
             $percentageComplete = count($translationStringsDone, COUNT_RECURSIVE) / count($englishTranslation, COUNT_RECURSIVE);
             $percentageComplete = round(100 * $percentageComplete, 0);
@@ -282,13 +288,19 @@ private function loadAvailableLanguages()
         if ($cache->contains($cacheId)) {
             $languagesInfo = $cache->fetch($cacheId);
         } else {
-            $filenames = $this->getAvailableLanguages();
+            $languages = $this->getAvailableLanguages();
             $languagesInfo = array();
-            foreach ($filenames as $filename) {
-                $data = file_get_contents(PIWIK_INCLUDE_PATH . "/plugins/Intl/lang/$filename.json");
+            foreach ($languages as $languageCode) {
+                $data = @file_get_contents(PIWIK_INCLUDE_PATH . "/plugins/Intl/lang/$languageCode.json");
+
+                // Skip languages not having Intl translations
+                if (empty($data)) {
+                    continue;
+                }
+
                 $translations = json_decode($data, true);
                 $languagesInfo[] = array(
-                    'code'         => $filename,
+                    'code'         => $languageCode,
                     'name'         => $translations['Intl']['OriginalLanguageName'],
                     'english_name' => $translations['Intl']['EnglishLanguageName']
                 );