Zhang Huangbin avatar Zhang Huangbin committed e0005c5

Fix run-time translation switch issue, all i18n strings in macros which defined in a seperate file are now translated correctly.

Comments (0)

Files changed (9)

templates/default/ldap/admin_create.html

         display_password_policy,
         display_reset_password,
         display_preferredLanguage,
+        with context
         %}
 
 {% block js %}{% endblock js %}

templates/default/ldap/admin_profile.html

                 display_preferredLanguage,
                 display_password_policy,
                 display_reset_password,
+                with context
                 %}
 
 {% block js %}{% endblock js %}

templates/default/ldap/admins.html

 {% extends "layout.html" %}
 
-{% from "macros.html" import set_account_status_img %}
+{% from "macros.html" import set_account_status_img with context %}
 
 {% block title %}{{ _('Domain Admins') }}{% endblock %}
 {% block navlinks_active_admins %}active{% endblock %}

templates/default/ldap/domain_create.html

 {# Defined: domain, profile, mtaTransport #}
 
 {% extends "layout.html" %}
-{% from "macros.html" import display_cn, %}
-{% from "msgHandlers.html" import domainMsgHandler %}
+{% from "macros.html" import display_cn, with context %}
+{% from "msgHandlers.html" import domainMsgHandler with context %}
 
 {% block js %}{% endblock js %}
 {% block js_tablesorter %}{% endblock %}

templates/default/ldap/domain_profile.html

         set_account_status_img,
         display_cn,
         display_account_status,
+        with context
         %}
 
-{% from "msgHandlers.html" import domainMsgHandler %}
+{% from "msgHandlers.html" import domainMsgHandler with context %}
 
 {% block js %}{% endblock js %}
 {% block js_tablesorter %}{% endblock js_tablesorter %}

templates/default/ldap/domains.html

 {% extends "layout.html" %}
 
-{% from "macros.html" import set_account_status_img, %}
-{% from "msgHandlers.html" import domainMsgHandler %}
+{% from "macros.html" import set_account_status_img, with context %}
+{% from "msgHandlers.html" import domainMsgHandler with context %}
 
 {% block title %}{{ _('Mail Domains') }}{% endblock %}
 {% block navlinks_active_domains %}active{% endblock %}

templates/default/ldap/user_create.html

 {% from "macros.html" import display_cn,
         display_password_policy,
         display_reset_password,
-        display_quota, %}
+        display_quota,
+        with context
+        %}
 
 {% block js %}{% endblock js %}
 {% block js_tablesorter %}{% endblock %}

templates/default/ldap/user_profile.html

         display_account_status,
         display_password_policy,
         display_reset_password,
+        with context
         %}
 
 {% block js %}{% endblock js %}

templates/default/ldap/users.html

 
 {% extends "layout.html" %}
 
-{% from "macros.html" import set_account_status_img, display_quota, %}
+{% from "macros.html" import set_account_status_img, display_quota, with context %}
 
 {% block title %}{{ _('Mail Users') }}{% endblock %}
 {% block navlinks_active_users %}active{% endblock %}
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.