[CMF-checkins] SVN: CMF/trunk/CMFDefault/ - more i18n fixes
Yvo Schubbe
y.2006_ at wcm-solutions.de
Fri May 5 10:14:41 EDT 2006
Log message for revision 67992:
- more i18n fixes
- related cleanup
Changed:
U CMF/trunk/CMFDefault/locales/cmf_default-manual.pot
U CMF/trunk/CMFDefault/locales/cmf_default.pot
UU CMF/trunk/CMFDefault/skins/zpt_content/content_status_modify.py
UU CMF/trunk/CMFDefault/skins/zpt_control/folder_localrole_edit.py
UU CMF/trunk/CMFDefault/skins/zpt_control/undo.py
UU CMF/trunk/CMFDefault/skins/zpt_generic/discitem_delete.py
U CMF/trunk/CMFDefault/skins/zpt_generic/discussion_reply.py
-=-
Modified: CMF/trunk/CMFDefault/locales/cmf_default-manual.pot
===================================================================
--- CMF/trunk/CMFDefault/locales/cmf_default-manual.pot 2006-05-05 14:14:10 UTC (rev 67991)
+++ CMF/trunk/CMFDefault/locales/cmf_default-manual.pot 2006-05-05 14:14:40 UTC (rev 67992)
@@ -13,17 +13,26 @@
msgid "Previous member"
msgstr ""
-msgid "View"
+msgid "Criteria"
msgstr ""
+msgid "Download"
+msgstr ""
+
msgid "Local Roles"
msgstr ""
+msgid "Metadata"
+msgstr ""
+
+msgid "Subtopics"
+msgstr ""
+
+msgid "View"
+msgstr ""
+
msgid "Retract"
msgstr ""
msgid "Submit"
msgstr ""
-
-msgid "Transaction(s) undone"
-msgstr ""
Modified: CMF/trunk/CMFDefault/locales/cmf_default.pot
===================================================================
--- CMF/trunk/CMFDefault/locales/cmf_default.pot 2006-05-05 14:14:10 UTC (rev 67991)
+++ CMF/trunk/CMFDefault/locales/cmf_default.pot 2006-05-05 14:14:40 UTC (rev 67992)
@@ -934,6 +934,10 @@
msgid "Content Item status history"
msgstr ""
+#: CMFDefault/skins/zpt_content/content_status_modify.py:11
+msgid "Status changed."
+msgstr ""
+
#: CMFDefault/skins/zpt_content/content_submit_form.pt:10
msgid "To make an item published, it has to be reviewed by one of the site's reviewers. A <b>published</b> item is available to the general member base and anonymous visitors."
msgstr ""
@@ -1039,6 +1043,10 @@
msgid "Welcome to the CMF!"
msgstr ""
+#: CMFDefault/skins/zpt_control/folder_localrole_edit.py:17
+msgid "Local Roles changed."
+msgstr ""
+
#: CMFDefault/skins/zpt_control/folder_rename_control.py:11
msgid "Item renamed."
msgstr ""
@@ -1071,6 +1079,10 @@
msgid "CMF Settings changed."
msgstr ""
+#: CMFDefault/skins/zpt_control/undo.py:11
+msgid "Transaction(s) undone."
+msgstr ""
+
#: CMFDefault/skins/zpt_control/validateId.py:11
msgid "Please enter an ID."
msgstr ""
@@ -1109,6 +1121,14 @@
msgid "Created by"
msgstr ""
+#: CMFDefault/skins/zpt_generic/discitem_delete.py:13
+msgid "Reply deleted."
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/discussion_reply.py:13
+msgid "Reply added."
+msgstr ""
+
#: CMFDefault/skins/zpt_generic/discussion_reply_form.py:39
#: CMFDefault/skins/zpt_generic/folder_factories_template.pt:34
msgid "Add"
@@ -2074,17 +2094,26 @@
msgid "Previous member"
msgstr ""
-msgid "View"
+msgid "Criteria"
msgstr ""
+msgid "Download"
+msgstr ""
+
msgid "Local Roles"
msgstr ""
+msgid "Metadata"
+msgstr ""
+
+msgid "Subtopics"
+msgstr ""
+
+msgid "View"
+msgstr ""
+
msgid "Retract"
msgstr ""
msgid "Submit"
msgstr ""
-
-msgid "Transaction(s) undone"
-msgstr ""
Modified: CMF/trunk/CMFDefault/skins/zpt_content/content_status_modify.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/content_status_modify.py 2006-05-05 14:14:10 UTC (rev 67991)
+++ CMF/trunk/CMFDefault/skins/zpt_content/content_status_modify.py 2006-05-05 14:14:40 UTC (rev 67992)
@@ -1,18 +1,12 @@
-## Script (Python) "content_status_modify"
##parameters=workflow_action, comment=''
##title=Modify the status of a content object
-
-context.portal_workflow.doActionFor(
- context,
- workflow_action,
- comment=comment)
+##
+from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.utils import Message as _
-if workflow_action == 'reject':
- redirect_url = context.portal_url() + '/search?review_state=pending'
-else:
- redirect_url = '%s/view?%s' % ( context.absolute_url()
- , 'portal_status_message=Status+changed.'
- )
+wtool = getToolByName(script, 'portal_workflow')
-context.REQUEST[ 'RESPONSE' ].redirect( redirect_url )
+wtool.doActionFor(context, workflow_action, comment=comment)
+context.setStatus(True, _(u'Status changed.'))
+context.setRedirect(context, 'object/view')
Property changes on: CMF/trunk/CMFDefault/skins/zpt_content/content_status_modify.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_localrole_edit.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_localrole_edit.py 2006-05-05 14:14:10 UTC (rev 67991)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_localrole_edit.py 2006-05-05 14:14:40 UTC (rev 67992)
@@ -1,18 +1,18 @@
##parameters=change_type
##title=Set local roles
##
-pm = context.portal_membership
+from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.utils import Message as _
+mtool = getToolByName(script, 'portal_membership')
+
if change_type == 'add':
- pm.setLocalRoles( obj=context
- , member_ids=context.REQUEST.get('member_ids', ())
- , member_role=context.REQUEST.get('member_role', '')
- )
+ mtool.setLocalRoles(obj=context,
+ member_ids=context.REQUEST.get('member_ids', ()),
+ member_role=context.REQUEST.get('member_role', ''))
else:
- pm.deleteLocalRoles( obj=context
- , member_ids=context.REQUEST.get('member_ids', ())
- )
+ mtool.deleteLocalRoles(obj=context,
+ member_ids=context.REQUEST.get('member_ids', ()))
-qst='?portal_status_message=Local+Roles+changed.'
-
-context.REQUEST.RESPONSE.redirect( context.absolute_url() + '/folder_localrole_form' + qst )
+context.setStatus(True, _(u'Local Roles changed.'))
+context.setRedirect(context, 'object/localroles')
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/folder_localrole_edit.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_control/undo.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/undo.py 2006-05-05 14:14:10 UTC (rev 67991)
+++ CMF/trunk/CMFDefault/skins/zpt_control/undo.py 2006-05-05 14:14:40 UTC (rev 67992)
@@ -1,7 +1,12 @@
-## Script (Python) "undo"
+##parameters=transaction_info
##title=Undo transactions
-##parameters=transaction_info
-context.portal_undo.undo(context, transaction_info)
+##
+from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.utils import Message as _
-return context.REQUEST.RESPONSE.redirect(
- 'folder_contents?portal_status_message=Transaction(s)+undone' )
+utool = getToolByName(script, 'portal_undo')
+
+utool.undo(context, transaction_info)
+
+context.setStatus(True, _(u'Transaction(s) undone.'))
+context.setRedirect(context, 'object/folderContents')
Property changes on: CMF/trunk/CMFDefault/skins/zpt_control/undo.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_generic/discitem_delete.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/discitem_delete.py 2006-05-05 14:14:10 UTC (rev 67991)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/discitem_delete.py 2006-05-05 14:14:40 UTC (rev 67992)
@@ -1,10 +1,14 @@
-#
-# discitem_delete
-#
+##parameters=
+##title=Delete reply
+##
+from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.utils import Message as _
+
+dtool = getToolByName(script, 'portal_discussion')
+
parent = context.inReplyTo()
-talkback = context.portal_discussion.getDiscussionFor(parent)
+talkback = dtool.getDiscussionFor(parent)
talkback.deleteReply( context.getId() )
-
-context.REQUEST['RESPONSE'].redirect( '%s?portal_status_message=Reply+deleted'
- % parent.absolute_url()
- )
+
+context.setStatus(True, _(u'Reply deleted.'))
+context.setRedirect(parent, 'object/view')
Property changes on: CMF/trunk/CMFDefault/skins/zpt_generic/discitem_delete.py
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Modified: CMF/trunk/CMFDefault/skins/zpt_generic/discussion_reply.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/discussion_reply.py 2006-05-05 14:14:10 UTC (rev 67991)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/discussion_reply.py 2006-05-05 14:14:40 UTC (rev 67992)
@@ -2,11 +2,13 @@
##title=Reply to content
##
from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.utils import Message as _
dtool = getToolByName(script, 'portal_discussion')
+
talkback = dtool.getDiscussionFor(context)
replyID = talkback.createReply(title=title, text=text)
+reply = talkback.getReply(replyID)
-target = '%s/%s' % (talkback.absolute_url(), replyID)
-
-context.REQUEST.RESPONSE.redirect(target)
+context.setStatus(True, _(u'Reply added.'))
+context.setRedirect(reply, 'object/view')
More information about the CMF-checkins
mailing list