[Zope3-checkins] CVS: Zope3/src/zope/app/browser/security/grants - manage_roleform.pt:1.5 principal_role_association.pt:1.7 rolepermissionview.py:1.8

[Philipp von Weitershausen]

Update of /cvs-repository/Zope3/src/zope/app/browser/security/grants
In directory cvs.zope.org:/tmp/cvs-serv32583/src/zope/app/browser/security/grants

Modified Files:
	manage_roleform.pt principal_role_association.pt 
	rolepermissionview.py 
Log Message:
Fix i18n message ids. We now have explicit message ids in many places where
the English default text is ambigious. Also, message IDs ending with a colon
have been avoided.

German translation was updated accordingly.


=== Zope3/src/zope/app/browser/security/grants/manage_roleform.pt 1.4 => 1.5 ===
--- Zope3/src/zope/app/browser/security/grants/manage_roleform.pt:1.4	Thu Aug  7 13:40:56 2003
+++ Zope3/src/zope/app/browser/security/grants/manage_roleform.pt	Wed Aug 20 14:21:06 2003
@@ -29,7 +29,7 @@
       <table width="100%" cellspacing="0" cellpadding="2" border="0" 
              nowrap="nowrap"
              tal:define="availableSettings 
-                python:view.availableSettings(noacquire=1)">
+                python:view.availableSettings(noacquire=True)">
 
         <tr class="list-header">
           <td align="left" valign="top"


=== Zope3/src/zope/app/browser/security/grants/principal_role_association.pt 1.6 => 1.7 ===
--- Zope3/src/zope/app/browser/security/grants/principal_role_association.pt:1.6	Thu Aug  7 13:40:56 2003
+++ Zope3/src/zope/app/browser/security/grants/principal_role_association.pt	Wed Aug 20 14:21:06 2003
@@ -10,14 +10,14 @@
    <div tal:condition="not: hasFilter">
      <span class="message" i18n:translate="">Apply filter</span>
      <form action="@@PrincipalRoles.html" method="POST">
-       <span i18n:translate="">Principal(s):</span>
+       <span i18n:translate="">Principal(s)</span>:
        <select name="principals:list" multiple="multiple">
          <option tal:repeat="principal view/getAllPrincipals"
                  tal:attributes="value principal/getId"
                  tal:content="principal/getTitle">my title</option>
        </select>
    
-       <span i18n:translate="">Role(s):</span>
+       <span i18n:translate="">Role(s)</span>:
        <select name="roles:list" multiple="multiple">
          <option tal:repeat="role view/getAllRoles"
                  tal:attributes="value role/getId"


=== Zope3/src/zope/app/browser/security/grants/rolepermissionview.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/browser/security/grants/rolepermissionview.py:1.7	Thu Aug  7 13:40:56 2003
+++ Zope3/src/zope/app/browser/security/grants/rolepermissionview.py	Wed Aug 20 14:21:06 2003
@@ -43,10 +43,13 @@
                 ).getPermissions()
         return permissions
 
-    def availableSettings(self, noacquire=0):
-        aq = {'id': Unset.getName(), 'shorttitle': ' ', 'title': _('Acquire')}
-        rest = [{'id': Allow.getName(), 'shorttitle': '+', 'title': _('Allow')},
-                {'id': Deny.getName(), 'shorttitle': '-', 'title': _('Deny')},
+    def availableSettings(self, noacquire=False):
+        aq = {'id': Unset.getName(), 'shorttitle': ' ',
+              'title': _('permission-acquire', 'Acquire')}
+        rest = [{'id': Allow.getName(), 'shorttitle': '+',
+                 'title': _('permission-allow', 'Allow')},
+                {'id': Deny.getName(), 'shorttitle': '-',
+                 'title': _('permission-deny', 'Deny')},
                 ]
         if noacquire:
             return rest