Mismatch datetime separator in datetime picker for several locales

[Jun Omae]

Originally reported in [50289f02/rjollos.git].

timepicker_separator is always ' ' when iso8601 format isn't configured. However, date/time separator isn't a space character for several locales.

>>> import babel
>>> babel.__version__
'0.9.6'
>>> from babel.dates import get_datetime_format
>>> from trac.util.translation import get_available_locales
>>> fmts = {}
>>> for locale_id in sorted(get_available_locales()):
...   fmt = get_datetime_format('medium', locale_id)
...   fmts.setdefault(fmt, []).append(locale_id)
...
>>> for fmt in fmts:
...   print('%r => %s' % (fmt, ' '.join(fmts[fmt])))
...
u'{1} {0}' => ca cs da de el en_GB en_US eo es es_AR es_MX et fi fr gl he hu hy it ja ko nb nl pl pt pt_BR ru sl sv tr uk zh_CN zh_TW
u'{1}, {0}' => ro

>>> babel.__version__
'1.3'
>>> from babel.dates import get_datetime_format
>>> from trac.util.translation import get_available_locales
>>> fmts = {}
>>> for locale_id in sorted(get_available_locales()):
...   fmt = get_datetime_format('medium', locale_id)
...   fmts.setdefault(fmt, []).append(locale_id)
...
>>> fmts
{u'{0} {1}': ['nb'], u'{1} {0}': ['ca', 'cs', 'da', 'de', 'en_GB', 'eo', 'es', 'es_AR', 'es_MX', 'et', 'fi', 'fr', 'gl', 'hu', 'it', 'ja', 'ko', 'nl', 'pt', 'pt_BR', 'sl', 'sv', 'tr', 'uk', 'zh_CN', 'zh_TW'], u'{1}, {0}': ['en_US', 'he', 'hy', 'pl', 'ro', 'ru'], u'{1} - {0}': ['el']}
>>> for fmt in fmts:
...   print('%r => %s' % (fmt, ' '.join(fmts[fmt])))
...
u'{0} {1}' => nb
u'{1} {0}' => ca cs da de en_GB eo es es_AR es_MX et fi fr gl hu it ja ko nl pt pt_BR sl sv tr uk zh_CN zh_TW
u'{1}, {0}' => en_US he hy pl ro ru
u'{1} - {0}' => el

Proposed changes:

trac/util/datefmt.py

@@ -401 +401 @@
         return (locale.first_week_day + 1) % 7
     return 0 # Sunday
 
+def get_timepicker_separator_jquery_ui(req):
+    locale = req.lc_time
+    if locale == 'iso8601':
+        return 'T'
+    if babel and locale:
+        return get_datetime_format('medium', locale=locale) \
+               .replace('{0}', '').replace('{1}', '')
+    return ' '
+
 def is_24_hours(locale):
     """Returns `True` for 24 hour time formats."""
     if locale == 'iso8601':

trac/web/chrome.py

@@ -59 +59 @@
     from_utimestamp, http_date, utc, get_date_format_jquery_ui, is_24_hours,
     get_time_format_jquery_ui, user_time, get_month_names_jquery_ui,
     get_day_names_jquery_ui, get_timezone_list_jquery_ui,
-    get_first_week_day_jquery_ui)
+    get_first_week_day_jquery_ui, get_timepicker_separator_jquery_ui)
 from trac.util.translation import _, get_available_locales
 from trac.web.api import IRequestHandler, ITemplateStreamFilter, HTTPNotFound
 from trac.web.href import Href
@@ -1276 +1276 @@
             'time_format': get_time_format_jquery_ui(req.lc_time),
             'ampm': not is_24_hours(req.lc_time),
             'first_week_day': get_first_week_day_jquery_ui(req),
-            'timepicker_separator': 'T' if is_iso8601 else ' ',
+            'timepicker_separator': get_timepicker_separator_jquery_ui(req),
             'show_timezone': is_iso8601,
             # default timezone must be included
             'timezone_list': get_timezone_list_jquery_ui() \