From 18f641e6b1c1b016fd4a5328bdb3eaab79cd2309 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Thu, 24 May 2007 15:02:58 +0000
Subject: [PATCH] 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               |  14 ++++++++++----
 browser/form_macros.pt          |  10 +++++-----
 browser/resource_macros.pt      |  33 +++++++++++++++++++-------------
 locales/de/LC_MESSAGES/loops.mo | Bin 3004 -> 3283 bytes
 locales/de/LC_MESSAGES/loops.po |  21 ++++++++++++++++++++
 5 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/browser/common.py b/browser/common.py
index b1985bb..dd8a2e5 100644
--- a/browser/common.py
+++ b/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 ''
-        released = (versionable.releasedVersion == context) and 'released' or ''
+        td = component.getUtility(ITranslationDomain, _._domain)
+        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)
-        return '%s (%s)' % (versionId, addInfo)
+        addInfo = u', '.join(e for e in (current, released) if e)
+        return u'%s (%s)' % (versionId, addInfo)
 
     # controlling editing
 
diff --git a/browser/form_macros.pt b/browser/form_macros.pt
index 28f25a8..1a1a65c 100644
--- a/browser/form_macros.pt
+++ b/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="0">major</option>
+              <option value="1" i18n:translate="">minor</option>
+              <option value="0" i18n:translate="">major</option>
           </select>
         </td>
       </tr>
diff --git a/browser/resource_macros.pt b/browser/resource_macros.pt
index 62e19cd..096280a 100644
--- a/browser/resource_macros.pt
+++ b/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">
-    <a href="."
-       tal:attributes="href linkUrl"
-       tal:condition="python: linkUrl and linkUrl != 'http://'">more...</a>
+       tal:define="linkUrl item/linkUrl"
+       tal:condition="python: linkUrl and linkUrl != 'http://'">
+    <b>
+      <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="#"
-         i18n:translate=""
-         tal:attributes="href string:${view/url}/.target${view/targetId}/download.html">
-        Download
-      </a>
-      <tal:view condition="item/viewable | nothing"> |
+      <span class="button">
+        <a href="#"
+           i18n:translate=""
+           tal:attributes="href string:${view/url}/.target${view/targetId}/download.html">
+          Download
+        </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>
-      <tal:xedit condition="item/xeditable"> |
+      </span>
+      <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>
diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo
index e6073c419f0223eb1e47eb57d567acd9f6534339..1eda2ec4f67d2433a867fa992279e810fb8f114a 100644
GIT binary patch
delta 1557
zcmY+^U5HF!9LMqh*jdXg*6w;+uVcNe*RkGNFExoMLbP!sv+J=ljG3I7v9x7f5k*O8
zTeg&vBx<76-mDdOE-2(eij*62g<9qNn|*|*^FN>GJm;MM^PK-VGri+q)^)zC312qa
zdSWs$Vu;x;94KQ)+gxr|fm?6{?nIs1hn3jk$1_;XaR&~^^Eec*;xOz%<++8mcn@pL
zI<23M62HO;_+jvb4Pcn#Dza#zF{p%5c1qZQqp=Z3V%#5ZN8Ps{wGfB8K8sr5aa6u@
z7-oLELT45O-Kd0psFl7z)?jZ@6TC+y`huF^JF?jTyHQxiO-fvYlW;2Pd=u(?9OvN<
z<jJiA!_03N=xCx#8o(~pN_+hHeeXkmz8A-Gz7JKo*BHT%s0DsS<@teZ_KThJmvd59
zqQ<MSQwi$mu-R;Ot3qar{Be@{Y2`;z=TD(leiro(uX*nyn?3P9M^)?%YNAg#2EU*x
zRK{vmnW_l&ucI@L0bS7OPi#ajY%40kUR1&aj>9bK`qMZbyHQV8L@o3Y>LY!ORrnN3
z-x%t;4>%t`N2tFNj%8W8U;%2v)u<<pBa61(-hHT*CsCEjq9#0vdL?I&&91Z4{kL%~
z_M#s2Cn|p}lPS+6)n5bks2k>?R=Cc)0rezXP#@Jc)Dxvp6*+-g;2Bh&i{36&o*Uj<
ze*7-#+j@Yk#X6tS;gy%#a<9;;)l}X&rQYDzJA=MHu9bxTFJ=)_2>pMkH4u8zB|4z3
zA!5WL9ne%YHT~4*>i0jD&SFA8y_tkwN0j)}v|7DuH9fh?rZ$aOUFr>f{R@4c|1X<J
zEF-29rE;UHq$gHYR8duPq-|$UqX?z<*MuvGMnbP+0kM>rP1F<rwpIRMzIPoCE8Y!n
z3PoId^q32BscfeBt-LuDPi5Myd2k?S%_-Mzt%V?PnY<lI9LffEB$d%V8@O03W|?e0
znsaH_ns)~*pp(cI_f*^&Qt1jV>eCcMk)F`5lnV-fQ@f1CGdY*U#Nm9wrPKeV-{z7*
eDSfInnU5w4xi;6{e>0iR+rhx4+FYA!;m+SHAfBNB

delta 1279
zcmYM!OK1~O6vpwBn8Y+zYg098H5%XA)>hkEMT=NLAuYI3q+r2E9ZVraB$0?HS&3cv
z*!U=DHzI=Cg&IVJ?gR~jE2Uj1DySP5Dup6+qyI0x(o4?#?%X?b?qg>1u6`_5{1gq`
zFv>P!8S&m{mcq+(I8Yu3%;w?~ti~6pu2(n@-?;X1tmXVGR^b$e@Gpij6r9OZgLRz8
zFltt`CMrt23**>3(_tr&d#!*P=sYUn5Gvs{T!_OsA0N2$=cxP2sENEqT|a@E;1}0F
ziEA0({!me(1lhIH7Np5KQHi@y33^b84<JA5<FEjapeC5brFahc*-Z}WAHhZ(MOJJR
zs60O~$oTflHB6yqIIRw>W;Qa4x*?8>F@f5#cGSdnyZ)4G-;djQjE7zSbuOw*1a<u=
z2TkM|7WFL3ROCn0mi=~4qjn%bBe^V!i?9K;;#Op?wiD}dkL&Mu?Wa)_J&U^kA}Ze%
zT!Oc&*ncH_N<$1^qgMPG8QZ?2UbdfDgOje`A2Dm<Jd8@zff}e6HBcXFg-4NFEa$v{
zn(!smj$Dnf{~Bn725s$q)XK(C3Ch@oA5bfd)2RX4P>FW9^KR7jDbxb`oySoNNTc43
z3~C`msEG|1sVL!H)U$txJi5y2G(ZcXvXy8f^qIOZliF-q<EmQ3CRbnX^rOa5(Qf}Q
z+VP?WRnhE{L<7-GsA#4tTG47^BcU%vJJCt7DV0@gCHn7JM{Fik^jKC9TL`_p>xq?w
zc3WG&ibyDpUI;zA4nn1!XeHPPzR%gB|Aq}jBT-k{8{FqB-3lG_)#mKbpjWW$seCf$
rWxRoWsX6?}U-}lg<4bs1>(1u9G-d|}()r}EGr5yq;pM$_CU5@$FL7wW

diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po
index 4b55877..67dbac5 100644
--- a/locales/de/LC_MESSAGES/loops.po
+++ b/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"
+