[Zope3-checkins] CVS: Zope3/src/zope/app/browser/cache - cacheable.py:1.9 cacheableedit.pt:1.7 ramedit.pt:1.6 ramstats.pt:1.6

[Philipp von Weitershausen]

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

Modified Files:
	cacheable.py cacheableedit.pt ramedit.pt ramstats.pt 
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/cache/cacheable.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/browser/cache/cacheable.py:1.8	Tue Aug 19 13:33:56 2003
+++ Zope3/src/zope/app/browser/cache/cacheable.py	Wed Aug 20 14:21:02 2003
@@ -54,9 +54,10 @@
         location = getLocationForCache(self.context)
         if cache and location:
             cache.invalidate(location)
-            return self.form(message=_(u"Invalidated."))
+            return self.form(message=_("cache-invalidated", u"Invalidated."))
         else:
-            return self.form(message=_(u"No cache associated with object."))
+            return self.form(message=_("no-cache-associated",
+                                       u"No cache associated with object."))
 
     def action(self):
         "Change the cacheId"


=== Zope3/src/zope/app/browser/cache/cacheableedit.pt 1.6 => 1.7 ===
--- Zope3/src/zope/app/browser/cache/cacheableedit.pt:1.6	Fri Aug  8 16:58:31 2003
+++ Zope3/src/zope/app/browser/cache/cacheableedit.pt	Wed Aug 20 14:21:02 2003
@@ -20,7 +20,7 @@
 
     <div tal:condition="python: options.has_key('errors') and
                                 options['errors']">
-      <span style="font-weight: bold" i18n:translate="">Errors:</span>
+      <span style="font-weight: bold" i18n:translate="">Errors</span>:
       <div tal:repeat="error options/errors | nothing">
         <span tal:replace="python: error[0].title" />:
         <span tal:replace="python: error[1].error_name" />


=== Zope3/src/zope/app/browser/cache/ramedit.pt 1.5 => 1.6 ===
--- Zope3/src/zope/app/browser/cache/ramedit.pt:1.5	Wed Aug  6 10:41:24 2003
+++ Zope3/src/zope/app/browser/cache/ramedit.pt	Wed Aug 20 14:21:02 2003
@@ -6,7 +6,7 @@
 
   <div tal:condition="python: options.has_key('errors') and
                               options['errors']">
-    <span style="font-weight: bold" i18n:translate="">Errors:</span>
+    <span style="font-weight: bold" i18n:translate="">Errors</span>:
     <div tal:repeat="error options/errors | nothing">
       <span tal:replace="python: error[0].title" />:
       <span tal:replace="python: error[1].error_name" />


=== Zope3/src/zope/app/browser/cache/ramstats.pt 1.5 => 1.6 ===
--- Zope3/src/zope/app/browser/cache/ramstats.pt:1.5	Wed Aug  6 10:41:24 2003
+++ Zope3/src/zope/app/browser/cache/ramstats.pt	Wed Aug 20 14:21:02 2003
@@ -6,7 +6,7 @@
 
   <div tal:condition="python: options.has_key('errors') and
                               options['errors']">
-    <span style="font-weight: bold" i18n:translate="">Errors:</span>
+    <span style="font-weight: bold" i18n:translate="">Errors</span>:
     <div tal:repeat="error options/errors | nothing">
       <span tal:replace="python: error[0].title" />:
       <span tal:replace="python: error[1].error_name" />