* Fix typo in CategoryTool_importCategoryFileForm/category_import_tips

* Respect naming convention on field titles (capitalized words) for CategoryTool_importCategoryFileForm
* CategoryTool_importCategoryFile : do not use immediate_reindex=1, this is a coding crime.

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

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

@@ -299,7 +299,6 @@ for table_name in spreadsheets.keys():\n
           if isValidID(category_id):\n
             base_path_obj.newContent( portal_type       = category_type\n
                                     , id                = category_id\n
-                                    , immediate_reindex = 1\n
                                     )\n
             detailed_report_append(\'Created new %s with  URL %s\' % (category_type,\n
                                   base_path_obj[category_id].getRelativeUrl()))\n
@@ -376,7 +375,7 @@ if detailed_report:\n
 # Import is a success, go back to the portal_categories tool\n
 return context.REQUEST.RESPONSE.redirect(\n
     # TODO translate\n
-  "%s/view?portal_status_message=%s+categories+found+in+%s:+%s+created,+%s+updated,+%s+untouched,+%s+invalid+ID.+%s+existing+categories:+%s+deleted,+%skept."\n
+  "%s/view?portal_status_message=%s+categories+found+in+%s:+%s+created,+%s+updated,+%s+untouched,+%s+invalid+ID.+%s+existing+categories:+%s+deleted,+%s+kept."\n
   % ( context.portal_categories.absolute_url()\n
     , total_category_counter\n
     , filename\n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFileForm/category_import_tips.xml

@@ -217,7 +217,7 @@
                     <key> <string>default</string> </key>
                     <value> <string encoding="cdata"><![CDATA[
 
-<ul><li>An OpenOffice file is available at <a href="portal_skins/erp5_core/erp5_import_category_tree_examples.sxc">/portal_skins/erp5_core/erp5_import_category_tree_examples.sxc</a> . It contain different examples of how to input a tree of categories. Each sheet title will be used as Base Category.</li><li>Rename every tab of the spreadsheet with the ID of the corrsponding base category ID (ex. group).</li><li>Do not merge cells in the uploaded spreadsheet: this will confuse the parser and produce unpredictible results.</li><li><b>Do not use category IDs which are defined in Property Sheets as property</b>. ERP5 is not able to make the difference between a subobject ID and a property ID.</li><li>Even if this tool was designed to import OpenOffice v1.x documents, OASIS OpenDocument files seems to work as well.</li><li>This tool is not intrusive: if an existing category tree is found, it will update each category but will not try to remove any one.</li></ul>
+<ul><li>An OpenOffice file is available at <a href="portal_skins/erp5_core/erp5_import_category_tree_examples.sxc">/portal_skins/erp5_core/erp5_import_category_tree_examples.sxc</a> . It contain different examples of how to input a tree of categories. Each sheet title will be used as Base Category.</li><li>Rename every tab of the spreadsheet with the ID of the corresponding base category ID (ex. group).</li><li>Do not merge cells in the uploaded spreadsheet: this will confuse the parser and produce unpredictible results.</li><li><b>Do not use category IDs which are defined in Property Sheets as property</b>. ERP5 is not able to make the difference between a subobject ID and a property ID.</li><li>Even if this tool was designed to import OpenOffice v1.x documents, OASIS OpenDocument files seems to work as well.</li><li>This tool is not intrusive: if an existing category tree is found, it will update each category but will not try to remove any one.</li></ul>
 
 ]]></string> </value>
                 </item>
@@ -265,6 +265,10 @@
                     <key> <string>required</string> </key>
                     <value> <int>0</int> </value>
                 </item>
+                <item>
+                    <key> <string>text_editor</string> </key>
+                    <value> <string>text_area</string> </value>
+                </item>
                 <item>
                     <key> <string>title</string> </key>
                     <value> <string>Tips</string> </value>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFileForm/your_detailed_report.xml

@@ -169,7 +169,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Display detailed report</string> </value>
+                    <value> <string>Display Detailed Report</string> </value>
                 </item>
               </dictionary>
             </value>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFileForm/your_keep_existing_category.xml

@@ -169,7 +169,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Keep existing categories</string> </value>
+                    <value> <string>Keep Existing Categories</string> </value>
                 </item>
               </dictionary>
             </value>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFileForm/your_update_existing_property.xml

@@ -169,7 +169,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Update existing properties</string> </value>
+                    <value> <string>Update Existing Properties</string> </value>
                 </item>
               </dictionary>
             </value>

product/ERP5/bootstrap/erp5_core/bt/revision

-480
+481
\ No newline at end of file