[Erp5-report] r38254 ivan - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTe...

[nobody at svn.erp5.org]

Author: ivan
Date: Fri Sep 10 09:02:51 2010
New Revision: 38254

URL: http://svn.erp5.org?rev=38254&view=rev
Log:
We must translate whole number of records message rather than just "records" part as in some languages "123 records" can be translated as "records 123". Do same for "selected" part.
Small optimization.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/page_navigation_render.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml?rev=38254&r1=38253&r2=38254&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml [utf8] Fri Sep 10 09:02:51 2010
@@ -126,27 +126,26 @@
 \n
 <!-- Number of listbox records -->\n
 <div class="listbox-number-of-records"\n
-     metal:define-macro="listbox_number_of_records"\n
-     tal:define="is_default_listbox_field python: field_id==\'listbox\';">\n
+     metal:define-macro="listbox_number_of_records">\n
 \n
   <span class="listbox-current-page-start-number"\n
         tal:content="current_page_start"/> - \n
   <span class="listbox-current-page-stop-number"\n
         tal:content="current_page_stop"/> \n
   <span i18n:translate="" i18n:domain="ui">of</span>\n
+\n
   <span class="listbox-current-page-total-number"\n
-        tal:content="total_line"\n
-        tal:attributes="class python: test(is_default_listbox_field, \'listbox-current-page-total-number\', \'listbox-current-page-total-number %s-current-page-total-number\' %field_id)" />\n
-  <span i18n:translate="" i18n:domain="ui">records</span> \n
+        tal:attributes="class python: test(is_default_listbox_field, \'listbox-current-page-total-number\', \'listbox-current-page-total-number %s-current-page-total-number\' %field_id)"\n
+        i18n:translate="" i18n:domain="ui">\n
+    <tal:block tal:replace="total_line" i18n:name="number">0</tal:block> records\n
+  </span>\n
   \n
-  <tal:block tal:condition="show_select_column">  - \n
-    <span class="listbox-current-item-number"\n
-          tal:attributes="class string:${field_id}-current-item-number"\n
-          i18n:translate="" i18n:domain="ui">\n
-      <tal:block tal:replace="python: len(here.getCheckedUidList())" i18n:name="number">0</tal:block>\n
-    </span>\n
-    <span i18n:translate="" i18n:domain="ui">items selected</span>\n
-  </tal:block>\n
+  <span class="listbox-current-item-number"\n
+        tal:condition="show_select_column"\n
+        tal:attributes="class string:${field_id}-current-item-number"\n
+        i18n:translate="" i18n:domain="ui">\n
+    - <tal:block tal:replace="python: len(here.getCheckedUidList())" i18n:name="number">0</tal:block> items selected\n
+  </span>\n
 \n
 </div>\n
 \n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/page_navigation_render.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/page_navigation_render.xml?rev=38254&r1=38253&r2=38254&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/page_navigation_render.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/page_navigation_render.xml [utf8] Fri Sep 10 09:02:51 2010
@@ -201,8 +201,7 @@
   <tal:block metal:define-macro="text_navigation"\n
                    tal:define="offset python: 7;\n
                                all_page_index_list python: range(1, here.total_pages + 1);\n
-                               page_index_list python: all_page_index_list[max(current_page-offset, 1)-1: min(current_page+offset, len(all_page_index_list))];\n
-                               is_default_listbox_field python: field_id==\'listbox\';">\n
+                               page_index_list python: all_page_index_list[max(current_page-offset, 1)-1: min(current_page+offset, len(all_page_index_list))];">\n
 \n
     <!-- Non gadget mode -->\n
     <tal:block tal:condition="not: is_gadget_mode">\n
@@ -227,8 +226,7 @@
   </tal:block>\n
 \n
   <!-- Slider navigation with input  (i.e. first, previous, next, last links)-->\n
-  <tal:block metal:define-macro="page_navigation"\n
-             tal:define="is_default_listbox_field python: field_id==\'listbox\';">\n
+  <tal:block metal:define-macro="page_navigation">\n
     <tal:block tal:condition="python: here.total_pages > 1">\n
 \n
       <!-- Non gadget mode -->\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=38254&r1=38253&r2=38254&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Fri Sep 10 09:02:51 2010
@@ -1 +1 @@
-1005
\ No newline at end of file
+1006
\ No newline at end of file