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.

VEN-400 Map all locales to Local Language name (#11639)

Aleksandar Petrushevbe7123b9caec
diff --git a/core/app/helpers/spree/locale_helper.rb b/core/app/helpers/spree/locale_helper.rb
index 37a4203566..7324408e4f 100644
--- a/core/app/helpers/spree/locale_helper.rb
+++ b/core/app/helpers/spree/locale_helper.rb
@@ -17,8 +17,12 @@ module Spree
def locale_presentation(locale)
if I18n.exists?('spree.i18n.this_file_language', locale: locale, fallback: false)
[locale_full_name(locale), locale.to_s]
+ elsif defined?(SpreeI18n::Locale) && (language_name = SpreeI18n::Locale.local_language_name(locale))
+ ["#{language_name} (#{locale})", locale.to_s]
+ elsif locale.to_s == 'en'
+ ['English (US)', 'en']
else
- locale.to_s == 'en' ? ['English (US)', 'en'] : [locale, locale.to_s]
+ [locale, locale.to_s]
end
end