Follow updated translations for admin options

beaver-dev · beaver-dev · commit eb66d8fc09d9 · 2016-04-19T18:41:07.000+02:00
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
@@ -32,7 +32,7 @@ public function display($req, $res, $args)
             return $this->model->update_options();
         }
 
-        AdminUtils::generateAdminMenu('options');
+        AdminUtils::generateAdminMenu('admin options');
 
         View::setPageInfo(array(
                 'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Admin options')),
diff --git a/featherbb/Core/AdminUtils.php b/featherbb/Core/AdminUtils.php
@@ -18,13 +18,10 @@ public static function generateAdminMenu($page = '')
     {
         translate('admin/common');
 
-        $is_admin = (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN')) ? true : false;
-
         \View::setPageInfo(array(
             'page'        =>    $page,
             'menu_items'  =>    Container::get('hooks')->fire('admin.menu', self::load_default_menu()),
-            'is_admin'    =>    $is_admin,
-            'plugins'     =>    self::adminPluginsMenu($is_admin) // See if there are any plugins that want to be displayed in the menu
+            'plugins'     =>    self::adminPluginsMenu() // See if there are any plugins that want to be displayed in the menu
             ), 1
         )->addTemplate('admin/menu.php');
     }
@@ -119,7 +116,7 @@ protected static function load_default_menu()
             'mod.users' => array('title' => 'Users', 'url' => 'adminUsers'),
             'mod.bans' => array('title' => 'Bans', 'url' => 'adminBans'),
             'mod.reports' => array('title' => 'Reports', 'url' => 'adminReports'),
-            'board.options' => array('title' => 'Options', 'url' => 'adminOptions'),
+            'board.options' => array('title' => 'Admin options', 'url' => 'adminOptions'),
             'board.permissions' => array('title' => 'Permissions', 'url' => 'adminPermissions'),
             'board.categories' => array('title' => 'Categories', 'url' => 'adminCategories'),
             'board.forums' => array('title' => 'Forums', 'url' => 'adminForums'),

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function display($req, $res, $args)`
`32`	`32`	`return $this->model->update_options();`
`33`	`33`	`}`
`34`	`34`
`35`		`- AdminUtils::generateAdminMenu('options');`
	`35`	`+ AdminUtils::generateAdminMenu('admin options');`
`36`	`36`
`37`	`37`	`View::setPageInfo(array(`
`38`	`38`	`'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Admin options')),`