2008-09-07 yusei

* Replace "+" with " " in translation messages.

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

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_deleteEmptyLines.xml

@@ -91,7 +91,7 @@ if len(id_to_delete_list) != len(transaction_lines):\n
 \n
 if redirect:\n
   context.REQUEST.RESPONSE.redirect("%s/view?portal_status_message=%s" % (\n
-    transaction.absolute_url(), translateString(\'Empty+lines+deleted.\')))\n
+    transaction.absolute_url(), translateString(\'Empty lines deleted.\')))\n
 </string> </value>
         </item>
         <item>

bt5/erp5_accounting/bt/change_log

+2008-09-07 yusei
+* Replace "+" with " " in translation messages.
+
 2008-09-04 jerome
 * Add profile tab on all accounting transaction types
 

bt5/erp5_accounting/bt/revision

-763
+764
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml

@@ -226,7 +226,7 @@ if hasattr(kw, \'previous_md5_object_uid_list\'):\n
     object_uid_list = map(lambda x:x.getObject().getUid(), selection_list)\n
     error = context.portal_selections.selectionHasChanged(kw[\'previous_md5_object_uid_list\'], object_uid_list)\n
     if error:\n
-      error_message = context.Base_translateString("Sorry,+your+selection+has+changed.")\n
+      error_message = context.Base_translateString("Sorry, your selection has changed.")\n
 \n
 # if dialog_category is object_search, then edit the selection\n
 if dialog_category == "object_search" :\n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_doAction.xml

@@ -103,7 +103,7 @@ elif doAction0 == \'add\':\n
   new_content = context.newContent(portal_type=type_name,\n
                                    container=context,\n
                                    id=str(new_id))\n
-  message = Base_translateString("Object+created.")\n
+  message = Base_translateString("Object created.")\n
   if not(ignore_layout) and context.getApplicableLayout():\n
     redirect_url = \'%s/%s?portal_status_message=%s&editable_mode=1\' % (\n
                               new_content.WebSite_getDocumentPhysicalPath()\n
@@ -128,9 +128,9 @@ elif doAction0 == \'template\':\n
     new_content.makeTemplateInstance()\n
     redirect_url = \'%s/%s?%s\' % ( new_content.absolute_url()\n
                             , \'view\'\n
-                            , \'portal_status_message=\'+Base_translateString(\'Template+created.\'))\n
+                            , \'portal_status_message=\'+Base_translateString(\'Template created.\'))\n
   else:\n
-    message = Base_translateString("Template+does+not+exist.")\n
+    message = Base_translateString("Template does not exist.")\n
     redirect_url = \'%s/%s?portal_status_message=%s\' % ( context.absolute_url()\n
                             , \'view\'\n
                             , message)\n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml

@@ -234,7 +234,7 @@ def parseField(f):\n
 kw = {}\n
 encapsulated_editor_list = []\n
 MARKER = []\n
-message = Base_translateString("Data+updated.")\n
+message = Base_translateString("Data updated.")\n
 \n
 try:\n
   # We process all the field in form and\n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editUnrestricted.xml

@@ -105,7 +105,7 @@ except FormValidationError, validation_errors:\n
 kw = {}\n
 encapsulated_editor_list = []\n
 MARKER = []\n
-message = Base_translateString("Data+updated.")\n
+message = Base_translateString("Data updated.")\n
 \n
 \n
 def parseField(f):\n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateRelation.xml

@@ -254,7 +254,7 @@ except FormValidationError, validation_errors:\n
   request.set(\'field_errors\', field_errors)\n
   return form(request)\n
 else:\n
-  message = Base_translateString(\'Relation+unchanged.\')\n
+  message = Base_translateString(\'Relation unchanged.\')\n
 \n
 if redirect_url is None:\n
   if not selection_index:\n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_copy.xml

@@ -77,9 +77,9 @@ request=context.REQUEST\n
 \n
 if uids != []:\n
   context.manage_copyObjects(uids=uids, REQUEST=request, RESPONSE=request.RESPONSE)\n
-  message = Base_translateString("Item(s)+copied.")\n
+  message = Base_translateString("Item(s) copied.")\n
 else:\n
-  message = Base_translateString("Please+select+one+or+more+items+to+copy+first.")\n
+  message = Base_translateString("Please select one or more items to copy first.")\n
 return request.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % message)\n
 </string> </value>
         </item>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_cut.xml

@@ -101,16 +101,16 @@ if uids != []:\n
 \n
   if object_used > 0:\n
     if object_used == 1:\n
-      message = Base_translateString("Sorry,+1+item+is+in+use.")\n
+      message = Base_translateString("Sorry, 1 item is in use.")\n
     else:\n
-      message = Base_translateString("Sorry,+${count}+items+are+in+use.",\n
+      message = Base_translateString("Sorry, ${count} items are in use.",\n
                                      mapping={\'count\': repr(object_used)})\n
     qs = \'?portal_status_message=%s\' % message  \n
   else:\n
     context.manage_cutObjects(uids=uids, REQUEST=request)\n
-    message = Base_translateString("Item(s)+cut.")\n
+    message = Base_translateString("Item(s) cut.")\n
 else:\n
-  message = Base_translateString("Please+select+one+or+more+items+to+cut+first.")\n
+  message = Base_translateString("Please select one or more items to cut first.")\n
 return request.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % message)\n
 
 

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml

@@ -101,7 +101,7 @@ def Object_hasRelation(obj):\n
 \n
 ret_url = context.absolute_url() + \'/\' + form_id\n
 if error:\n
-  message = Base_translateString("Sorry,+your+selection+has+changed.")\n
+  message = Base_translateString("Sorry, your selection has changed.")\n
   qs = \'?portal_status_message=%s\' % message\n
 elif uids is not None:\n
   # Check if there is some related objets.\n
@@ -112,9 +112,9 @@ elif uids is not None:\n
 \n
   if object_used > 0:\n
     if object_used == 1:\n
-      message = Base_translateString("Sorry,+1+item+is+in+use.")\n
+      message = Base_translateString("Sorry, 1 item is in use.")\n
     else:\n
-      message = Base_translateString("Sorry,+${count}+items+are+in+use.",\n
+      message = Base_translateString("Sorry, ${count} items are in use.",\n
                                      mapping={\'count\': repr(object_used)})\n
     qs = \'?portal_status_message=%s\' % message  \n
   else:\n
@@ -177,15 +177,15 @@ elif uids is not None:\n
 \n
       # Generate message\n
       if not_deleted_count == 1:\n
-        message = Base_translateString("Sorry,+you+can+not+delete+${count}+item.",\n
+        message = Base_translateString("Sorry, you can not delete ${count} item.",\n
                                        mapping={\'count\': not_deleted_count})\n
       elif not_deleted_count > 1:\n
-        message = Base_translateString("Sorry,+you+can+not+delete+${count}+items.",\n
+        message = Base_translateString("Sorry, you can not delete ${count} items.",\n
                                        mapping={\'count\': not_deleted_count})\n
       qs = \'?portal_status_message=%s\' % message\n
 \n
 else:\n
-  message = Base_translateString("Please+select+one+or+more+items+first.")\n
+  message = Base_translateString("Please select one or more items first.")\n
   qs = \'?portal_status_message=%s\' % message\n
 \n
 # make sure nothing is checked after\n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml

@@ -75,7 +75,7 @@ selected_uids = context.portal_selections.updateSelectionCheckedUidList(selectio
 uids = context.portal_selections.getSelectionCheckedUidsFor(selection_name)\n
 \n
 if uids == []:\n
-  message = Base_translateString("Please+select+one+or+more+items+to+delete+first.")\n
+  message = Base_translateString("Please select one or more items to delete first.")\n
   qs = \'?portal_status_message=%s\' % message\n
   return request.RESPONSE.redirect( context.absolute_url() + \'/\' + form_id + qs )\n
 \n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_paste.xml

@@ -76,29 +76,30 @@ if context.cb_dataValid:\n
   try:\n
     portal_type_list = [x.getPortalType() for x in object_list]\n
   except AttributeError:\n
-    error_message = Base_translateString(\'Sorry,+you+can+not+paste+theses+items+here.\')\n
+    error_message = Base_translateString(\'Sorry, you can not paste these items here.\')\n
   else:\n
     allowed_type_list = [x for x in context.getVisibleAllowedContentTypeList()]\n
     for portal_type in portal_type_list:\n
       if portal_type not in allowed_type_list:\n
-        error_message = Base_translateString(\'Sorry,+you+can+not+paste+theses+items+here.\')\n
+        error_message = Base_translateString(\'Sorry, you can not paste these items here.\')\n
 if context.cb_dataValid and error_message==\'\':\n
   try:\n
     new_item_list = context.manage_pasteObjects(REQUEST[\'__cp\'])\n
   except KeyError:\n
-    msg = Base_translateString(\'Nothing+to+paste.\')\n
+    msg = Base_translateString(\'Nothing to paste.\')\n
     return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % msg)\n
   else:\n
     new_id_list = [i[\'new_id\'] for i in new_item_list]\n
     for my_id in new_id_list:\n
       context[my_id].flushActivity(invoke=0, method_id=\'immediateReindexObject\')\n
       context[my_id].recursiveImmediateReindexObject()\n
-    msg = Base_translateString(\'Item(s)+pasted.\')\n
+    msg = Base_translateString(\'Item(s) pasted.\')\n
     return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % msg)\n
 elif context.cb_dataValid and error_message!=\'\':\n
   return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % error_message)\n
 else:\n
-  return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=Copy+or+cut+one+or+more+items+to+paste+first.\')\n
+  error_message = Base_translateString(\'Copy or cut one or more items to paste first.\')\n
+  return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % error_message)\n
 </string> </value>
         </item>
         <item>

product/ERP5/bootstrap/erp5_core/bt/change_log

+2008-09-07 yusei
+* Replace "+" with " " in translation messages.
+
 2008-09-04 yusei
 * Update English messages.
 

product/ERP5/bootstrap/erp5_core/bt/revision

-951
+954
\ No newline at end of file

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/logged_in.xml

@@ -61,7 +61,7 @@
              isAnon mtool/isAnonymousUser|nothing;">\n
     <tal:block tal:condition="isAnon">\n
       <tal:block tal:define="dummy python: response.expireCookie(\'__ac\', path=\'/\');\n
-                 url python: \'%s/login_form?portal_status_message=%s\' % (here.absolute_url(), here.Base_translateString(\'Login+and/or+password+is+incorrect.\'));\n
+                 url python: \'%s/login_form?portal_status_message=%s\' % (here.absolute_url(), here.Base_translateString(\'Login and/or password is incorrect.\'));\n
                  url python: request.get(\'came_from\') and  \'%s&amp;came_from=%s\' % (url, request[\'came_from\']) or url;\n
                  dummy python: response.redirect(url);" />\n
     </tal:block>\n
@@ -91,6 +91,12 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>

product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log

+2008-09-07 yusei
+* Replace "+" with " " in translation messages.
+
 2008-09-05 yusei
 * Fixed wrong i18n:name.
 

product/ERP5/bootstrap/erp5_xhtml_style/bt/revision

-599
+600
\ No newline at end of file