Use gettext from package

adaur · adaur · commit f73bfcc614ba · 2017-02-07T20:10:37.000+01:00
diff --git a/composer.json b/composer.json
@@ -16,7 +16,6 @@
         "role": "Contributor"
     }],
     "autoload": {
-        "classmap": ["featherbb/Core/gettext/MO.php"],
         "psr-4": {
             "FeatherBB\\Plugins\\": "plugins/",
             "FeatherBB\\": "featherbb/"
@@ -28,7 +27,8 @@
         "statical/statical": "^1.1",
         "firebase/php-jwt": "^3.0",
         "vierbergenlars/php-semver": "^3.0",
-        "slim/flash": "^0.1.0"
+        "slim/flash": "^0.1.0",
+        "gettext/gettext": "^4.2"
     },
     "support": {
         "email": "admin@featherbb.org",
diff --git a/featherbb/Controller/Admin/Bans.php b/featherbb/Controller/Admin/Bans.php
@@ -19,8 +19,8 @@ class Bans
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Bans();
-        translate('admin/bans');
-        translate('admin/common');
+        Lang::load('admin/bans');
+        Lang::load('admin/common');
 
         if (!User::can('mod.ban_users')) {
             throw new Error(__('No permission'), '403');
diff --git a/featherbb/Controller/Admin/Categories.php b/featherbb/Controller/Admin/Categories.php
@@ -20,7 +20,7 @@ class Categories
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Categories();
-        translate('admin/categories');
+        Lang::load('admin/categories');
         if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
diff --git a/featherbb/Controller/Admin/Censoring.php b/featherbb/Controller/Admin/Censoring.php
@@ -18,7 +18,7 @@ class Censoring
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Censoring();
-        translate('admin/censoring');
+        Lang::load('admin/censoring');
         if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
@@ -20,7 +20,7 @@ class Forums
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Forums();
-        translate('admin/forums');
+        Lang::load('admin/forums');
         if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
diff --git a/featherbb/Controller/Admin/Groups.php b/featherbb/Controller/Admin/Groups.php
@@ -18,7 +18,7 @@ class Groups
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Groups();
-        translate('admin/groups');
+        Lang::load('admin/groups');
         if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
diff --git a/featherbb/Controller/Admin/Index.php b/featherbb/Controller/Admin/Index.php
@@ -18,7 +18,7 @@ class Index
 {
     public function __construct()
     {
-        translate('admin/index');
+        Lang::load('admin/index');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Admin/Maintenance.php b/featherbb/Controller/Admin/Maintenance.php
@@ -18,7 +18,7 @@ class Maintenance
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Maintenance();
-        translate('admin/maintenance');
+        Lang::load('admin/maintenance');
         if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
@@ -18,7 +18,7 @@ class Options
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Options();
-        translate('admin/options');
+        Lang::load('admin/options');
         if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
@@ -19,7 +19,7 @@ class Parser
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Parser();
-        translate('admin/parser');
+        Lang::load('admin/parser');
         if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
diff --git a/featherbb/Controller/Admin/Permissions.php b/featherbb/Controller/Admin/Permissions.php
@@ -18,7 +18,7 @@ class Permissions
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Permissions();
-        translate('admin/permissions');
+        Lang::load('admin/permissions');
         if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
diff --git a/featherbb/Controller/Admin/Plugins.php b/featherbb/Controller/Admin/Plugins.php
@@ -21,7 +21,7 @@ class Plugins
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Plugins();
-        translate('admin/plugins');
+        Lang::load('admin/plugins');
         if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
diff --git a/featherbb/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
@@ -19,7 +19,7 @@ class Reports
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Reports();
-        translate('admin/reports');
+        Lang::load('admin/reports');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Admin/Statistics.php b/featherbb/Controller/Admin/Statistics.php
@@ -18,7 +18,7 @@ class Statistics
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Statistics();
-        translate('admin/index');
+        Lang::load('admin/index');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Admin/Updates.php b/featherbb/Controller/Admin/Updates.php
@@ -23,9 +23,9 @@ class Updates
 {
     public function __construct()
     {
-        translate('admin/index');
-        translate('admin/updates');
-        translate('admin/plugins');
+        Lang::load('admin/index');
+        Lang::load('admin/updates');
+        Lang::load('admin/plugins');
         if (!User::isAdmin()) {
             throw new Error(__('No permission'), '403');
         }
diff --git a/featherbb/Controller/Admin/Users.php b/featherbb/Controller/Admin/Users.php
@@ -19,7 +19,7 @@ class Users
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Users();
-        translate('admin/users');
+        Lang::load('admin/users');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
@@ -22,8 +22,8 @@ class Auth
 {
     public function __construct()
     {
-        translate('profile');
-        translate('login');
+        Lang::load('profile');
+        Lang::load('login');
     }
 
     public function login($req, $res, $args)
diff --git a/featherbb/Controller/Forum.php b/featherbb/Controller/Forum.php
@@ -19,8 +19,8 @@ class Forum
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Forum();
-        translate('forum');
-        translate('misc');
+        Lang::load('forum');
+        Lang::load('misc');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Help.php b/featherbb/Controller/Help.php
@@ -15,7 +15,7 @@ class Help
 {
     public function __construct()
     {
-        translate('help');
+        Lang::load('help');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Index.php b/featherbb/Controller/Index.php
@@ -19,8 +19,8 @@ class Index
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Index();
-        translate('index');
-        translate('misc');
+        Lang::load('index');
+        Lang::load('misc');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
@@ -52,7 +52,7 @@ public function run()
         $csrf = new \FeatherBB\Middleware\Csrf();
         $csrf->generateNewToken(Container::get('request'));
 
-        translate('install', 'featherbb', $this->install_lang);
+        Lang::load('install', 'featherbb', $this->install_lang);
 
         // Second form has been submitted to start install
         if (Request::isPost() && !Input::post('choose_lang')) {
@@ -191,7 +191,7 @@ public function create_db(array $data)
         // Init DB
         Core::init_db($data);
         // Load appropriate language
-        translate('install', 'featherbb', $data['language']);
+        Lang::load('install', 'featherbb', $data['language']);
 
         // Create tables
         foreach ($this->model->get_database_scheme() as $table => $sql) {
diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
@@ -18,13 +18,13 @@ class Post
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Post();
-        translate('prof_reg');
-        translate('delete');
-        translate('post');
-        translate('misc');
-        translate('register');
-        translate('antispam');
-        translate('bbeditor');
+        Lang::load('prof_reg');
+        Lang::load('delete');
+        Lang::load('post');
+        Lang::load('misc');
+        Lang::load('register');
+        Lang::load('antispam');
+        Lang::load('bbeditor');
     }
 
     public function newreply($req, $res, $args)
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
@@ -20,10 +20,10 @@ class Profile
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Profile();
-        translate('profile');
-        translate('register');
-        translate('prof_reg');
-        translate('misc');
+        Lang::load('profile');
+        Lang::load('register');
+        Lang::load('prof_reg');
+        Lang::load('misc');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Register.php b/featherbb/Controller/Register.php
@@ -18,9 +18,9 @@ class Register
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Register();
-        translate('register');
-        translate('prof_reg');
-        translate('antispam');
+        Lang::load('register');
+        Lang::load('prof_reg');
+        Lang::load('antispam');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Search.php b/featherbb/Controller/Search.php
@@ -18,10 +18,10 @@ class Search
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Search();
-        translate('userlist');
-        translate('search');
-        translate('topic');
-        translate('forum');
+        Lang::load('userlist');
+        Lang::load('search');
+        Lang::load('topic');
+        Lang::load('forum');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Topic.php b/featherbb/Controller/Topic.php
@@ -20,9 +20,9 @@ class Topic
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Topic();
-        translate('topic');
-        translate('misc'); // To be removed
-        translate('post');
+        Lang::load('topic');
+        Lang::load('misc'); // To be removed
+        Lang::load('post');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Userlist.php b/featherbb/Controller/Userlist.php
@@ -18,8 +18,8 @@ class Userlist
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Userlist();
-        translate('userlist');
-        translate('search');
+        Lang::load('userlist');
+        Lang::load('search');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Core/AdminUtils.php b/featherbb/Core/AdminUtils.php
@@ -16,7 +16,7 @@ class AdminUtils
 {
     public static function generateAdminMenu($page = '')
     {
-        translate('admin/common');
+        Lang::load('admin/common');
 
         \View::setPageInfo([
             'page'        =>    $page,
diff --git a/featherbb/Core/Interfaces/Lang.php b/featherbb/Core/Interfaces/Lang.php
@@ -0,0 +1,48 @@
+<?php
+namespace FeatherBB\Core\Interfaces;
+
+use Gettext\Translations;
+use Gettext\Translator;
+
+class Lang extends \Statical\BaseProxy
+{
+    private static $domain;
+    private static $translator;
+
+    public static function construct($domain = 'FeatherBB')
+    {
+        self::$domain = $domain;
+        self::$translator = new Translator();
+        self::$translator->defaultDomain($domain);
+        self::$translator->register();
+    }
+
+        public static function load($file, $domain = 'FeatherBB', $path = false)
+        {
+            // Set default path to forum core translations
+            $path = $path ? $path :  ForumEnv::get('FEATHER_ROOT').'featherbb/lang';
+            // Set default language to current user
+            $language = (!User::get(null)) ? 'English' : User::getPref('language');
+
+            /**
+             * Try to locate translation file with the following priority order :
+             *     - As provided in function arguments
+             *     - User language
+             *     - Forum default
+             *     - English (which sould always be available)
+             */
+            if (is_readable($path.'/'.$language.'/'.$file.'.mo')) {
+                $file = $path.'/'.$language.'/'.$file.'.mo';
+            } elseif (is_readable($path.'/'.ForumSettings::get('language').'/'.$file.'.mo')) {
+                $file = $path.'/'.ForumSettings::get('language').'/'.$file.'.mo';
+            } elseif (is_readable($path.'/English/'.$file.'.mo')) {
+                $file = $path.'/English/'.$file.'.mo';
+            } else {
+                return false;
+            }
+
+            self::$translator->loadTranslations(
+                Translations::fromMoFile($file)->setDomain($domain)
+            );
+        }
+}
diff --git a/featherbb/Core/Interfaces/SlimStatic.php b/featherbb/Core/Interfaces/SlimStatic.php
@@ -18,7 +18,7 @@ public static function boot(\Slim\App $slim)
         $manager = new \Statical\Manager();
 
         // Add proxies that use the Slim instance
-        $aliases = ['Feather', 'Config', 'Route', 'Router', 'ForumEnv', 'ForumSettings', 'User'];
+        $aliases = ['Feather', 'Config', 'Route', 'Router', 'ForumEnv', 'ForumSettings', 'User', 'Lang'];
         static::addInstances($aliases, $manager, $slim);
 
         // Add special-case Slim container instance
diff --git a/featherbb/Core/gettext/MO.php b/featherbb/Core/gettext/MO.php
diff --git a/featherbb/Core/gettext/Streams/CachedFileReader.php b/featherbb/Core/gettext/Streams/CachedFileReader.php
diff --git a/featherbb/Core/gettext/Streams/CachedIntFileReader.php b/featherbb/Core/gettext/Streams/CachedIntFileReader.php
diff --git a/featherbb/Core/gettext/Streams/FileReader.php b/featherbb/Core/gettext/Streams/FileReader.php
diff --git a/featherbb/Core/gettext/Streams/Reader.php b/featherbb/Core/gettext/Streams/Reader.php
diff --git a/featherbb/Core/gettext/Streams/StringReader.php b/featherbb/Core/gettext/Streams/StringReader.php
diff --git a/featherbb/Core/gettext/Translations/EntryTranslations.php b/featherbb/Core/gettext/Translations/EntryTranslations.php
diff --git a/featherbb/Core/gettext/Translations/GettextTranslations.php b/featherbb/Core/gettext/Translations/GettextTranslations.php
diff --git a/featherbb/Core/gettext/Translations/NOOPTranslations.php b/featherbb/Core/gettext/Translations/NOOPTranslations.php
diff --git a/featherbb/Core/gettext/Translations/Translations.php b/featherbb/Core/gettext/Translations/Translations.php
diff --git a/featherbb/Core/gettext/Translations/TranslationsInterface.php b/featherbb/Core/gettext/Translations/TranslationsInterface.php
diff --git a/featherbb/Core/gettext/l10n.php b/featherbb/Core/gettext/l10n.php
diff --git a/featherbb/Middleware/Auth.php b/featherbb/Middleware/Auth.php
diff --git a/featherbb/Middleware/Core.php b/featherbb/Middleware/Core.php
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class Categories`
`20`	`20`	`public function __construct()`
`21`	`21`	`{`
`22`	`22`	`$this->model = new \FeatherBB\Model\Admin\Categories();`
`23`		`- translate('admin/categories');`
	`23`	`+ Lang::load('admin/categories');`
`24`	`24`	`if (!User::isAdmin()) {`
`25`	`25`	`throw new Error(__('No permission'), '403');`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class Censoring`
`18`	`18`	`public function __construct()`
`19`	`19`	`{`
`20`	`20`	`$this->model = new \FeatherBB\Model\Admin\Censoring();`
`21`		`- translate('admin/censoring');`
	`21`	`+ Lang::load('admin/censoring');`
`22`	`22`	`if (!User::isAdmin()) {`
`23`	`23`	`throw new Error(__('No permission'), '403');`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class Forums`
`20`	`20`	`public function __construct()`
`21`	`21`	`{`
`22`	`22`	`$this->model = new \FeatherBB\Model\Admin\Forums();`
`23`		`- translate('admin/forums');`
	`23`	`+ Lang::load('admin/forums');`
`24`	`24`	`if (!User::isAdmin()) {`
`25`	`25`	`throw new Error(__('No permission'), '403');`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class Groups`
`18`	`18`	`public function __construct()`
`19`	`19`	`{`
`20`	`20`	`$this->model = new \FeatherBB\Model\Admin\Groups();`
`21`		`- translate('admin/groups');`
	`21`	`+ Lang::load('admin/groups');`
`22`	`22`	`if (!User::isAdmin()) {`
`23`	`23`	`throw new Error(__('No permission'), '403');`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class Index`
`18`	`18`	`{`
`19`	`19`	`public function __construct()`
`20`	`20`	`{`
`21`		`- translate('admin/index');`
	`21`	`+ Lang::load('admin/index');`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public function display($req, $res, $args)`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class Maintenance`
`18`	`18`	`public function __construct()`
`19`	`19`	`{`
`20`	`20`	`$this->model = new \FeatherBB\Model\Admin\Maintenance();`
`21`		`- translate('admin/maintenance');`
	`21`	`+ Lang::load('admin/maintenance');`
`22`	`22`	`if (!User::isAdmin()) {`
`23`	`23`	`throw new Error(__('No permission'), '403');`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class Options`
`18`	`18`	`public function __construct()`
`19`	`19`	`{`
`20`	`20`	`$this->model = new \FeatherBB\Model\Admin\Options();`
`21`		`- translate('admin/options');`
	`21`	`+ Lang::load('admin/options');`
`22`	`22`	`if (!User::isAdmin()) {`
`23`	`23`	`throw new Error(__('No permission'), '403');`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class Parser`
`19`	`19`	`public function __construct()`
`20`	`20`	`{`
`21`	`21`	`$this->model = new \FeatherBB\Model\Admin\Parser();`
`22`		`- translate('admin/parser');`
	`22`	`+ Lang::load('admin/parser');`
`23`	`23`	`if (!User::isAdmin()) {`
`24`	`24`	`throw new Error(__('No permission'), '403');`
`25`	`25`	`}`