2008-08-28 yusei

* Use Base_translateString or translateString instead of N_ for translation message.

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

bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_addToShoppingCart.xml

@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -121,9 +118,8 @@ if line_found == False:\n
   order_line.setResource(resource.getRelativeUrl())\n
   order_line.setQuantity(quantity)\n
 \n
-N_ = context.Base_translateString\n
-context.Base_redirect(\'view\', \\\n
-                      keep_items={\'portal_status_message\': N_("Added to cart.")})\n
+context.Base_redirect(\'view\',\n
+                      keep_items={\'portal_status_message\':context.Base_translateString("Added to cart.")})\n
 
 
 ]]></string> </value>
@@ -196,7 +192,6 @@ context.Base_redirect(\'view\', \\\n
                             <string>order_line</string>
                             <string>new_quantity</string>
                             <string>True</string>
-                            <string>N_</string>
                           </tuple>
                         </value>
                     </item>
@@ -223,6 +218,12 @@ context.Base_redirect(\'view\', \\\n
             <key> <string>title</string> </key>
             <value> <string>Add resource to shopping cart</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>

bt5/erp5_commerce/bt/change_log

+2008-08-28 yusei
+* Use Base_translateString or translateString instead of N_ for translation message.
+
 2007-06-07 Ivan
 * Update. Split core script from widgets
 

bt5/erp5_commerce/bt/revision

-116
\ No newline at end of file
+118
\ No newline at end of file

bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/ListBox_getColumnWithDict.xml

@@ -76,7 +76,7 @@ if listbox is not None:\n
   if cache is not None:\n
     return cache\n
 \n
-N_ = context.Base_translateString\n
+Base_translateString = context.Base_translateString\n
 \n
 # XXX this is just a copy / paste of the old implementation\n
 # dirty code : if we are in domain or report tree, just use the old one, otherwise\n
@@ -161,7 +161,7 @@ for listboxline in listboxline_list:\n
     if listboxline.isStatLine():\n
       string_property = "%s+++++" % string_property\n
     elif listboxline.isTitleLine():\n
-      string_property = ("%s+++++" % str(N_(string_property)))[:max_title_property_len]\n
+      string_property = ("%s+++++" % str(Base_translateString(string_property)))[:max_title_property_len]\n
     new_column_max_len = max(len(string_property),\n
                              max_line_len.get(column_id, 0))\n
                          \n
@@ -236,7 +236,7 @@ return result\n
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>cache</string>
-                            <string>N_</string>
+                            <string>Base_translateString</string>
                             <string>result</string>
                             <string>min_column_width</string>
                             <string>_getiter_</string>
@@ -293,6 +293,12 @@ return result\n
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>

bt5/erp5_pdf_style/bt/change_log

+2008-08-28 yusei
+* Use Base_translateString or translateString instead of N_ for translation message.
+
 2007-10-30 jerome
 * Support for list fields in report_view
 * define macros for deferred rendering

bt5/erp5_pdf_style/bt/revision

-63
\ No newline at end of file
+64
\ No newline at end of file

bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asCellRange.xml

@@ -68,7 +68,7 @@
             <value> <string encoding="cdata"><![CDATA[
 
 portal = context.getPortalObject()\n
-N_ = portal.Base_translateString\n
+Base_translateString = portal.Base_translateString\n
 \n
 cell_range = []\n
 add_predicate = 1\n
@@ -150,15 +150,15 @@ if add_predicate == 1:\n
           min_qty = criterion.min\n
           max_qty = criterion.max\n
           if min_qty is None:\n
-            predicate_title = N_("Quantity < ${max_quantity}",\n
-                                 mapping={\'max_quantity\': max_qty})\n
+            predicate_title = Base_translateString("Quantity < ${max_quantity}",\n
+                                                   mapping={\'max_quantity\': max_qty})\n
           elif max_qty is None:\n
-            predicate_title = N_("${min_quantity} <= Quantity",\n
-                                 mapping={\'min_quantity\': min_qty})\n
+            predicate_title = Base_translateString("${min_quantity} <= Quantity",\n
+                                                   mapping={\'min_quantity\': min_qty})\n
           else:\n
-            predicate_title = N_("${min_quantity} <= Quantity < ${max_quantity}",\n
-                                 mapping={\'min_quantity\': min_qty,\n
-                                          \'max_quantity\': max_qty})\n
+            predicate_title = Base_translateString("${min_quantity} <= Quantity < ${max_quantity}",\n
+                                                   mapping={\'min_quantity\': min_qty,\n
+                                                            \'max_quantity\': max_qty})\n
           break\n
       pred_ids.append((predicate.getRelativeUrl(), predicate_title))\n
   else:\n
@@ -226,7 +226,7 @@ return cell_range\n
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>portal</string>
-                            <string>N_</string>
+                            <string>Base_translateString</string>
                             <string>cell_range</string>
                             <string>add_predicate</string>
                             <string>no_option_base_category_list</string>

bt5/erp5_pdm/bt/change_log

+2008-08-28 yusei
+* Use Base_translateString or translateString instead of N_ for translation message.
+
 2008-07-01 luke
 * added support for int_index and reference for Transformation children
 * Transformation related forms proxified

bt5/erp5_pdm/bt/revision

-277
\ No newline at end of file
+278
\ No newline at end of file