[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - made navigation messages customizable

[Yvo Schubbe]

Log message for revision 127397:
  - made navigation messages customizable

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/batch.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/locales/cmf_default-manual.pot

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py	2012-07-26 21:14:29 UTC (rev 127396)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py	2012-07-30 06:21:19 UTC (rev 127397)
@@ -70,6 +70,11 @@
 
 class Manage(BatchFormMixin, EditFormBase):
 
+    _NEXT_PLURAL_MESSAGE = _(u'Next ${count} members')
+    _NEXT_SINGULAR_MESSAGE = _(u'Next member')
+    _PREV_PLURAL_MESSAGE = _(u'Previous ${count} members')
+    _PREV_SINGULAR_MESSAGE = _(u'Previous member')
+
     template = ViewPageTemplateFile("members.pt")
     delete_template = ViewPageTemplateFile("members_delete.pt")
     form_fields = form.FormFields()

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt	2012-07-26 21:14:29 UTC (rev 127396)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt	2012-07-30 06:21:19 UTC (rev 127397)
@@ -63,7 +63,7 @@
     ...     app.site.portal_membership.addMember(user,
     ...            "secret", ("Owner",), ())
     >>> browser.open("http://localhost/site/@@members.html")
-    >>> "[[cmf_default][Next 18 items]]" in browser.contents
+    >>> "[[cmf_default][Next 18 members]]" in browser.contents
     True
     >>> 'a href="http://localhost/site/@@members.html?form.b_start=25">2</a>' in browser.contents
     True

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/batch.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/batch.py	2012-07-26 21:14:29 UTC (rev 127396)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/batch.py	2012-07-30 06:21:19 UTC (rev 127397)
@@ -61,6 +61,10 @@
     """
 
     _BATCH_SIZE = 25
+    _NEXT_PLURAL_MESSAGE = _(u'Next ${count} items')
+    _NEXT_SINGULAR_MESSAGE = _(u'Next item')
+    _PREV_PLURAL_MESSAGE = _(u'Previous ${count} items')
+    _PREV_SINGULAR_MESSAGE = _(u'Previous item')
 
     @memoize
     def _getBatchStart(self):
@@ -131,9 +135,9 @@
         length = len(batch_obj)
         url = self._getNavigationURL(batch_obj.first)
         if length == 1:
-            title = _(u'Previous item')
+            title = self._PREV_SINGULAR_MESSAGE
         else:
-            title = _(u'Previous ${count} items', mapping={'count': length})
+            title = _(self._PREV_PLURAL_MESSAGE, mapping={'count': length})
         return {'title': title, 'url': url}
 
     @memoize
@@ -145,9 +149,9 @@
         length = len(batch_obj)
         url = self._getNavigationURL(batch_obj.first)
         if length == 1:
-            title = _(u'Next item')
+            title = self._NEXT_SINGULAR_MESSAGE
         else:
-            title = _(u'Next ${count} items', mapping={'count': length})
+            title = _(self._NEXT_PLURAL_MESSAGE, mapping={'count': length})
         return {'title': title, 'url': url}
 
     def page_range(self):

Modified: Products.CMFDefault/trunk/Products/CMFDefault/locales/cmf_default-manual.pot
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/locales/cmf_default-manual.pot	2012-07-26 21:14:29 UTC (rev 127396)
+++ Products.CMFDefault/trunk/Products/CMFDefault/locales/cmf_default-manual.pot	2012-07-30 06:21:19 UTC (rev 127397)
@@ -1,18 +1,6 @@
 msgid "Found ${count} ${type}."
 msgstr ""
 
-msgid "Next ${count} members"
-msgstr ""
-
-msgid "Next member"
-msgstr ""
-
-msgid "Previous ${count} members"
-msgstr ""
-
-msgid "Previous member"
-msgstr ""
-
 msgid "Criteria"
 msgstr ""