servers
/
alltube
mirror of https://github.com/Rudloff/alltube.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Pierre Rudloff 2017-10-12 23:49:51 +02:00
parent 159dfd2304 24d4362f80
commit a665422e53
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gruntfile.js
View File

@ -98,7 +98,8 @@ module.exports = function (grunt) {
},
files: {
'i18n/fr_FR/LC_MESSAGES/Alltube.mo': 'i18n/fr_FR/LC_MESSAGES/Alltube.po',
'i18n/zh_CN/LC_MESSAGES/Alltube.mo': 'i18n/zh_CN/LC_MESSAGES/Alltube.po'
'i18n/zh_CN/LC_MESSAGES/Alltube.mo': 'i18n/zh_CN/LC_MESSAGES/Alltube.po',
'i18n/es_ES/LC_MESSAGES/Alltube.mo': 'i18n/es_ES/LC_MESSAGES/Alltube.po'
}
}
},

4
classes/LocaleManager.php
View File

@ -63,7 +63,9 @@ class LocaleManager
$process->run();
$installedLocales = explode(PHP_EOL, trim($process->getOutput()));
foreach ($this->supportedLocales as $supportedLocale) {
if (in_array($supportedLocale, $installedLocales)) {
if (in_array($supportedLocale, $installedLocales)
|| in_array($supportedLocale.'.utf8', $installedLocales)
) {
$return[] = new Locale($supportedLocale);
}
}