Fixes role translations not working

OneGov · Aug 29, 2016 · 9e25b6c · 9e25b6c
1 parent b7059ef
commit 9e25b6c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/onegov/org/locale/de_CH/LC_MESSAGES/onegov.org.po b/onegov/org/locale/de_CH/LC_MESSAGES/onegov.org.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2016-08-26 16:28+0200\n"
+"POT-Creation-Date: 2016-08-29 13:32+0200\n"
 "PO-Revision-Date: 2015-10-15 09:42+0200\n"
 "Last-Translator: Denis Krienbühl <denis.krienbuehl@seantis.ch>\n"
 "Language-Team: German\n"
@@ -1061,6 +1061,12 @@ msgstr "Keine Veranstaltungen gefunden."
 msgid "Filter by date"
 msgstr "Nach Datum filtern"
 
+msgid "Administrator"
+msgstr "Administrator"
+
+msgid "Administrators"
+msgstr "Administratoren"
+
 msgid "Dear Sir or Madam,"
 msgstr "Guten Tag"
 

diff --git a/onegov/org/templates/macros.pt b/onegov/org/templates/macros.pt
@@ -574,4 +574,20 @@
             </noscript>
         </form>
     </div>
-</metal:date_range_selector>
+</metal:date_range_selector>
+
+<metal:role_singular define-macro="role-singular" i18n:domain="onegov.org">
+    <tal:block switch="role">
+        <tal:block case="'admin'" i18n:translate>Administrator</tal:block>
+        <tal:block case="'editor'" i18n:translate>Editor</tal:block>
+        <tal:block case="'member'" i18n:translate>Member</tal:block>
+    </tal:block>
+</metal:role_singular>
+
+<metal:role_plural define-macro="role-plural" i18n:domain="onegov.org">
+    <tal:block switch="role">
+        <tal:block case="'admin'" i18n:translate>Administrators</tal:block>
+        <tal:block case="'editor'" i18n:translate>Editors</tal:block>
+        <tal:block case="'member'" i18n:translate>Members</tal:block>
+    </tal:block>
+</metal:role_plural>
diff --git a/onegov/org/templates/usermanagement.pt b/onegov/org/templates/usermanagement.pt
@@ -8,7 +8,10 @@
             <tal:block repeat="role ('admin', 'editor', 'member')">
                 <tbody tal:condition="users.get(role)">
                     <tr class="subheader">
-                        <td colspan="3">${request.translate(role.capitalize() + 's')} (${len(users.get(role))})</td>
+                        <td colspan="3">
+                            <tal:block metal:use-macro="layout.macros['role-plural']" />
+                            (${len(users.get(role))})
+                        </td>
                     </tr>
                     <tr tal:repeat="user users[role]" class="${user.active and 'user-active' or 'user-inactive'}">
                         <td>${user.username}</td>

diff --git a/onegov/org/templates/userprofile.pt b/onegov/org/templates/userprofile.pt
@@ -12,7 +12,7 @@
         <div class="field-display">
             <div class="field-display-label" i18n:translate>Role</div>
             <div class="field-display-data">
-                ${request.translate(role.capitalize())}
+                <tal:block metal:use-macro="layout.macros['role-singular']" />
             </div>
         </div>
         <div class="field-display">