[CMF-checkins] SVN: CMF/trunk/CMF - use explicitly unicode for
message ids
Yvo Schubbe
y.2006_ at wcm-solutions.de
Thu Feb 9 10:45:48 EST 2006
Log message for revision 41585:
- use explicitly unicode for message ids
Changed:
U CMF/trunk/CMFCore/RegistrationTool.py
U CMF/trunk/CMFDefault/RegistrationTool.py
UU CMF/trunk/CMFDefault/skins/zpt_content/document_edit_control.py
UU CMF/trunk/CMFDefault/skins/zpt_content/file_edit_control.py
UU CMF/trunk/CMFDefault/skins/zpt_content/folder_edit_control.py
UU CMF/trunk/CMFDefault/skins/zpt_content/image_edit_control.py
UU CMF/trunk/CMFDefault/skins/zpt_content/link_edit_control.py
UU CMF/trunk/CMFDefault/skins/zpt_content/metadata_edit_control.py
UU CMF/trunk/CMFDefault/skins/zpt_content/newsitem_edit_control.py
UU CMF/trunk/CMFDefault/skins/zpt_control/folder_bottom_control.py
UU CMF/trunk/CMFDefault/skins/zpt_control/folder_copy_control.py
UU CMF/trunk/CMFDefault/skins/zpt_control/folder_cut_control.py
UU CMF/trunk/CMFDefault/skins/zpt_control/folder_delete_control.py
UU CMF/trunk/CMFDefault/skins/zpt_control/folder_down_control.py
UU CMF/trunk/CMFDefault/skins/zpt_control/folder_rename_control.py
UU CMF/trunk/CMFDefault/skins/zpt_control/folder_top_control.py
UU CMF/trunk/CMFDefault/skins/zpt_control/folder_up_control.py
UU CMF/trunk/CMFDefault/skins/zpt_control/members_add_control.py
UU CMF/trunk/CMFDefault/skins/zpt_control/members_delete_control.py
UU CMF/trunk/CMFDefault/skins/zpt_control/portal_config_control.py
UU CMF/trunk/CMFDefault/skins/zpt_control/validateId.py
UU CMF/trunk/CMFDefault/skins/zpt_control/validateItemIds.py
UU CMF/trunk/CMFDefault/skins/zpt_control/validateMemberIds.py
UU CMF/trunk/CMFDefault/skins/zpt_control/validateType.py
UU CMF/trunk/CMFDefault/skins/zpt_generic/breadcrumbs.py
UU CMF/trunk/CMFDefault/skins/zpt_generic/folder_rename_form.py
UU CMF/trunk/CMFDefault/skins/zpt_generic/join_form.py
UU CMF/trunk/CMFDefault/skins/zpt_generic/members_delete_form.py
UU CMF/trunk/CMFDefault/skins/zpt_generic/members_manage_form.py
-=-
Modified: CMF/trunk/CMFCore/RegistrationTool.py
===================================================================
--- CMF/trunk/CMFCore/RegistrationTool.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFCore/RegistrationTool.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -141,8 +141,8 @@
detected before the fact so that a cleaner message can be printed.
'''
if not self.isMemberIdAllowed(id):
- raise ValueError(_('The login name you selected is already in '
- 'use or is not valid. Please choose another.'))
+ raise ValueError(_(u'The login name you selected is already in '
+ u'use or is not valid. Please choose another.'))
failMessage = self.testPasswordValidity(password)
if failMessage is not None:
Modified: CMF/trunk/CMFDefault/RegistrationTool.py
===================================================================
--- CMF/trunk/CMFDefault/RegistrationTool.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/RegistrationTool.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -51,14 +51,14 @@
o If not, return a string explaining why.
"""
if not password:
- return _('You must enter a password.')
+ return _(u'You must enter a password.')
if len(password) < 5 and not _checkPermission(ManagePortal, self):
- return _('Your password must contain at least 5 characters.')
+ return _(u'Your password must contain at least 5 characters.')
if confirm is not None and confirm != password:
- return _('Your password and confirmation did not match. '
- 'Please try again.')
+ return _(u'Your password and confirmation did not match. '
+ u'Please try again.')
return None
@@ -74,19 +74,19 @@
username = props.get('username', '')
if not username:
- return _('You must enter a valid name.')
+ return _(u'You must enter a valid name.')
if not self.isMemberIdAllowed(username):
- return _('The login name you selected is already in use or '
- 'is not valid. Please choose another.')
+ return _(u'The login name you selected is already in use or '
+ u'is not valid. Please choose another.')
email = props.get('email')
if email is None:
- return _('You must enter an email address.')
+ return _(u'You must enter an email address.')
ok, message = _checkEmail( email )
if not ok:
- return _('You must enter a valid email address.')
+ return _(u'You must enter a valid email address.')
else: # Existing member.
email = props.get('email')
@@ -95,13 +95,13 @@
ok, message = _checkEmail( email )
if not ok:
- return _('You must enter a valid email address.')
+ return _(u'You must enter a valid email address.')
# Not allowed to clear an existing non-empty email.
existing = member.getProperty('email')
if existing and email == '':
- return _('You must enter a valid email address.')
+ return _(u'You must enter a valid email address.')
return None
@@ -115,13 +115,13 @@
member = membership.getMemberById(forgotten_userid)
if member is None:
- raise ValueError(_('The username you entered could not be '
- 'found.'))
+ raise ValueError(_(u'The username you entered could not be '
+ u'found.'))
# assert that we can actually get an email address, otherwise
# the template will be made with a blank To:, this is bad
if not member.getProperty('email'):
- raise ValueError(_('That user does not have an email address.'))
+ raise ValueError(_(u'That user does not have an email address.'))
check, msg = _checkEmail(member.getProperty('email'))
if not check:
@@ -149,8 +149,8 @@
member = membership.getMemberById( new_member_id )
if member is None:
- raise ValueError(_('The username you entered could not be '
- 'found.'))
+ raise ValueError(_(u'The username you entered could not be '
+ u'found.'))
if password is None:
password = member.getPassword()
@@ -158,8 +158,8 @@
email = member.getProperty( 'email' )
if email is None:
- msg = _('No email address is registered for member: ${member_id}')
- msg.mapping = {'member_id': new_member_id}
+ msg = _(u'No email address is registered for member: '
+ u'${member_id}', mapping={'member_id': new_member_id})
raise ValueError(msg)
check, msg = _checkEmail(email)
Modified: CMF/trunk/CMFDefault/skins/zpt_content/document_edit_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/document_edit_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_content/document_edit_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -7,8 +7,8 @@
if text_format != context.text_format or text != context.text:
try:
context.edit(text_format, text, safety_belt=SafetyBelt)
- return context.setStatus(True, _('Document changed.'))
+ return context.setStatus(True, _(u'Document changed.'))
except (ResourceLockedError, EditingConflict), errmsg:
return context.setStatus(False, errmsg)
else:
- return context.setStatus(False, _('Nothing to change.'))
+ return context.setStatus(False, _(u'Nothing to change.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_content/document_edit_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_content/file_edit_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/file_edit_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_content/file_edit_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -5,6 +5,6 @@
try:
context.edit(file=file)
- return context.setStatus(True, _('File changed.'))
+ return context.setStatus(True, _(u'File changed.'))
except ResourceLockedError, errmsg:
return context.setStatus(False, errmsg)
Property changes on: CMF/trunk/CMFDefault/skins/zpt_content/file_edit_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_content/folder_edit_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/folder_edit_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_content/folder_edit_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -4,6 +4,6 @@
if title!=context.title or description != context.description:
context.edit(title=title, description=description)
- return context.setStatus(True, _('Folder changed.'))
+ return context.setStatus(True, _(u'Folder changed.'))
else:
- return context.setStatus(False, _('Nothing to change.'))
+ return context.setStatus(False, _(u'Nothing to change.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_content/folder_edit_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_content/image_edit_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/image_edit_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_content/image_edit_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -5,6 +5,6 @@
try:
context.edit(file=file)
- return context.setStatus(True, _('Image changed.'))
+ return context.setStatus(True, _(u'Image changed.'))
except ResourceLockedError, errmsg:
return context.setStatus(False, errmsg)
Property changes on: CMF/trunk/CMFDefault/skins/zpt_content/image_edit_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_content/link_edit_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/link_edit_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_content/link_edit_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -6,8 +6,8 @@
if remote_url != context.remote_url:
try:
context.edit(remote_url=remote_url)
- return context.setStatus(True, _('Link changed.'))
+ return context.setStatus(True, _(u'Link changed.'))
except ResourceLockedError, errmsg:
return context.setStatus(False, errmsg)
else:
- return context.setStatus(False, _('Nothing to change.'))
+ return context.setStatus(False, _(u'Nothing to change.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_content/link_edit_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_content/metadata_edit_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/metadata_edit_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_content/metadata_edit_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -64,6 +64,6 @@
, language=language
, rights=rights
)
- return context.setStatus(True, _('Metadata changed.'))
+ return context.setStatus(True, _(u'Metadata changed.'))
except ResourceLockedError, errmsg:
return context.setStatus(False, errmsg)
Property changes on: CMF/trunk/CMFDefault/skins/zpt_content/metadata_edit_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_content/newsitem_edit_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/newsitem_edit_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_content/newsitem_edit_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -8,8 +8,8 @@
try:
context.edit(text=text, description=description,
text_format=text_format)
- return context.setStatus(True, _('News Item changed.'))
+ return context.setStatus(True, _(u'News Item changed.'))
except ResourceLockedError, errmsg:
return context.setStatus(False, errmsg)
else:
- return context.setStatus(False, _('Nothing to change.'))
+ return context.setStatus(False, _(u'Nothing to change.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_content/newsitem_edit_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_bottom_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_bottom_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_bottom_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -6,10 +6,10 @@
try:
attempt = context.moveObjectsToBottom(ids, subset_ids=subset_ids)
if attempt == 1:
- return context.setStatus(True, _('Item moved to bottom.'))
+ return context.setStatus(True, _(u'Item moved to bottom.'))
elif attempt > 1:
- return context.setStatus(True, _('Items moved to bottom.'))
+ return context.setStatus(True, _(u'Items moved to bottom.'))
else:
- return context.setStatus(False, _('Nothing to change.'))
+ return context.setStatus(False, _(u'Nothing to change.'))
except ValueError:
- return context.setStatus(False, _('ValueError: Move failed.'))
+ return context.setStatus(False, _(u'ValueError: Move failed.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/folder_bottom_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_copy_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_copy_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_copy_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -7,8 +7,8 @@
try:
context.manage_copyObjects(ids, context.REQUEST)
if len(ids) == 1:
- return context.setStatus(True, _('Item copied.'))
+ return context.setStatus(True, _(u'Item copied.'))
else:
- return context.setStatus(True, _('Items copied.'))
+ return context.setStatus(True, _(u'Items copied.'))
except CopyError:
- return context.setStatus(False, _('CopyError: Copy failed.'))
+ return context.setStatus(False, _(u'CopyError: Copy failed.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/folder_copy_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_cut_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_cut_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_cut_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -8,10 +8,10 @@
try:
context.manage_cutObjects(ids, context.REQUEST)
if len(ids) == 1:
- return context.setStatus(True, _('Item cut.'))
+ return context.setStatus(True, _(u'Item cut.'))
else:
- return context.setStatus(True, _('Items cut.'))
+ return context.setStatus(True, _(u'Items cut.'))
except CopyError:
- return context.setStatus(False, _('CopyError: Cut failed.'))
+ return context.setStatus(False, _(u'CopyError: Cut failed.'))
except zExceptions_Unauthorized:
- return context.setStatus(False, _('Unauthorized: Cut failed.'))
+ return context.setStatus(False, _(u'Unauthorized: Cut failed.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/folder_cut_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_delete_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_delete_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_delete_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -6,6 +6,6 @@
context.manage_delObjects( list(ids) )
if len(ids) == 1:
- return context.setStatus(True, _('Item deleted.'))
+ return context.setStatus(True, _(u'Item deleted.'))
else:
- return context.setStatus(True, _('Items deleted.'))
+ return context.setStatus(True, _(u'Items deleted.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/folder_delete_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_down_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_down_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_down_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -6,10 +6,10 @@
try:
attempt = context.moveObjectsDown(ids, delta, subset_ids=subset_ids)
if attempt == 1:
- return context.setStatus(True, _('Item moved down.'))
+ return context.setStatus(True, _(u'Item moved down.'))
elif attempt > 1:
- return context.setStatus(True, _('Items moved down.'))
+ return context.setStatus(True, _(u'Items moved down.'))
else:
- return context.setStatus(False, _('Nothing to change.'))
+ return context.setStatus(False, _(u'Nothing to change.'))
except ValueError:
- return context.setStatus(False, _('ValueError: Move failed.'))
+ return context.setStatus(False, _(u'ValueError: Move failed.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/folder_down_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_rename_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_rename_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_rename_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -8,10 +8,10 @@
try:
context.manage_renameObjects(ids, new_ids)
if len(ids) == 1:
- return context.setStatus(True, _('Item renamed.'))
+ return context.setStatus(True, _(u'Item renamed.'))
else:
- return context.setStatus(True, _('Items renamed.'))
+ return context.setStatus(True, _(u'Items renamed.'))
except CopyError:
- return context.setStatus(False, _('CopyError: Rename failed.'))
+ return context.setStatus(False, _(u'CopyError: Rename failed.'))
else:
- return context.setStatus(False, _('Nothing to change.'))
+ return context.setStatus(False, _(u'Nothing to change.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/folder_rename_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_top_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_top_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_top_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -6,10 +6,10 @@
try:
attempt = context.moveObjectsToTop(ids, subset_ids=subset_ids)
if attempt == 1:
- return context.setStatus(True, _('Item moved to top.'))
+ return context.setStatus(True, _(u'Item moved to top.'))
elif attempt > 1:
- return context.setStatus(True, _('Items moved to top.'))
+ return context.setStatus(True, _(u'Items moved to top.'))
else:
- return context.setStatus(False, _('Nothing to change.'))
+ return context.setStatus(False, _(u'Nothing to change.'))
except ValueError:
- return context.setStatus(False, _('ValueError: Move failed.'))
+ return context.setStatus(False, _(u'ValueError: Move failed.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/folder_top_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_up_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_up_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_up_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -6,10 +6,10 @@
try:
attempt = context.moveObjectsUp(ids, delta, subset_ids=subset_ids)
if attempt == 1:
- return context.setStatus(True, _('Item moved up.'))
+ return context.setStatus(True, _(u'Item moved up.'))
elif attempt > 1:
- return context.setStatus(True, _('Items moved up.'))
+ return context.setStatus(True, _(u'Items moved up.'))
else:
- return context.setStatus(False, _('Nothing to change.'))
+ return context.setStatus(False, _(u'Nothing to change.'))
except ValueError:
- return context.setStatus(False, _('ValueError: Move failed.'))
+ return context.setStatus(False, _(u'ValueError: Move failed.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/folder_up_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/members_add_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/members_add_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/members_add_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -19,6 +19,6 @@
if ptool.getProperty('validate_email') or send_password:
rtool.registeredNotify(member_id)
if mtool.checkPermission(ManageUsers, mtool):
- return context.setStatus(True, _('Member registered.'))
+ return context.setStatus(True, _(u'Member registered.'))
else:
- return context.setStatus(False, _('Success!'))
+ return context.setStatus(False, _(u'Success!'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/members_add_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/members_delete_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/members_delete_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/members_delete_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -9,6 +9,6 @@
mtool.deleteMembers(ids)
if len(ids) == 1:
- return context.setStatus(True, _('Selected member deleted.'))
+ return context.setStatus(True, _(u'Selected member deleted.'))
else:
- return context.setStatus(True, _('Selected members deleted.'))
+ return context.setStatus(True, _(u'Selected members deleted.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/members_delete_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/portal_config_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/portal_config_control.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/portal_config_control.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -9,4 +9,4 @@
ptool.manage_addProperty('default_charset', '', 'string')
ptool.editProperties(kw)
-return context.setStatus(True, _('CMF Settings changed.'))
+return context.setStatus(True, _(u'CMF Settings changed.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/portal_config_control.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/validateId.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/validateId.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/validateId.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -6,6 +6,6 @@
if context.checkIdAvailable(id):
return context.setStatus(True)
else:
- return context.setStatus(False, _('Please choose another ID.'))
+ return context.setStatus(False, _(u'Please choose another ID.'))
else:
- return context.setStatus(False, _('Please enter an ID.'))
+ return context.setStatus(False, _(u'Please enter an ID.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/validateId.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/validateItemIds.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/validateItemIds.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/validateItemIds.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -5,5 +5,5 @@
if ids:
return context.setStatus(True)
else:
- return context.setStatus(False, _('Please select one or more items '
- 'first.'))
+ return context.setStatus(False, _(u'Please select one or more items '
+ u'first.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/validateItemIds.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/validateMemberIds.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/validateMemberIds.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/validateMemberIds.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -5,5 +5,5 @@
if ids:
return context.setStatus(True)
else:
- return context.setStatus(False, _('Please select one or more members '
- 'first.'))
+ return context.setStatus(False, _(u'Please select one or more members '
+ u'first.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/validateMemberIds.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/validateType.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/validateType.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_control/validateType.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -5,4 +5,4 @@
if type_name:
return context.setStatus(True)
else:
- return context.setStatus(False, _('Please select a content type.'))
+ return context.setStatus(False, _(u'Please select a content type.'))
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/validateType.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_generic/breadcrumbs.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/breadcrumbs.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/breadcrumbs.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -10,7 +10,7 @@
result = []
if include_root:
- result.append( { 'id' : _('root')
+ result.append( { 'id' : _(u'root')
, 'title' : ptool.title()
, 'url' : portal_url
}
Property changes on: CMF/trunk/CMFDefault/skins/zpt_generic/breadcrumbs.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_generic/folder_rename_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/folder_rename_form.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/folder_rename_form.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -39,8 +39,8 @@
for name, value in html_marshal(**default_kw):
hidden_vars.append( {'name': name, 'value': value} )
buttons = []
-buttons.append( {'name': 'rename', 'value': _('Rename')} )
-buttons.append( {'name': 'cancel', 'value': _('Cancel')} )
+buttons.append( {'name': 'rename', 'value': _(u'Rename')} )
+buttons.append( {'name': 'cancel', 'value': _(u'Cancel')} )
options['form'] = { 'action': target,
'listHiddenVarInfos': tuple(hidden_vars),
'listButtonInfos': tuple(buttons) }
Property changes on: CMF/trunk/CMFDefault/skins/zpt_generic/folder_rename_form.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_generic/join_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/join_form.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/join_form.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -28,12 +28,12 @@
options = {}
-if context.REQUEST.get('portal_status_message', '') == _('Success!'):
+if context.REQUEST.get('portal_status_message', '') == _(u'Success!'):
is_anon = False
is_newmember = True
-options['title'] = is_usermanager and _('Register Member') \
- or _('Become a Member')
+options['title'] = is_usermanager and _(u'Register Member') \
+ or _(u'Become a Member')
options['member_id'] = member_id
options['member_email'] = member_email
options['password'] = is_newmember and context.REQUEST.get('password', '') or ''
@@ -48,11 +48,11 @@
buttons = []
if is_newmember:
target = atool.getActionInfo('user/logged_in')['url']
- buttons.append( {'name': 'login', 'value': _('Log in')} )
+ buttons.append( {'name': 'login', 'value': _(u'Log in')} )
else:
target = atool.getActionInfo('user/join')['url']
- buttons.append( {'name': 'add', 'value': _('Register')} )
- buttons.append( {'name': 'cancel', 'value': _('Cancel')} )
+ buttons.append( {'name': 'add', 'value': _(u'Register')} )
+ buttons.append( {'name': 'cancel', 'value': _(u'Cancel')} )
options['form'] = { 'action': target,
'listButtonInfos': tuple(buttons) }
Property changes on: CMF/trunk/CMFDefault/skins/zpt_generic/join_form.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_generic/members_delete_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/members_delete_form.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/members_delete_form.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -24,8 +24,8 @@
for name, value in html_marshal(b_start=b_start, ids=ids):
hidden_vars.append( {'name': name, 'value': value} )
buttons = []
-buttons.append( {'name': 'delete', 'value': _('Delete')} )
-buttons.append( {'name': 'cancel', 'value': _('Cancel')} )
+buttons.append( {'name': 'delete', 'value': _(u'Delete')} )
+buttons.append( {'name': 'cancel', 'value': _(u'Cancel')} )
options['form'] = { 'action': target,
'members': ', '.join(ids),
'listHiddenVarInfos': tuple(hidden_vars),
Property changes on: CMF/trunk/CMFDefault/skins/zpt_generic/members_delete_form.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_generic/members_manage_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/members_manage_form.py 2006-02-08 22:25:28 UTC (rev 41584)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/members_manage_form.py 2006-02-09 15:45:46 UTC (rev 41585)
@@ -46,9 +46,9 @@
for name, value in html_marshal(b_start=b_start):
hidden_vars.append( {'name': name, 'value': value} )
buttons = []
-buttons.append( {'name': 'members_new', 'value': _('New...')} )
+buttons.append( {'name': 'members_new', 'value': _(u'New...')} )
if items:
- buttons.append( {'name': 'members_delete', 'value': _('Delete...')} )
+ buttons.append( {'name': 'members_delete', 'value': _(u'Delete...')} )
options['form'] = { 'action': target,
'listHiddenVarInfos': tuple(hidden_vars),
'listButtonInfos': tuple(buttons) }
Property changes on: CMF/trunk/CMFDefault/skins/zpt_generic/members_manage_form.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
More information about the CMF-checkins
mailing list