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.

Added LocaleHelper#locale_full_name

Damian Legawiec84c454ffa463
diff --git a/backend/app/views/spree/admin/menus/index.html.erb b/backend/app/views/spree/admin/menus/index.html.erb
index 4dc14bb89e..a7e291c0c3 100644
--- a/backend/app/views/spree/admin/menus/index.html.erb
+++ b/backend/app/views/spree/admin/menus/index.html.erb
@@ -70,7 +70,7 @@
<%= menu.store.unique_name %>
</td>
<td>
- <%= menu.locale %>
+ <%= locale_full_name(menu.locale) %>
</td>
<td class="actions" data-hook="admin_menus_index_row_actions">
<span class="d-flex justify-content-end">
diff --git a/core/app/helpers/spree/locale_helper.rb b/core/app/helpers/spree/locale_helper.rb
index 9a5da9089a..d930e139ad 100644
--- a/core/app/helpers/spree/locale_helper.rb
+++ b/core/app/helpers/spree/locale_helper.rb
@@ -16,12 +16,16 @@ module Spree
def locale_presentation(locale)
if I18n.exists?('spree.i18n.this_file_language', locale: locale)
- [Spree.t('i18n.this_file_language', locale: locale), locale.to_s]
+ [locale_full_name(locale), locale.to_s]
else
locale.to_s == 'en' ? ['English (US)', 'en'] : [locale, locale.to_s]
end
end
+ def locale_full_name(locale)
+ Spree.t('i18n.this_file_language', locale: locale)
+ end
+
def should_render_locale_dropdown?
return false if current_store.nil?
diff --git a/frontend/app/helpers/spree/store_helper.rb b/frontend/app/helpers/spree/store_helper.rb
index 6e3bab088c..d6acf2d2f2 100644
--- a/frontend/app/helpers/spree/store_helper.rb
+++ b/frontend/app/helpers/spree/store_helper.rb
@@ -1,5 +1,7 @@
module Spree
module StoreHelper
+ include LocaleHelper
+
def store_country_iso(store = nil)
store ||= current_store if defined?(current_store)
@@ -22,7 +24,7 @@ module Spree
return unless store
return store.name if store.default_locale.blank?
- Spree.t('i18n.this_file_language', locale: store.default_locale)
+ locale_full_name(store.default_locale)
end
def should_render_store_chooser?