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.

Respect Taiwanese language with Flatpickr.

Matthew Kennedyd7251a4ba9c1
diff --git a/backend/app/helpers/spree/admin/base_helper.rb b/backend/app/helpers/spree/admin/base_helper.rb
index 43ce4c2cda..a3967587f1 100644
--- a/backend/app/helpers/spree/admin/base_helper.rb
+++ b/backend/app/helpers/spree/admin/base_helper.rb
@@ -229,7 +229,11 @@ module Spree
def flatpickr_local_fallback
stripped_locale = I18n.locale.to_s.split('-').first
- if FLATPICKR_SUPPORTED_LOCALES.include? stripped_locale
+ if I18n.locale.to_s == 'zh-TW'
+ # Taiwanese is a popular language in Spree,
+ # it has been well translated.
+ 'zh-tw'
+ elsif FLATPICKR_SUPPORTED_LOCALES.include? stripped_locale
stripped_locale
else
'default'
diff --git a/backend/app/views/spree/admin/shared/_translations.html.erb b/backend/app/views/spree/admin/shared/_translations.html.erb
index f2572e5123..5fa1585dee 100644
--- a/backend/app/views/spree/admin/shared/_translations.html.erb
+++ b/backend/app/views/spree/admin/shared/_translations.html.erb
@@ -41,7 +41,10 @@
tracking: Spree.t(:tracking),
variant_placeholder: Spree.t(:variant_placeholder),
value: Spree.t(:value),
- flatpickr_locale: "#{flatpickr_local_fallback}"
+
+ # Substitute - for _ converting zh-tw to zh_tw
+ # Flatpickr not making things easy here.
+ flatpickr_locale: "#{flatpickr_local_fallback.sub("-", "_")}"
}.to_json
%>
</script>