Translation Domain Added

cesurapp · Nov 15, 2018 · 00a375c · 00a375c
1 parent 636bc16
commit 00a375c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -197,6 +197,7 @@ You can change the default options.
     'template': '@PdMenu/Default/menu.html.twig'
     'depth': null
     'currentClass': 'active'
+    'trans_domain': 'admin'
 }) }}
 ```
 

diff --git a/Resources/views/Default/menu.html.twig b/Resources/views/Default/menu.html.twig
@@ -2,7 +2,7 @@
 
 {# Begin Menu #}
 {% block menu_begin %}
-    <ul id="{{ menu.id }}" {{ arrayToAttr(menu.childAttr, {'class': 'pd-menu'}) }}>
+    <ul id="{{ menu.id }}" {{ arrayToAttr(menu.childAttr, {'class': 'pd-menu'}, options) }}>
         {% for depth in menu.child %}
             {% set menu = depth %}
             {{ block('menu_item') }}
@@ -12,29 +12,29 @@
 
 {# Create Menu Item #}
 {% block menu_item %}
-    <li {{ arrayToAttr(menu.listAttr) }}>
+    <li {{ arrayToAttr(menu.listAttr, [], options) }}>
         {# Create Link #}
         {% if menu.link %}
-            <a href="{{ menu.link }}" {{ arrayToAttr(menu.linkAttr) }}>
+            <a href="{{ menu.link }}" {{ arrayToAttr(menu.linkAttr, [], options) }}>
                 {% if menu.extra('label_icon') %}
                     <i class="material-icons">{{ menu.extra('label_icon') }}</i>
                 {% endif %}
-                <span {{ arrayToAttr(menu.labelAttr) }}>
-                    {{ menu.extra('label_translate', true) ? menu.label|trans : menu.label }}
+                <span {{ arrayToAttr(menu.labelAttr, [], options) }}>
+                    {{ menu.extra('label_translate', true) ? menu.label|trans([], options.trans_domain) : menu.label }}
                 </span>
             </a>
         {% else %}
             {% if menu.extra('label_icon') %}
                 <i class="material-icons">{{ menu.extra('label_icon') }}</i>
             {% endif %}
-            <span {{ arrayToAttr(menu.labelAttr) }}>
-                {{ menu.extra('label_translate', true) ? menu.label|trans : menu.label }}
+            <span {{ arrayToAttr(menu.labelAttr, [], options) }}>
+                {{ menu.extra('label_translate', true) ? menu.label|trans([], options.trans_domain) : menu.label }}
             </span>
         {% endif %}
 
         {# Create Dropdown #}
         {% if menu.child|length %}
-            <ul {{ arrayToAttr(menu.childAttr) }}>
+            <ul {{ arrayToAttr(menu.childAttr, [], options) }}>
                 {% for depth in menu.child %}
                     {% set menu = depth %}
                     {{ block('menu_item') }}

diff --git a/Twig/MenuExtension.php b/Twig/MenuExtension.php
@@ -56,6 +56,7 @@ class MenuExtension extends \Twig_Extension
         'template' => '@PdMenu/Default/menu.html.twig',
         'depth' => null,
         'currentClass' => 'active',
+        'trans_domain' => null
     ];
 
     /**
@@ -146,7 +147,7 @@ public function getMenu(string $menuClass, $options = []): ItemInterface
      *
      * @return string
      */
-    public function arrayToAttr(array $array = [], array $append = [])
+    public function arrayToAttr(array $array = [], array $append = [], array $options = [])
     {
         $array = array_merge_recursive($array, $append);
         $attr = '';
@@ -158,7 +159,7 @@ public function arrayToAttr(array $array = [], array $append = [])
 
             if ('title' === mb_strtolower($key)) {
                 if (!isset($array['title_translate'])) {
-                    $value = $this->translator->trans($value);
+                    $value = $this->translator->trans($value, [], $options['trans_domain'] ?? null);
                 }
             }