kchan/menu-bundle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix translator assignment ordering

Browse source
This commit is contained in:
Kendrick Chan 2021-04-28 01:04:09 +08:00
parent 7fa710b6d2
commit a31587b62e
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Service/Generator.php
View file

@ -23,10 +23,10 @@ class Generator
public function __construct($menu_data, TranslatorInterface $trans) public function __construct($menu_data, TranslatorInterface $trans)
{ {
$this->translator = $trans;
$this->index = new Collection(); $this->index = new Collection();
$this->menu = new Collection(); $this->menu = new Collection();
$this->menu_data = $this->processConfigs($menu_data); $this->menu_data = $this->processConfigs($menu_data);
$this->translator = $trans;
} }
public function getMenu($menu_key) public function getMenu($menu_key)
@ -137,9 +137,9 @@ class Generator
$all_terms = $matches[1]; $all_terms = $matches[1];
foreach ($all_terms as $term) foreach ($all_terms as $term)
{ {
if ($term == null) $trans_term = ucwords($this->translator->trans($term));
continue;
$final_text = str_replace('[' . $term . ']', $this->translator->trans($term), $final_text); $final_text = str_replace('[' . $term . ']', $trans_term, $final_text);
} }
return $final_text; return $final_text;
@ -147,11 +147,9 @@ class Generator
protected function newItem($index, $id, $label, $icon = null) protected function newItem($index, $id, $label, $icon = null)
{ {
$trans_label = $this->translate($label);
$mi = new Item(); $mi = new Item();
$mi->setID($id) $mi->setID($id)
->setLabel($label) ->setLabel($this->translate($label))
->setRoute($id); ->setRoute($id);
if ($icon != null) if ($icon != null)