diff --git a/CHANGES.rst b/CHANGES.rst index ace55f9e1c..0b23cf7467 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,7 @@ Changelog 2.0.1 (unreleased) ------------------ - +- #1830 Allow to override datepicker's dateformat via locales 2.0.0 (2021-07-26) ------------------ diff --git a/buildout.cfg b/buildout.cfg index eb351f08b1..1ba66da932 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -1,8 +1,8 @@ [buildout] index = https://pypi.org/simple/ -extends = https://dist.plone.org/release/5.2.3/versions.cfg +extends = https://dist.plone.org/release/5.2.4/versions.cfg find-links = - https://dist.plone.org/release/5.2.3/ + https://dist.plone.org/release/5.2.4/ https://dist.plone.org/thirdparty/ parts = diff --git a/src/bika/lims/browser/__init__.py b/src/bika/lims/browser/__init__.py index 477a8dc566..f988ef9dd9 100644 --- a/src/bika/lims/browser/__init__.py +++ b/src/bika/lims/browser/__init__.py @@ -63,7 +63,10 @@ def get_locale_format(key): request = api.get_request() format = translate( key, domain="senaite.core", mapping={}, context=request) - # TODO: Is this replacement below strictly necessary? + # The variables at locales .po files (e.g. "date_format_short") take + # into consideration the translation service tool and therefore, their + # format is like "${d}/${m}/${Y}". We need to "convert" this format + # to %-like. return format.replace(r"${", '%').replace('}', '') # Try with prioritized formats diff --git a/src/senaite/core/skins/senaite_templates/senaite_widgets/datetimewidget.js b/src/senaite/core/skins/senaite_templates/senaite_widgets/datetimewidget.js index 9e37b3965c..5ce83ec8e2 100644 --- a/src/senaite/core/skins/senaite_templates/senaite_widgets/datetimewidget.js +++ b/src/senaite/core/skins/senaite_templates/senaite_widgets/datetimewidget.js @@ -14,14 +14,13 @@ document.addEventListener("DOMContentLoaded", () => { var dt_fmt = _t(dt_fmt_string); if (dt_fmt != dt_fmt_string) { - dt_fmt = dt_fmt.replaceAll(/[${}]/gi, ""); + date_format = dt_fmt.replaceAll(/[${}]/gi, ""); } var config = Object.assign(dt_config, tp_config); $('[datepicker="1"]').datepicker( Object.assign(config, { - dateFormat: "yy-mm-dd", changeMonth: true, changeYear: true, yearRange: "-150:+150",