[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ Use CMFDefault.utils thousands formatting.

[Charlie Clark]

Log message for revision 125121:
  Use CMFDefault.utils thousands formatting.

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_folder.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/search.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py	2012-04-09 16:31:04 UTC (rev 125120)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py	2012-04-09 16:31:27 UTC (rev 125121)
@@ -15,7 +15,6 @@
 import urllib
 
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from Products.PythonScripts.standard import thousands_commas
 from zope.component import getUtility
 from zope.formlib import form
 from zope.schema.vocabulary import SimpleTerm
@@ -35,6 +34,7 @@
 from Products.CMFDefault.permissions import ListFolderContents
 from Products.CMFDefault.permissions import ManageProperties
 from Products.CMFDefault.utils import Message as _
+from Products.CMFDefault.utils import thousands_commas
 
 from .interfaces import IDeltaItem, IFolderItem, IBatchForm, ISortForm
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_folder.py	2012-04-09 16:31:04 UTC (rev 125120)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_folder.py	2012-04-09 16:31:27 UTC (rev 125121)
@@ -73,6 +73,8 @@
         self.assertEqual(batch.summary_length(), '30')
         batch = self._makeOne(10000)
         self.assertEqual(batch.summary_length(), '10,000')
+        batch = self._makeOne(0)
+        self.assertEqual(batch.summary_length(), '')
 
     def test_summary_type(self):
         batch = self._makeOne()

Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/search.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/search.py	2012-04-09 16:31:04 UTC (rev 125120)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/search.py	2012-04-09 16:31:27 UTC (rev 125121)
@@ -1,10 +1,10 @@
 ##parameters=b_start=0
 ##
-from Products.PythonScripts.standard import thousands_commas
 from ZTUtils import Batch
 from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFDefault.utils import decode
 from Products.CMFDefault.utils import Message as _
+from Products.CMFDefault.utils import thousands_commas
 
 ctool = getUtilityByInterfaceName('Products.CMFCore.interfaces.ICatalogTool')
 utool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IURLTool')
@@ -44,6 +44,7 @@
 
 length = batch_obj.sequence_length
 summary = { 'length': length and thousands_commas(length) or '',
+            'l2': length,
             'type': (length == 1) and _(u'item') or _(u'items'),
             'match': kw.get('SearchableText') }
 navigation = context.getBatchNavigation(batch_obj, target, **kw)