From a5720ef17cdd192f22e00617f84dd7c59abf2c07 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 26 Sep 2015 16:12:36 +0200
Subject: [PATCH] menu: `fix' menu translation; closes #403

It looks like the new components are not yet setting a different
language internally.  Time to fix that, huh...
---
 .../app/views/layout_partials/base_menu_system.volt  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/opnsense/mvc/app/views/layout_partials/base_menu_system.volt b/src/opnsense/mvc/app/views/layout_partials/base_menu_system.volt
index 450ce7848..b65c72a60 100644
--- a/src/opnsense/mvc/app/views/layout_partials/base_menu_system.volt
+++ b/src/opnsense/mvc/app/views/layout_partials/base_menu_system.volt
@@ -4,7 +4,7 @@
             <div id="mainmenu" class="panel" style="border:0px" >
                 <div class="panel list-group" style="border:0px">
                 {% for topMenuItem in menuSystem %}
-                    <a href="#{{ topMenuItem.Id }}" class="list-group-item {% if topMenuItem.Selected %}  active-menu-title {% endif  %}" data-toggle="collapse" data-parent="#mainmenu"><span class="{{ topMenuItem.CssClass }} __iconspacer"></span>{{ topMenuItem.VisibleName }} </a>
+                    <a href="#{{ topMenuItem.Id }}" class="list-group-item {% if topMenuItem.Selected %}  active-menu-title {% endif  %}" data-toggle="collapse" data-parent="#mainmenu"><span class="{{ topMenuItem.CssClass }} __iconspacer"></span>{{ lang._(topMenuItem.VisibleName) }} </a>
                     <div class="collapse  {% if topMenuItem.Selected %} active-menu in {% endif  %}" id="{{ topMenuItem.Id }}">
                         {% for subMenuItem in topMenuItem.Children %}
                             {% if subMenuItem.Url == '' %}
@@ -12,7 +12,7 @@
                                 <a href="#{{ topMenuItem.Id }}_{{ subMenuItem.Id }}" class="list-group-item {% if subMenuItem.Selected %}  active-menu-title {% endif  %}" data-toggle="collapse" data-parent="#{{ topMenuItem.Id }}">
                                   <div style="display: table;width: 100%;">
                                     <div style="display: table-row">
-                                      <div style="display: table-cell">{{ subMenuItem.VisibleName }}</div>
+                                      <div style="display: table-cell">{{ lang._(subMenuItem.VisibleName) }}</div>
                                         <div style="display: table-cell; text-align:right; vertical-align:middle;"><span class="{{ subMenuItem.CssClass }}"></span></div>
                                       </div>
                                   </div>
@@ -20,9 +20,9 @@
                                 <div class="collapse {% if subMenuItem.Selected %} active-menu in {% endif  %}" id="{{ topMenuItem.Id }}_{{ subMenuItem.Id }}">
                                     {% for subsubMenuItem in subMenuItem.Children %}
                                         {% if subsubMenuItem.IsExternal == "Y" %}
-                                            <a href="{{ subsubMenuItem.Url }}" target="_new" class="list-group-item menu-level-3-item {% if subsubMenuItem.Selected %} active {% endif  %}">{{ subsubMenuItem.VisibleName }}</a>
+                                            <a href="{{ subsubMenuItem.Url }}" target="_new" class="list-group-item menu-level-3-item {% if subsubMenuItem.Selected %} active {% endif  %}">{{ lang._(subsubMenuItem.VisibleName) }}</a>
                                         {% elseif acl.isPageAccessible(session.get('Username'),subsubMenuItem.Url)  %}
-                                            <a href="{{ subsubMenuItem.Url }}" class="list-group-item menu-level-3-item {% if subsubMenuItem.Selected %} active {% endif  %}">{{ subsubMenuItem.VisibleName }}</a>
+                                            <a href="{{ subsubMenuItem.Url }}" class="list-group-item menu-level-3-item {% if subsubMenuItem.Selected %} active {% endif  %}">{{ lang._(subsubMenuItem.VisibleName) }}</a>
                                         {% endif %}
                                     {% endfor %}
                                 </div>
@@ -30,7 +30,7 @@
                                 <a href="{{ subMenuItem.Url }}" target="_new" class="list-group-item {% if subMenuItem.Selected %} active {% endif  %}">
                                   <div style="display: table;width: 100%;">
                                     <div style="display: table-row">
-                                      <div style="display: table-cell">{{ subMenuItem.VisibleName }}</div>
+                                      <div style="display: table-cell">{{ lang._(subMenuItem.VisibleName) }}</div>
                                         <div style="display: table-cell; text-align:right; vertical-align:middle;"><span class="{{ subMenuItem.CssClass }}"></span></div>
                                       </div>
                                   </div>
@@ -39,7 +39,7 @@
                                 <a href="{{ subMenuItem.Url }}" class="list-group-item {% if subMenuItem.Selected %} active {% endif  %}">
                                   <div style="display: table;width: 100%;">
                                     <div style="display: table-row">
-                                      <div style="display: table-cell">{{ subMenuItem.VisibleName }}</div>
+                                      <div style="display: table-cell">{{ lang._(subMenuItem.VisibleName) }}</div>
                                         <div style="display: table-cell; text-align:right; vertical-align:middle;"><span class="{{ subMenuItem.CssClass }}"></span></div>
                                       </div>
                                   </div>