Get rid of the .mo extension

adaur · adaur · commit 99f8a5396df3 · 2016-02-21T20:48:04.000+01:00
diff --git a/extern.php b/extern.php
@@ -229,8 +229,8 @@ function authenticate_user($user, $password, $password_is_hash = false)
         User::get()->is_guest = false;
     }
 
-    translate('common.mo');
-    translate('index.mo');
+    translate('common');
+    translate('index');
 }
 
 // If we're a guest and we've sent a username/pass, we can try to authenticate using those details
diff --git a/featherbb/Controller/Admin/Bans.php b/featherbb/Controller/Admin/Bans.php
@@ -19,7 +19,7 @@ class Bans
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Bans();
-        translate('admin/bans.mo');
+        translate('admin/bans');
 
         if (User::get()->g_id != ForumEnv::get('FEATHER_ADMIN') && (User::get()->g_moderator != '1' || User::get()->g_mod_ban_users == '0')) {
             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.mo');
+        translate('admin/categories');
     }
 
     public function add($req, $res, $args)
diff --git a/featherbb/Controller/Admin/Censoring.php b/featherbb/Controller/Admin/Censoring.php
@@ -17,7 +17,7 @@ class Censoring
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Censoring();
-        translate('admin/censoring.mo');
+        translate('admin/censoring');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Admin/Forums.php b/featherbb/Controller/Admin/Forums.php
@@ -19,7 +19,7 @@ class Forums
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Forums();
-        translate('admin/forums.mo');
+        translate('admin/forums');
     }
 
     public function add()
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.mo');
+        translate('admin/groups');
     }
 
     public function display($req, $res, $args)
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.mo');
+        translate('admin/index');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Admin/Maintenance.php b/featherbb/Controller/Admin/Maintenance.php
@@ -17,7 +17,7 @@ class Maintenance
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Maintenance();
-        translate('admin/maintenance.mo');
+        translate('admin/maintenance');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
@@ -17,7 +17,7 @@ class Options
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Options();
-        translate('admin/options.mo');
+        translate('admin/options');
     }
 
     public function display($req, $res, $args)
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.mo');
+        translate('admin/parser');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Admin/Permissions.php b/featherbb/Controller/Admin/Permissions.php
@@ -17,7 +17,7 @@ class Permissions
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Permissions();
-        translate('admin/permissions.mo');
+        translate('admin/permissions');
     }
 
     public function display($req, $res, $args)
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.mo');
+        translate('admin/plugins');
     }
 
     /**
diff --git a/featherbb/Controller/Admin/Reports.php b/featherbb/Controller/Admin/Reports.php
@@ -18,7 +18,7 @@ class Reports
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Admin\Reports();
-        translate('admin/reports.mo');
+        translate('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.mo');
+        translate('admin/index');
     }
 
     public function display($req, $res, $args)
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.mo');
+        translate('admin/users');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
@@ -21,7 +21,7 @@ class Auth
 {
     public function __construct()
     {
-        translate('login.mo');
+        translate('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.mo');
-        translate('misc.mo');
+        translate('forum');
+        translate('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.mo');
+        translate('help');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Index.php b/featherbb/Controller/Index.php
@@ -20,8 +20,8 @@ class Index
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Index();
-        translate('index.mo');
-        translate('misc.mo');
+        translate('index');
+        translate('misc');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
@@ -49,7 +49,7 @@ public function run()
         $csrf = new \FeatherBB\Middleware\Csrf();
         $csrf->generateNewToken(Container::get('request'));
 
-        translate(ForumEnv::get('install.mo', 'featherbb', $this->install_lang));
+        translate(ForumEnv::get('install', 'featherbb', $this->install_lang));
 
         if (Request::isPost() && empty(Input::getParsedBodyParam('choose_lang'))) {
             $missing_fields = array();
@@ -187,7 +187,7 @@ public function create_db(array $data)
         // Init DB
         Core::init_db($data);
         // Load appropriate language
-        translate(ForumEnv::get('install.mo', 'featherbb', $data['default_lang']));
+        translate(ForumEnv::get('install', 'featherbb', $data['default_lang']));
 
         // 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.mo');
-        translate('delete.mo');
-        translate('post.mo');
-        translate('misc.mo');
-        translate('register.mo');
-        translate('antispam.mo');
-        translate('bbeditor.mo');
+        translate('prof_reg');
+        translate('delete');
+        translate('post');
+        translate('misc');
+        translate('register');
+        translate('antispam');
+        translate('bbeditor');
     }
 
     public function newreply($req, $res, $args)
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
@@ -19,10 +19,10 @@ class Profile
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Profile();
-        translate('profile.mo');
-        translate('register.mo');
-        translate('prof_reg.mo');
-        translate('misc.mo');
+        translate('profile');
+        translate('register');
+        translate('prof_reg');
+        translate('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.mo');
-        translate('prof_reg.mo');
-        translate('antispam.mo');
+        translate('register');
+        translate('prof_reg');
+        translate('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.mo');
-        translate('search.mo');
-        translate('topic.mo');
-        translate('forum.mo');
+        translate('userlist');
+        translate('search');
+        translate('topic');
+        translate('forum');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Controller/Topic.php b/featherbb/Controller/Topic.php
@@ -19,9 +19,9 @@ class Topic
     public function __construct()
     {
         $this->model = new \FeatherBB\Model\Topic();
-        translate('topic.mo');
-        translate('misc.mo'); // To be removed
-        translate('post.mo');
+        translate('topic');
+        translate('misc'); // To be removed
+        translate('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.mo');
-        translate('search.mo');
+        translate('userlist');
+        translate('search');
     }
 
     public function display($req, $res, $args)
diff --git a/featherbb/Core/gettext/l10n.php b/featherbb/Core/gettext/l10n.php
@@ -20,10 +20,10 @@ function translate($mofile, $domain = 'featherbb', $language = false) {
     global $l10n;
 
     if (!$language) {
-        $mofile = ForumEnv::get('FEATHER_ROOT').'featherbb/lang/'.User::get()->language.'/'.$mofile;
+        $mofile = ForumEnv::get('FEATHER_ROOT').'featherbb/lang/'.User::get()->language.'/'.$mofile.'.mo';
     }
     else {
-        $mofile = ForumEnv::get('FEATHER_ROOT').'featherbb/lang/'.$language.'/'.$mofile;
+        $mofile = ForumEnv::get('FEATHER_ROOT').'featherbb/lang/'.$language.'/'.$mofile.'.mo';
     }
 
     if (!is_readable($mofile)) {
diff --git a/featherbb/Middleware/Auth.php b/featherbb/Middleware/Auth.php
@@ -294,7 +294,7 @@ public function __invoke($req, $res, $next)
             Container::set('user', $user);
         }
 
-        translate('common.mo');
+        translate('common');
         // Load bans from cache
         if (!Container::get('cache')->isCached('bans')) {
             Container::get('cache')->store('bans', Cache::get_bans());
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
@@ -1360,8 +1360,8 @@ public function check_username($username, $errors, $exclude_id = null)
         // Include UTF-8 function
         require_once ForumEnv::get('FEATHER_ROOT').'featherbb/Helpers/utf8/strcasecmp.php';
 
-        translate('register.mo');
-        translate('prof_reg.mo');
+        translate('register');
+        translate('prof_reg');
 
         // Convert multiple whitespace characters into one (to prevent people from registering with indistinguishable usernames)
         $username = preg_replace('%\s+%s', ' ', $username);

Original file line number	Diff line number	Diff line change
`@@ -229,8 +229,8 @@ function authenticate_user($user, $password, $password_is_hash = false)`
`229`	`229`	`User::get()->is_guest = false;`
`230`	`230`	`}`
`231`	`231`
`232`		`- translate('common.mo');`
`233`		`- translate('index.mo');`
	`232`	`+ translate('common');`
	`233`	`+ translate('index');`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`// If we're a guest and we've sent a username/pass, we can try to authenticate using those details`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class Bans`
`19`	`19`	`public function __construct()`
`20`	`20`	`{`
`21`	`21`	`$this->model = new \FeatherBB\Model\Admin\Bans();`
`22`		`- translate('admin/bans.mo');`
	`22`	`+ translate('admin/bans');`
`23`	`23`
`24`	`24`	`if (User::get()->g_id != ForumEnv::get('FEATHER_ADMIN') && (User::get()->g_moderator != '1' \|\| User::get()->g_mod_ban_users == '0')) {`
`25`	`25`	`throw new Error(__('No permission'), '403');`
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.mo');`
	`23`	`+ translate('admin/categories');`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public function add($req, $res, $args)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class Censoring`
`17`	`17`	`public function __construct()`
`18`	`18`	`{`
`19`	`19`	`$this->model = new \FeatherBB\Model\Admin\Censoring();`
`20`		`- translate('admin/censoring.mo');`
	`20`	`+ translate('admin/censoring');`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public function display($req, $res, $args)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class Forums`
`19`	`19`	`public function __construct()`
`20`	`20`	`{`
`21`	`21`	`$this->model = new \FeatherBB\Model\Admin\Forums();`
`22`		`- translate('admin/forums.mo');`
	`22`	`+ translate('admin/forums');`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public function add()`
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.mo');`
	`21`	`+ translate('admin/groups');`
`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 Index`
`18`	`18`	`{`
`19`	`19`	`public function __construct()`
`20`	`20`	`{`
`21`		`- translate('admin/index.mo');`
	`21`	`+ translate('admin/index');`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public function display($req, $res, $args)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class Maintenance`
`17`	`17`	`public function __construct()`
`18`	`18`	`{`
`19`	`19`	`$this->model = new \FeatherBB\Model\Admin\Maintenance();`
`20`		`- translate('admin/maintenance.mo');`
	`20`	`+ translate('admin/maintenance');`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public function display($req, $res, $args)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class Options`
`17`	`17`	`public function __construct()`
`18`	`18`	`{`
`19`	`19`	`$this->model = new \FeatherBB\Model\Admin\Options();`
`20`		`- translate('admin/options.mo');`
	`20`	`+ translate('admin/options');`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public function display($req, $res, $args)`
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.mo');`
	`22`	`+ translate('admin/parser');`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public function display($req, $res, $args)`