tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Setting menu titles for CMSMenu items in LeftAndMain::init() to get translated values for the current user locale (see #2873)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65106 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-11-02 22:45:49 +00:00
parent e1d5fc9db6
commit 386c586b38
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/LeftAndMain.php
View File

@ -329,8 +329,18 @@ class LeftAndMain extends Controller {
} }
} }
// already set in CMSMenu::populate_menu(), but from a static pre-controller
// context, so doesn't respect the current user locale in _t() calls - as a workaround,
// we simply call getMenuTitle() again if we're dealing with a controller
if($menuItem->controller) {
$controllerObj = singleton($menuItem->controller);
$title = $controllerObj->getMenuTitle();
} else {
$title = $menuItem->title;
}
$menu->push(new ArrayData(array( $menu->push(new ArrayData(array(
"Title" => Convert::raw2xml($menuItem->title), "Title" => Convert::raw2xml($title),
"Code" => $code, "Code" => $code,
"Link" => $menuItem->url, "Link" => $menuItem->url,
"LinkingMode" => $linkingmode "LinkingMode" => $linkingmode