_translations.html.erb in spree_backend-4.2.0.rc5

- old
+ new

@@ -8,44 +8,10 @@
     cancel:                   Spree.t(:cancel,  scope: :actions),
     choose_a_customer:        Spree.t(:choose_a_customer),
     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),
     item_stock_placeholder:   Spree.t(:choose_location),
     loading:                  Spree.t(:loading),
@@ -56,10 +22,12 @@
     new_taxon:                Spree.t(:new_taxon),
     next:                     Spree.t(:next),
     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),
     save:                     Spree.t(:save,    scope: :actions),
     searching:                Spree.t(:searching),
@@ -70,13 +38,16 @@
     taxon_placeholder:        Spree.t(:taxon_placeholder),
     taxonomy_tree_error:      Spree.t(:taxonomy_tree_error),
     tags_placeholder:         Spree.t(:tags_placeholder),
     tracking:                 Spree.t(:tracking),
     variant_placeholder:      Spree.t(:variant_placeholder),
-    value:                    Spree.t(:value)
+    value:                    Spree.t(:value),
+
+                              # Substitute - for _ converting zh-tw to zh_tw
+                              # Flatpickr not making things easy here.
+    flatpickr_locale:         "#{flatpickr_local_fallback.sub("-", "_")}"
   }.to_json
 %>
 </script>
 
-<% if I18n.locale != :en %>
-  <%= javascript_include_tag "select2_locale_#{I18n.locale}" %>
-<% end %>
+<%= javascript_include_tag "select2_locale_#{select2_local_fallback}" %>
+<%= javascript_include_tag "flatpickr/l10n/#{flatpickr_local_fallback}" %>