more on i18n and German translations

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@1774 fd906abe-77d9-0310-91a1-e0d9ade77398

browser/common.py

@@ -25,6 +25,7 @@ $Id$
 from zope.app import zapi
 from zope import component
 from zope.app.form.browser.interfaces import ITerms
+from zope.app.i18n.interfaces import ITranslationDomain
 from zope.app.security.interfaces import IAuthentication
 from zope.app.pagetemplate import ViewPageTemplateFile
 from zope.cachedescriptors.property import Lazy
@@ -300,12 +301,17 @@ class BaseView(GenericView):
         if versionable is None:
             return ''
         versionId = versionable.versionId
-        current = (versionable.currentVersion == context) and 'current' or ''
+        td = component.getUtility(ITranslationDomain, _._domain)
-        released = (versionable.releasedVersion == context) and 'released' or ''
+        current = ((versionable.currentVersion == context)
+                   and td.translate(_(u'current'), context=self.request)
+                   or u'')
+        released = ((versionable.releasedVersion == context)
+                    and td.translate(_(u'released'), context=self.request)
+                    or u'')
         if not current and not released:
             return versionId
-        addInfo = ', '.join(e for e in (current, released) if e)
+        addInfo = u', '.join(e for e in (current, released) if e)
-        return '%s (%s)' % (versionId, addInfo)
+        return u'%s (%s)' % (versionId, addInfo)
 
     # controlling editing
 

browser/form_macros.pt

@@ -178,11 +178,11 @@
                   tal:define="versionInfo view/versionInfo"
                   tal:condition="versionInfo">
       <tr>
-        <td colspan="5" class="headline">Versioning</td>
+        <td colspan="5" i18n:translate="" class="headline">Versioning</td>
       </tr>
       <tr>
         <td colspan="2">
-          Version:
+          <span i18n:translate="">Version</span>:
           <span tal:content="versionInfo">1.1 (current, released)</span>
         </td>
         <td title="Select if you want to create a new version"
@@ -190,12 +190,12 @@
           <input type="checkbox"
                  name="version.create" id="version.create"
                  value="create" />
-          <label for="version.create">New version:</label>
+          <label for="version.create"><span i18n:translate="">New version</span>:</label>
         </td>
         <td colspan="2">
           <select name="version.level">
-              <option value="1">minor</option>
+              <option value="1" i18n:translate="">minor</option>
-              <option value="0">major</option>
+              <option value="0" i18n:translate="">major</option>
           </select>
         </td>
       </tr>

browser/resource_macros.pt

@@ -25,10 +25,13 @@
     <metal:render use-macro="item/template/macros/render" />
   </metal:block>
   <div class="content-1" id="1.link"
-       tal:define="linkUrl item/linkUrl">
+       tal:define="linkUrl item/linkUrl"
-    <a href="."
+       tal:condition="python: linkUrl and linkUrl != 'http://'">
-       tal:attributes="href linkUrl"
+    <b>
-       tal:condition="python: linkUrl and linkUrl != 'http://'">more...</a>
+      <a href="."
+         i18n:translate=""
+         tal:attributes="href linkUrl">more...</a>
+    </b>
   </div>
 </metal:block>
 
@@ -48,26 +51,30 @@
     <h3 tal:content="item/title">Title</h3>
     <p><i tal:content="item/description">Description</i></p>
     <p>
-      <a href="#"
+      <span class="button">
-         i18n:translate=""
+        <a href="#"
-         tal:attributes="href string:${view/url}/.target${view/targetId}/download.html">
+           i18n:translate=""
-        Download
+           tal:attributes="href string:${view/url}/.target${view/targetId}/download.html">
-      </a>
+          Download
-      <tal:view condition="item/viewable | nothing"> |
+        </a>
+      </span>
+      <span class="button"
+            tal:condition="item/viewable | nothing">
         <a href="#"
            i18n:translate=""
            tal:attributes="href string:${view/url}/.target${view/targetId}/view">
           View
         </a>
-      </tal:view>
+      </span>
-      <tal:xedit condition="item/xeditable"> |
+      <span class="button"
+            tal:condition="item/xeditable">
         <a href="#" title="Edit with External Editor"
            i18n:translate=""
            tal:define="url string:${view/url}/.target${view/targetId}"
            tal:attributes="href string:$url/external_edit?version=this">
          Open for editing
         </a>
-       </tal:xedit>
+       </span>
      </p>
   </div>
 </metal:block>

locales/de/LC_MESSAGES/loops.po

@@ -173,4 +173,25 @@ msgstr "Ansehen"
 msgid "Concept Assignments"
 msgstr "Zugeordnete Begriffe"
 
+msgid "more..."
+msgstr "Mehr..."
+
+msgid "Versioning"
+msgstr "Versionierung"
+
+msgid "current"
+msgstr "aktuell"
+
+msgid "released"
+msgstr "freigegeben"
+
+msgid "New version"
+msgstr "Neue Version"
+
+msgid "major"
+msgstr "major"
+
+msgid "minor"
+msgstr "minor"
+