Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Add translations in for Flatpickr

Matthew Kennedy924ba19b3750
diff --git a/backend/app/assets/javascripts/spree/backend/admin.js b/backend/app/assets/javascripts/spree/backend/admin.js
index bd7743d18d..cd10ae6267 100644
--- a/backend/app/assets/javascripts/spree/backend/admin.js
+++ b/backend/app/assets/javascripts/spree/backend/admin.js
@@ -4,10 +4,7 @@ under the spree namespace that do stuff we find helpful.
Hopefully, this will evolve into a propper class.
**/
-/* global AUTH_TOKEN, order_number, Sortable, flatpickr, DOMPurify */
-
-//= require spree/backend/flatpickr_locals
-
+/* global AUTH_TOKEN, order_number, Sortable, DOMPurify */
jQuery(function ($) {
// Add some tips
$('.with-tip').each(function() {
@@ -227,8 +224,9 @@ $.fn.radioControlsVisibilityOfElement = function (dependentElementSelector) {
document.addEventListener('DOMContentLoaded', function() {
var dateFrom = flatpickr('.datePickerFrom', {
+ locale: Spree.translations.flatpickr_locale,
time_24hr: true,
- dateFormat: Spree.translations.date_picker,
+ // dateFormat: Spree.translations.date_format,
monthSelectorType: 'static',
onChange: function(selectedDates) {
dateTo.set('minDate', selectedDates[0])
@@ -236,18 +234,19 @@ document.addEventListener('DOMContentLoaded', function() {
})
var dateTo = flatpickr('.datePickerTo', {
+ locale: Spree.translations.flatpickr_locale,
monthSelectorType: 'static',
time_24hr: true,
- dateFormat: Spree.translations.date_picker,
+ // dateFormat: Spree.translations.date_format,
onChange: function(selectedDates) {
dateFrom.set('maxDate', selectedDates[0])
}
})
flatpickr('.datepicker', {
+ locale: Spree.translations.flatpickr_locale,
monthSelectorType: 'static',
time_24hr: true,
- dateFormat: Spree.translations.date_picker
})
})
diff --git a/backend/app/assets/javascripts/spree/backend/flatpickr_locals.js b/backend/app/assets/javascripts/spree/backend/flatpickr_locals.js
deleted file mode 100644
index 35f3c07626..0000000000
--- a/backend/app/assets/javascripts/spree/backend/flatpickr_locals.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/* global flatpickr */
-document.addEventListener('DOMContentLoaded', function() {
- flatpickr.l10ns.default.firstDayOfWeek = Spree.translations.firstDay
- flatpickr.l10ns.default.rangeSeparator = Spree.translations.rangeSep
- flatpickr.l10ns.default.weekAbbreviation = Spree.translations.weekAbbr
- flatpickr.l10ns.default.scrollTitle = Spree.translations.scrollTitle
- flatpickr.l10ns.default.toggleTitle = Spree.translations.toggleTitle
- flatpickr.l10ns.default.amPM = [Spree.translations.am, Spree.translations.pm]
- flatpickr.l10ns.default.yearAriaLabel = Spree.translations.yearAriaLabel
- flatpickr.l10ns.default.hourAriaLabel = Spree.translations.hourAriaLabel
- flatpickr.l10ns.default.minuteAriaLabel = Spree.translations.minuteAriaLabel
- flatpickr.l10ns.default.weekdays = {
- shorthand: [
- Spree.translations.sun,
- Spree.translations.mon,
- Spree.translations.tue,
- Spree.translations.wed,
- Spree.translations.thu,
- Spree.translations.fri,
- Spree.translations.sat]
- }
- flatpickr.l10ns.default.months = {
- longhand: [
- Spree.translations.lh_jan,
- Spree.translations.lh_feb,
- Spree.translations.lh_mar,
- Spree.translations.lh_apr,
- Spree.translations.lh_may,
- Spree.translations.lh_jun,
- Spree.translations.lh_jul,
- Spree.translations.lh_aug,
- Spree.translations.lh_sep,
- Spree.translations.lh_oct,
- Spree.translations.lh_nov,
- Spree.translations.lh_dec]
- }
-})
diff --git a/backend/app/helpers/spree/admin/base_helper.rb b/backend/app/helpers/spree/admin/base_helper.rb
index 7c8af2ca87..ae82a101e5 100644
--- a/backend/app/helpers/spree/admin/base_helper.rb
+++ b/backend/app/helpers/spree/admin/base_helper.rb
@@ -1,6 +1,18 @@
module Spree
module Admin
module BaseHelper
+ SELECT2_LOCALES = %w[
+ af ar az bg bn bs ca cs da de dsb el en eo es et eu fa fi fr gl he
+ hi hr hsb hu hy id is it ja ka km ko lt lv mk ms nb ne nl pa pl ps
+ pt pt-BR ro ru sk sl sq sr sr-Cyrl sv th tk tr uk vi zh-CN zh-TW
+ ].freeze
+
+ FLATPICKR_LOCALES = %w[
+ ar at az be bg bn bs cat cs cy da de eo es et fa fi fo fr ga gr he
+ hi hr hu id is it ja ka km ko kz lv mk mn ms my nl no pa pl pt ro ru
+ si sk sl sq sr-cyr sr sv th tr uk uz uz_latn vn zh-tw zh
+ ].freeze
+
def flash_alert(flash)
if flash.present?
message = flash[:error] || flash[:notice] || flash[:success]
@@ -204,20 +216,27 @@ module Spree
def select2_local_fallback
stripped_locale = I18n.locale.to_s.split('-').first
- all_select2_locales = %w[
- af ar az bg bn bs ca cs da de dsb el en eo es et eu fa fi fr gl he
- hi hr hsb hu hy id is it ja ka km ko lt lv mk ms nb ne nl pa pl ps
- pt pt-BR ro ru sk sl sq sr sr-Cyrl sv th tk tr uk vi zh-CN zh-TW
- ]
if ['zh-CN', 'zh-TW', 'sr-Cyrl', 'pt-BR'].include?(I18n.locale.to_s)
I18n.locale
- elsif all_select2_locales.include? stripped_locale
+ elsif SELECT2_LOCALES.include? stripped_locale
stripped_locale
else
'en'
end
end
+
+ def flatpickr_local_fallback
+ stripped_locale = I18n.locale.to_s.split('-').first
+
+ if ['sr-cyr', 'uz_latn', 'zh-tw'].include?(I18n.locale.to_s.parameterize)
+ I18n.locale.to_s.parameterize
+ elsif FLATPICKR_LOCALES.include? stripped_locale
+ stripped_locale
+ else
+ 'default'
+ end
+ end
end
end
end
diff --git a/backend/app/views/spree/admin/orders/index.html.erb b/backend/app/views/spree/admin/orders/index.html.erb
index 3bef4201cb..c49a067ee9 100644
--- a/backend/app/views/spree/admin/orders/index.html.erb
+++ b/backend/app/views/spree/admin/orders/index.html.erb
@@ -23,6 +23,7 @@
<div class="col-12 col-md-6 mb-3 mb-md-0">
<div class="input-group datePickerFrom"
data-wrap="true"
+ data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
data-max-date="<%= params[:q][:created_at_lt] %>">
<%= f.text_field :created_at_gt,
class: 'form-control js-filterable shadow-none',
@@ -36,6 +37,7 @@
<div class="col-12 col-md-6 mt-3 mt-md-0">
<div class="input-group datePickerTo"
data-wrap="true"
+ data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
data-min-date="<%= params[:q][:created_at_gt] %>">
<%= f.text_field :created_at_lt,
diff --git a/backend/app/views/spree/admin/products/_form.html.erb b/backend/app/views/spree/admin/products/_form.html.erb
index ef5ac8b82f..5e88a03696 100644
--- a/backend/app/views/spree/admin/products/_form.html.erb
+++ b/backend/app/views/spree/admin/products/_form.html.erb
@@ -66,6 +66,7 @@
<div class="input-group datePickerFrom"
data-wrap="true"
+ data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
data-max-date="<%= @product.discontinue_on %>">
<%= f.text_field :available_on,
@@ -86,6 +87,7 @@
<div class="input-group datePickerTo"
data-wrap="true"
+ data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
data-min-date="<%= @product.available_on %>">
<%= f.text_field :discontinue_on,
diff --git a/backend/app/views/spree/admin/products/new.html.erb b/backend/app/views/spree/admin/products/new.html.erb
index fabbcba321..04db38c3cc 100644
--- a/backend/app/views/spree/admin/products/new.html.erb
+++ b/backend/app/views/spree/admin/products/new.html.erb
@@ -44,7 +44,9 @@
<%= f.label :available_on, Spree.t(:available_on) %>
<%= f.error_message_on :available_on %>
- <div class="input-group datepicker" data-wrap="true">
+ <div class="input-group datepicker"
+ data-wrap="true"
+ data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>">
<%= f.text_field :available_on,
value: datepicker_field_value(@product.available_on),
placeholder: Spree.t(:select_a_date),
diff --git a/backend/app/views/spree/admin/promotions/_form.html.erb b/backend/app/views/spree/admin/promotions/_form.html.erb
index 20e2fab1b0..a91c98b720 100644
--- a/backend/app/views/spree/admin/promotions/_form.html.erb
+++ b/backend/app/views/spree/admin/promotions/_form.html.erb
@@ -63,7 +63,7 @@
<div class="input-group datePickerFrom"
data-wrap="true"
data-enable-time="true"
- data-date-format="<%= Spree.t('js_date_time', scope: 'date_picker') %>"
+ data-date-format="<%= Spree.t(:js_date_time, scope: 'date_picker', default: 'Y/m/d - H:i') %>"
data-max-date="<%= @promotion.expires_at %>">
<%= f.datetime_field :starts_at,
class: 'form-control shadow-none',
@@ -79,7 +79,7 @@
<div class="input-group datePickerTo"
data-wrap="true"
data-enable-time='true'
- data-date-format="<%= Spree.t('js_date_time', scope: 'date_picker') %>"
+ data-date-format="<%= Spree.t(:js_date_time, scope: 'date_picker', default: 'Y/m/d - H:i') %>"
data-min-date="<%= @promotion.starts_at %>">
<%= f.datetime_field :expires_at,
placeholder:Spree.t('ends_at'),
diff --git a/backend/app/views/spree/admin/shared/_report_order_criteria.html.erb b/backend/app/views/spree/admin/shared/_report_order_criteria.html.erb
index 5f052125c2..ad3bd04392 100644
--- a/backend/app/views/spree/admin/shared/_report_order_criteria.html.erb
+++ b/backend/app/views/spree/admin/shared/_report_order_criteria.html.erb
@@ -5,6 +5,7 @@
<div class="col-12 col-md-6 mb-3 mb-md-0">
<div class="input-group datePickerFrom"
data-wrap="true"
+ data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
data-max-date="<%= params[:q][:completed_at_lt] %>">
<%= s.text_field :completed_at_gt,
class: 'form-control shadow-none',
@@ -19,6 +20,7 @@
<div class="col-12 col-md-6 mt-3 mt-md-0">
<div class="input-group datePickerTo"
data-wrap="true"
+ data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
data-min-date="<%= params[:q][:completed_at_gt] %>">
<%= s.text_field :completed_at_lt,
diff --git a/backend/app/views/spree/admin/shared/_translations.html.erb b/backend/app/views/spree/admin/shared/_translations.html.erb
index 0411b58103..f2572e5123 100644
--- a/backend/app/views/spree/admin/shared/_translations.html.erb
+++ b/backend/app/views/spree/admin/shared/_translations.html.erb
@@ -10,40 +10,6 @@
confirm_delete: Spree.t(:confirm_delete),
currency_separator: I18n.t('number.currency.format.separator'),
cut: Spree.t(:cut),
-
- date_picker: Spree.t(:js_format, scope: 'date_picker', default: 'yy/mm/dd'),
- firstDay: Spree.t(:first_day, scope: 'date_picker', default: (0).to_i),
- rangeSep: Spree.t(:rangeSeparator, scope: 'date_picker', default: ' to '),
- weekAbbr: Spree.t(:weekAbbreviation, scope: 'date_picker', default: 'Wk'),
- scrollTitle: Spree.t(:scrollTitle, scope: 'date_picker', default: 'Scroll to increment'),
- toggleTitle: Spree.t(:toggleTitle, scope: 'date_picker', default: 'Click to toggle'),
- am: Spree.t(:am, scope: 'date_picker', default: 'AM'),
- pm: Spree.t(:pm, scope: 'date_picker', default: 'PM'),
- yearAriaLabel: Spree.t(:yearAriaLabel, scope: 'date_picker', default: 'Year'),
- hourAriaLabel: Spree.t(:hourAriaLabel, scope: 'date_picker', default: 'Hour'),
- minuteAriaLabel: Spree.t(:minuteAriaLabel, scope: 'date_picker', default: 'Minute'),
-
- sun: Spree.t(:sun, scope: 'date_picker', default: 'Sun'),
- mon: Spree.t(:mon, scope: 'date_picker', default: 'Mon'),
- tue: Spree.t(:tue, scope: 'date_picker', default: 'Tue'),
- wed: Spree.t(:wed, scope: 'date_picker', default: 'Wed'),
- thu: Spree.t(:thu, scope: 'date_picker', default: 'Thu'),
- fri: Spree.t(:fri, scope: 'date_picker', default: 'Fri'),
- sat: Spree.t(:sat, scope: 'date_picker', default: 'Sat'),
-
- lh_jan: Spree.t(:lh_jan, scope: 'date_picker', default: 'January'),
- lh_feb: Spree.t(:lh_feb, scope: 'date_picker', default: 'February'),
- lh_mar: Spree.t(:lh_mar, scope: 'date_picker', default: 'March'),
- lh_apr: Spree.t(:lh_apr, scope: 'date_picker', default: 'April'),
- lh_may: Spree.t(:lh_may, scope: 'date_picker', default: 'May'),
- lh_jun: Spree.t(:lh_jun, scope: 'date_picker', default: 'June'),
- lh_jul: Spree.t(:lh_jul, scope: 'date_picker', default: 'July'),
- lh_aug: Spree.t(:lh_aug, scope: 'date_picker', default: 'August'),
- lh_sep: Spree.t(:lh_sep, scope: 'date_picker', default: 'September'),
- lh_oct: Spree.t(:lh_oct, scope: 'date_picker', default: 'October'),
- lh_nov: Spree.t(:lh_nov, scope: 'date_picker', default: 'November'),
- lh_dec: Spree.t(:lh_dec, scope: 'date_picker', default: 'December'),
-
destroy: Spree.t(:destroy, scope: :actions),
edit: Spree.t(:edit, scope: :actions),
find_a_taxon: Spree.t(:find_a_taxon),
@@ -58,6 +24,8 @@
no_results: Spree.t(:no_results),
option_type_placeholder: Spree.t(:option_type_placeholder),
paste: Spree.t(:paste),
+ date_format: Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d'),
+ date_time_format: Spree.t(:js_date_time, scope: 'date_picker', default: 'Y/m/d - H:i'),
previous: Spree.t(:previous),
remove: Spree.t(:remove),
rename: Spree.t(:rename),
@@ -72,8 +40,11 @@
tags_placeholder: Spree.t(:tags_placeholder),
tracking: Spree.t(:tracking),
variant_placeholder: Spree.t(:variant_placeholder),
- value: Spree.t(:value)
- }.to_json %>
+ value: Spree.t(:value),
+ flatpickr_locale: "#{flatpickr_local_fallback}"
+ }.to_json
+%>
</script>
<%= javascript_include_tag "select2_locale_#{select2_local_fallback}" %>
+<%= javascript_include_tag "flatpickr/l10n/#{flatpickr_local_fallback}" %>
diff --git a/backend/app/views/spree/admin/variants/_form.html.erb b/backend/app/views/spree/admin/variants/_form.html.erb
index 8040abb5bd..4b3d3b26a7 100644
--- a/backend/app/views/spree/admin/variants/_form.html.erb
+++ b/backend/app/views/spree/admin/variants/_form.html.erb
@@ -42,7 +42,9 @@
<div class="form-group" data-hook="discontinue_on">
<%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
<%= f.error_message_on :discontinue_on %>
- <div class="input-group datepicker" data-wrap="true">
+ <div class="input-group datepicker"
+ data-wrap="true"
+ data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>">
<%= f.text_field :discontinue_on,
value: datepicker_field_value(@variant.discontinue_on),
placeholder: Spree.t(:select_a_date),
diff --git a/backend/config/initializers/assets.rb b/backend/config/initializers/assets.rb
index bea757265c..855a2bbfbc 100644
--- a/backend/config/initializers/assets.rb
+++ b/backend/config/initializers/assets.rb
@@ -1 +1 @@
-Rails.application.config.assets.precompile += %w(admin/* credit_cards/credit_card.gif)
+Rails.application.config.assets.precompile += %w(admin/* credit_cards/credit_card.gif flatpickr/l10n*)
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index f032de9a25..f8857d48a2 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -759,38 +759,10 @@ en:
date: Date
date_completed: Date Completed
date_picker:
- am: 'AM'
first_day: 0
format: ! '%Y/%m/%d'
- hourAriaLabel: 'Hour'
js_format: Y/m/d
js_date_time: Y/m/d - H:i
- minuteAriaLabel: 'Minute'
- pm: 'PM'
- rangeSeparator: ' to '
- scrollTitle: 'Scroll to increment'
- toggleTitle: 'Click to toggle'
- weekAbbreviation: 'Wk'
- yearAriaLabel: 'Year'
- sun: 'Sun'
- mon: 'Mon'
- tue: 'Tue'
- wed: 'Wed'
- thu: 'Thu'
- fri: 'Fri'
- sat: 'Sat'
- lh_jan: 'January'
- lh_feb: 'February'
- lh_mar: 'March'
- lh_apr: 'April'
- lh_may: 'May'
- lh_jun: 'June'
- lh_jul: 'July'
- lh_aug: 'August'
- lh_sep: 'September'
- lh_oct: 'October'
- lh_nov: 'November'
- lh_dec: 'December'
date_range: Date Range
default: Default
default_country_cannot_be_deleted: Default country cannot be deleted