[CMF-checkins] SVN: CMF/trunk/CMFDefault/ - fixed two i18n issues

Yvo Schubbe y.2006_ at wcm-solutions.de
Fri Feb 10 07:26:13 EST 2006 

Log message for revision 41590:
  - fixed two i18n issues
  - updated cmf_default.pot

Changed:
  U   CMF/trunk/CMFDefault/Document.py
  U   CMF/trunk/CMFDefault/locales/cmf_default.pot
  U   CMF/trunk/CMFDefault/skins/zpt_generic/logged_out.pt

-=-
Modified: CMF/trunk/CMFDefault/Document.py
===================================================================
--- CMF/trunk/CMFDefault/Document.py	2006-02-10 10:45:18 UTC (rev 41589)
+++ CMF/trunk/CMFDefault/Document.py	2006-02-10 12:26:12 UTC (rev 41590)
@@ -43,6 +43,7 @@
 from utils import bodyfinder
 from utils import formatRFC822Headers
 from utils import html_headcheck
+from utils import Message as _
 from utils import parseHeadersBody
 from utils import SimpleHTMLParser
 
@@ -104,11 +105,11 @@
         """ Edit the Document and cook the body.
         """
         if not self._safety_belt_update(safety_belt=safety_belt):
-            msg = ("Intervening changes from elsewhere detected."
-                   " Please refetch the document and reapply your changes."
-                   " (You may be able to recover your version using the"
-                   " browser 'back' button, but will have to apply them"
-                   " to a freshly fetched copy.)")
+            msg = _(u'Intervening changes from elsewhere detected. '
+                    u'Please refetch the document and reapply your changes. '
+                    u'(You may be able to recover your version using the '
+                    u"browser 'back' button, but will have to apply them to "
+                    u'a freshly fetched copy.)')
             raise EditingConflict(msg)
 
         self.text = text

Modified: CMF/trunk/CMFDefault/locales/cmf_default.pot
===================================================================
--- CMF/trunk/CMFDefault/locales/cmf_default.pot	2006-02-10 10:45:18 UTC (rev 41589)
+++ CMF/trunk/CMFDefault/locales/cmf_default.pot	2006-02-10 12:26:12 UTC (rev 41590)
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: CMF 2.0\n"
-"POT-Creation-Date: Sun Feb 05 22:53:33 2006\n"
+"POT-Creation-Date: Fri Feb 10 13:04:50 2006\n"
 "Language-Team: CMF Developers <zope-cmf at zope.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,10 @@
 msgid "The login name you selected is already in use or is not valid. Please choose another."
 msgstr ""
 
+#: CMFDefault/Document.py:108
+msgid "Intervening changes from elsewhere detected. Please refetch the document and reapply your changes. (You may be able to recover your version using the browser 'back' button, but will have to apply them to a freshly fetched copy.)"
+msgstr ""
+
 #: CMFDefault/RegistrationTool.py:118
 #: CMFDefault/RegistrationTool.py:152
 msgid "The username you entered could not be found."
@@ -34,6 +38,7 @@
 msgstr ""
 
 #: CMFDefault/RegistrationTool.py:161
+# Default: ""
 msgid "No email address is registered for member: ${member_id}"
 msgstr ""
 
@@ -342,7 +347,6 @@
 #: CMFDefault/skins/zpt_generic/index_html_utils.html:106
 #: CMFDefault/skins/zpt_generic/index_html_utils.html:106
 #: CMFDefault/skins/zpt_generic/join_template.pt:5
-#: CMFDefault/skins/zpt_generic/logged_out.pt:6
 #: CMFDefault/skins/zpt_generic/main_template.pt:71
 #: CMFDefault/skins/zpt_generic/main_template.pt:118
 #: CMFDefault/skins/zpt_generic/main_template.pt:157
@@ -415,9 +419,9 @@
 #: CMFDefault/skins/zpt_content/link_edit_form.py:24
 #: CMFDefault/skins/zpt_content/metadata_edit_form.py:46
 #: CMFDefault/skins/zpt_content/newsitem_edit_form.py:28
+#: CMFDefault/skins/zpt_generic/password_form.py:37
 #: CMFDefault/skins/zpt_generic/reconfig_form.py:22
 #: CMFTopic/skins/zpt_topic/topic_edit_form.py:26
-#: CMFDefault/skins/zpt_generic/password_form.pt:44
 #: CMFDefault/skins/zpt_generic/personalize_form.pt:92
 msgid "Change"
 msgstr ""
@@ -676,6 +680,10 @@
 msgid "Transition"
 msgstr ""
 
+#: CMFDefault/skins/zpt_control/change_password.py:21
+msgid "Password changed."
+msgstr ""
+
 #: CMFDefault/skins/zpt_control/finish_portal_construction.pt:12
 msgid "The first thing you should do is visit the ${reconfig_link}."
 msgstr ""
@@ -1081,6 +1089,7 @@
 #: CMFDefault/skins/zpt_generic/folder_rename_form.py:43
 #: CMFDefault/skins/zpt_generic/join_form.py:55
 #: CMFDefault/skins/zpt_generic/members_delete_form.py:28
+#: CMFDefault/skins/zpt_generic/password_form.py:39
 msgid "Cancel"
 msgstr ""
 
@@ -1151,6 +1160,7 @@
 
 #: CMFDefault/skins/zpt_generic/join_template.pt:59
 #: CMFDefault/skins/zpt_generic/login_form.pt:24
+#: CMFDefault/skins/zpt_generic/password_form_template.pt:26
 msgid "Member ID"
 msgstr ""
 
@@ -1171,54 +1181,27 @@
 msgid "Check this box to have the password mailed."
 msgstr ""
 
-#: CMFDefault/skins/zpt_generic/logged_in.pt:117
-msgid "Login success"
+#: CMFDefault/skins/zpt_generic/logged_in.py:24
+msgid "Login failure"
 msgstr ""
 
-#: CMFDefault/skins/zpt_generic/logged_in.pt:119
-msgid "Welcome. You are currently logged in."
+#: CMFDefault/skins/zpt_generic/logged_in.py:46
+msgid "Login success"
 msgstr ""
 
-#: CMFDefault/skins/zpt_generic/logged_in.pt:27
-msgid "Login failure"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/logged_in.pt:32
+#: CMFDefault/skins/zpt_generic/logged_in_template.pt:13
 msgid "You are not currently logged in. Your username and or password may be incorrect. Your browser may also not be configured to accept HTTP cookies. If you need help please contact ${admin_email}."
 msgstr ""
 
-#: CMFDefault/skins/zpt_generic/logged_in.pt:50
-msgid "Welcome!"
+#: CMFDefault/skins/zpt_generic/logged_in_template.pt:19
+msgid "Welcome. You are currently logged in."
 msgstr ""
 
-#: CMFDefault/skins/zpt_generic/logged_in.pt:54
-msgid "This is the first time that you've logged in to ${portal_title}. Before you start exploring you need to change your original password. This will ensure that the password we sent you via email cannot be used in a malicious manner."
+#: CMFDefault/skins/zpt_generic/logged_out.pt:5
+msgid "You have been logged out."
 msgstr ""
 
-#: CMFDefault/skins/zpt_generic/logged_in.pt:59
-msgid "Please use the form below to change your password."
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/logged_in.pt:74
-#: CMFDefault/skins/zpt_generic/password_form.pt:19
-msgid "Username"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/logged_in.pt:79
-#: CMFDefault/skins/zpt_generic/password_form.pt:24
-msgid "New password"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/logged_in.pt:84
-#: CMFDefault/skins/zpt_generic/password_form.pt:29
-msgid "Confirm new password"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/logged_in.pt:91
-msgid "Change password"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/logged_out.pt:9
+#: CMFDefault/skins/zpt_generic/logged_out.pt:7
 msgid "You are logged in outside the portal. You may need to <a href=\"/manage_zmi_logout\">log out of the Zope management interface</a>."
 msgstr ""
 
@@ -1430,18 +1413,38 @@
 msgid "News"
 msgstr ""
 
-#: CMFDefault/skins/zpt_generic/password_form.pt:34
+#: CMFDefault/skins/zpt_generic/password_form.py:29
+msgid "Welcome!"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/password_form.py:32
+msgid "Change your Password"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/password_form_template.pt:13
+msgid "This is the first time that you've logged in to ${portal_title}. Before you start exploring you need to change your original password. This will ensure that the password we sent you via email cannot be used in a malicious manner."
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/password_form_template.pt:19
+msgid "Please use the form below to change your password."
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/password_form_template.pt:30
+msgid "New password"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/password_form_template.pt:34
+msgid "Confirm new password"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/password_form_template.pt:38
 msgid "Domains"
 msgstr ""
 
-#: CMFDefault/skins/zpt_generic/password_form.pt:37
+#: CMFDefault/skins/zpt_generic/password_form_template.pt:42
 msgid "If you do not know what this field is for, leave it blank."
 msgstr ""
 
-#: CMFDefault/skins/zpt_generic/password_form.pt:9
-msgid "Change your Password"
-msgstr ""
-
 #: CMFDefault/skins/zpt_generic/personalize_form.pt:25
 msgid "Member Preferences"
 msgstr ""

Modified: CMF/trunk/CMFDefault/skins/zpt_generic/logged_out.pt
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/logged_out.pt	2006-02-10 10:45:18 UTC (rev 41589)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/logged_out.pt	2006-02-10 12:26:12 UTC (rev 41590)
@@ -1,15 +1,13 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+<html metal:use-macro="context/main_template/macros/master">
 <body>
-<div metal:fill-slot="main" i18n:domain="cmf_default">
-<p tal:condition="python: here.portal_membership.isAnonymousUser()"
-   tal:content="string:You have been logged out."
-   i18n:translate=""></p>
-<p tal:condition="python: not(here.portal_membership.isAnonymousUser())"
+
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
+<p tal:condition="python: context.portal_membership.isAnonymousUser()"
+   i18n:translate="">You have been logged out.</p>
+<p tal:condition="python: not(context.portal_membership.isAnonymousUser())"
    i18n:translate="">You are logged in outside the portal. You may need to
-<a href="/manage_zmi_logout">log out of the Zope management interface</a>.
-</p>
-</div>
+<a href="/manage_zmi_logout">log out of the Zope management interface</a>.</p>
+</metal:slot>
+
 </body>
 </html>

More information about the CMF-checkins mailing list