raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7972 from jibees/#7928-transform-locale-for-flatpickr

Browse Source 
Flatpickr only use language and not locale
This commit is contained in:
Matt-Yorkley
2021-07-26 18:31:14 +02:00
committed by GitHub
parent 4dccd55490 f39cc49cd2
commit c00ca35f09
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/util.js.erb
View File

@@ -12,7 +12,7 @@ $(document).ready(function() {
altInput: true,
altFormat: Spree.translations.flatpickr_date_format,
dateFormat: "Y-m-d",
locale: I18n.locale,
locale: I18n.base_locale,
plugins: [
ShortcutButtonsPlugin({
button: [{

1
app/views/layouts/_i18n_script.html.haml
View File

@@ -1,5 +1,6 @@
:javascript
I18n.default_locale = "#{I18n.default_locale}";
I18n.base_locale = "#{I18n.locale.to_s.split('_').first}";
I18n.locale = "#{I18n.locale}";
I18n.fallbacks = true;
moment.locale([I18n.locale, 'en']);