Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: remove error when rendering template with language not set to English #67

Merged
merged 2 commits into from
Dec 28, 2018
Merged

fix: remove error when rendering template with language not set to English #67

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aa85f0
fix: don't translate deferred translated strings
dodumosu Dec 21, 2018
b835a03
Merge branch 'bugfix/base-template-i18n' into develop
dodumosu Dec 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions apollo/frontend/templates/frontend/_layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,22 @@
{% autoescape False %}
{% for menu_item in current_menu.submenu('main').children %}
{% if not menu_item.has_visible_child() and menu_item.visible %}
<li><a href="{{ menu_item.url }}">{{ menu_item.icon }} {{ _(menu_item.text) }}</a></li>
<li><a href="{{ menu_item.url }}">{{ menu_item.icon }} {{ menu_item.text }}</a></li>
{% elif menu_item.visible %}
<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ menu_item.icon }} {{ _(menu_item.text) }} <b class="caret"></b></a>
<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ menu_item.icon }} {{ menu_item.text }} <b class="caret"></b></a>
<ul class="dropdown-menu">
{% if menu_item.children|count < 2 %}
{% for submenu_item in menu_item.children[0].dynamic_list %}
<li><a href="{{ submenu_item.url }}">{{ submenu_item.icon }} {{ _(submenu_item.text) }}</a></li>
<li><a href="{{ submenu_item.url }}">{{ submenu_item.icon }} {{ submenu_item.text }}</a></li>
{% endfor %}
{% else %}
{% for submenu_item in menu_item.children %}
{% if submenu_item.visible %}
<li class="dropdown-submenu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ submenu_item.icon }} {{ _(submenu_item.text) }}</a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ submenu_item.icon }} {{ submenu_item.text }}</a>
<ul class="dropdown-menu">
{% for subsubmenu_item in submenu_item.dynamic_list %}
<li><a href="{{ subsubmenu_item.url }}">{{ subsubmenu_item.icon }} {{ _(subsubmenu_item.text) }}</a></li>
<li><a href="{{ subsubmenu_item.url }}">{{ subsubmenu_item.icon }} {{ subsubmenu_item.text }}</a></li>
{% endfor %}
</ul>
</li>
Expand Down