2008-08-29 yusei

* Correct message text.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23300 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_newBug.xml

@@ -69,23 +69,25 @@
   This script creates a new event with given metadata and\n
   attaches it to the current bug.\n
 """\n
-translateString = context.Base_translateString\n
+Base_translateString = context.Base_translateString\n
 portal_type = \'Bug\'\n
 module = context.getDefaultModule(portal_type)\n
 \n
 if portal_type not in module.getVisibleAllowedContentTypeList():\n
-  return context.Base_redirect(form_id, keep_items=dict(\n
-       portal_status_message=translateString("You Don\'t Have Permission to Add New Bug")))\n
+  return context.Base_redirect(form_id,\n
+                               keep_items=dict(\n
+    portal_status_message=Base_translateString("You do not have permission to add new bug")))\n
 \n
 # Create a new event\n
-bug = module.newContent(portal_type=portal_type, \n
-                                                 description=description, \n
-                                                 title=title, \n
+bug = module.newContent(portal_type=portal_type,\n
+                        description=description,\n
+                        title=title,\n
                         follow_up=context.getRelativeUrl())\n
 \n
 # Redirect to even\n
-portal_status_message = translateString("Created and associated a new ${portal_type} to the ticket.", \n
-                                    mapping = dict(portal_type = translateString(portal_type)))\n
+portal_status_message = Base_translateString(\n
+  "Created and associated a new ${portal_type} to the ticket.",\n
+  mapping = dict(portal_type=Base_translateString(portal_type)))\n
 return bug.Base_redirect(\'view\', keep_items = dict(portal_status_message=portal_status_message), **kw)\n
 </string> </value>
         </item>
@@ -135,7 +137,7 @@ return bug.Base_redirect(\'view\', keep_items = dict(portal_status_message=porta
                             <string>kw</string>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>translateString</string>
+                            <string>Base_translateString</string>
                             <string>portal_type</string>
                             <string>module</string>
                             <string>dict</string>

bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_newEvent.xml

@@ -73,8 +73,9 @@ translateString = context.Base_translateString\n
 module = context.getDefaultModule(portal_type)\n
 \n
 if portal_type not in module.getVisibleAllowedContentTypeList():\n
-  return context.Base_redirect(form_id, keep_items=dict(\n
-       portal_status_message=translateString("You Don\'t Have Permission to Add New Event")))\n
+  return context.Base_redirect(form_id,\n
+                               keep_items=dict(\n
+       portal_status_message=translateString("You do not have permission to add new event")))\n
 \n
 # Create a new event\n
 event = module.newContent(portal_type=portal_type, description=description, title=title, follow_up=context.getRelativeUrl())\n
@@ -86,8 +87,9 @@ else:\n
   event.plan()\n
 \n
 # Redirect to even\n
-portal_status_message = translateString("Created and associated a new ${portal_type} to the ticket.", \n
-                                    mapping = dict(portal_type = translateString(portal_type)))\n
+portal_status_message = translateString(\n
+  "Created and associated a new ${portal_type} to the ticket.", \n
+  mapping=dict(portal_type = translateString(portal_type)))\n
 return event.Base_redirect(\'view\', keep_items = dict(portal_status_message=portal_status_message), **kw)\n
 </string> </value>
         </item>

bt5/erp5_crm/bt/change_log

+2008-08-29 yusei
+* Correct message text.
+
 2008-08-28 yusei
 * Use Base_translateString or translateString instead of N_ for translation message.
 

bt5/erp5_crm/bt/revision

-296
+297
\ No newline at end of file

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml

@@ -98,12 +98,12 @@ else:\n
   commit_recurs = removed\n
 \n
 if changelog is None :\n
-  request.set(\'portal_status_message\', translateString(\'Please Set a ChangeLog Message\'))\n
+  request.set(\'portal_status_message\', translateString(\'Please set a ChangeLog Message\'))\n
   request.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n
   return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n
 \n
 if changelog.strip() == \'\' :\n
-  request.set(\'portal_status_message\', translateString("Error: ChangeLog Message can\'t be Empty"))\n
+  request.set(\'portal_status_message\', translateString("Error: ChangeLog Message can not be empty"))\n
   request.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n
   return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n
 \n

bt5/erp5_forge/bt/change_log

+2008-08-29 yusei
+* Correct message text.
+
 2008-08-28 yusei
 * Extract translation message from tal:dfeine expression.
 * Use Base_translateString or translateString instead of N_ for translation message.

bt5/erp5_forge/bt/revision

-327
+328
\ No newline at end of file