Merge pull request #10 from plone/issue-8-localization

Issue 8 localization

CHANGES.txt

@@ -4,7 +4,9 @@ Changelog
 2.2.5 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Preventing AM/PM issue when some locales are set.
+  This fix https://github.com/plone/plone.app.form/issues/8
+  [keul]
 
 
 2.2.4 (2014-01-27)

plone/app/form/widgets/datecomponents.py

@@ -215,7 +215,7 @@ def result(self, date=None,
 
             for x in ('AM', 'PM'):
                 d={'id': x, 'value': x, 'selected': None}
-                if x==p and not default:
+                if x==p.upper() and not default:
                     d['selected']=1
                 ampm.append(d)
 

plone/app/form/widgets/datecomponents.txt

@@ -158,6 +158,23 @@ test is run.
   >>> parseDate(parts)
   (2499, '12', '31', '00', '00')
 
+Now testing if Python env localization will not affects the AM/PM behavior of the
+view (preventing regression of issue https://github.com/plone/plone.app.form/issues/8).
+The EN_us locale will not suffer of the issue while other (DE_de or IT_it) do.
+
+  >>> import locale
+  >>> default_locale = locale.getlocale()
+  >>> testdate = DateTime.DateTime('2015/04/17 09:00:00')
+  >>> locale.setlocale(locale.LC_ALL, "EN_us")
+  'EN_us'
+  >>> view.result(testdate, use_ampm=True)['ampm']
+  [{'selected': None, 'id': '--', 'value': 'AM'}, {'selected': 1, 'id': 'AM', 'value': 'AM'}, {'selected': None, 'id': 'PM', 'value': 'PM'}]
+  >>> locale.setlocale(locale.LC_ALL, "IT_it")
+  'IT_it'
+  >>> view.result(testdate, use_ampm=True)['ampm']
+  [{'selected': None, 'id': '--', 'value': 'AM'}, {'selected': 1, 'id': 'AM', 'value': 'AM'}, {'selected': None, 'id': 'PM', 'value': 'PM'}]  
+  >>> dummy = locale.setlocale(locale.LC_ALL, default_locale)
+
 un-monkey patch
   >>> DateTime.DateTime.localZone = realLocalZone
   >>> datecomponents.PLONE_CEILING = DateTime.DateTime(2500, 0)