summaryrefslogtreecommitdiff
path: root/app/I18N.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-03-09 17:09:43 +0000
committerGreg Roach <fisharebest@webtrees.net>2019-03-09 17:09:43 +0000
commitf8e2489662d6c80c8fdae561ceca2ffff31df312 (patch)
tree1260bd402c9a3ff1ae8e815dd1ae62a8d9d00cce /app/I18N.php
parent82f8fca501d4cf8c34d4bc701f539d55b2bc0506 (diff)
downloadwebtrees-f8e2489662d6c80c8fdae561ceca2ffff31df312.tar.gz
webtrees-f8e2489662d6c80c8fdae561ceca2ffff31df312.tar.bz2
webtrees-f8e2489662d6c80c8fdae561ceca2ffff31df312.zip
Fix: #2307 - new location for .MO files
Diffstat (limited to 'app/I18N.php')
-rw-r--r--app/I18N.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/I18N.php b/app/I18N.php
index 888df923e3..1a2225dd00 100644
--- a/app/I18N.php
+++ b/app/I18N.php
@@ -380,8 +380,6 @@ class I18N
*/
public static function init(string $code = '', Tree $tree = null): string
{
- mb_internal_encoding('UTF-8');
-
if ($code !== '') {
// Create the specified locale
self::$locale = Locale::create($code);
@@ -472,7 +470,7 @@ class I18N
foreach (glob(WT_ROOT . 'resources/lang/*/messages.mo') as $file) {
try {
- $locales[] = Locale::create(basename($file, '.mo'));
+ $locales[] = Locale::create(basename(dirname($file)));
} catch (DomainException $ex) {
// Not a recognised locale
}