From 46f69b0c0dd484d7c4ed007158b77cbcc2306cf6 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Mon, 2 May 2016 10:42:47 +1200 Subject: [PATCH] API set menu title without editing transifex masters --- code/controllers/AssetAdmin.php | 11 ++++++++++- code/controllers/CMSMain.php | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php index 68b6d92d..d71ff9bf 100644 --- a/code/controllers/AssetAdmin.php +++ b/code/controllers/AssetAdmin.php @@ -599,8 +599,17 @@ class AssetAdmin extends LeftAndMain implements PermissionProvider{ return $items; } + public static function menu_title($class = null, $localised = true) { + // Deprecate this menu title if installed alongside new asset admin + if($localised && class_exists('SilverStripe\AssetAdmin\Controller\AssetAdmin')) { + // Don't conflict with legacy translations + return _t('AssetAdmin.CMSMENU_OLD', 'Files (old)'); + } + return parent::menu_title(null, $localised); + } + public function providePermissions() { - $title = _t("AssetAdmin.MENUTITLE", LeftAndMain::menu_title_for_class($this->class)); + $title = static::menu_title(); return array( "CMS_ACCESS_AssetAdmin" => array( 'name' => _t('CMSMain.ACCESS', "Access to '{title}' section", array('title' => $title)), diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index a3915692..ce569cfd 100644 --- a/code/controllers/CMSMain.php +++ b/code/controllers/CMSMain.php @@ -1428,7 +1428,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr } public function providePermissions() { - $title = _t("CMSPagesController.MENUTITLE", LeftAndMain::menu_title_for_class('CMSPagesController')); + $title = CMSPagesController::menu_title(); return array( "CMS_ACCESS_CMSMain" => array( 'name' => _t('CMSMain.ACCESS', "Access to '{title}' section", array('title' => $title)),