From 1f033383e55bc44ed738b38ee001963783647cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 11 Oct 2018 02:06:45 +0200 Subject: [PATCH] Refactor `globalize_locales` partials to increase DRYness --- .../shared/_common_globalize_locales.html.erb | 27 +++++++++++++++++ .../admin/shared/_globalize_locales.html.erb | 30 ++----------------- .../_globalize_locales.html.erb | 30 ++----------------- 3 files changed, 33 insertions(+), 54 deletions(-) create mode 100644 app/views/admin/shared/_common_globalize_locales.html.erb diff --git a/app/views/admin/shared/_common_globalize_locales.html.erb b/app/views/admin/shared/_common_globalize_locales.html.erb new file mode 100644 index 000000000..d9aac8376 --- /dev/null +++ b/app/views/admin/shared/_common_globalize_locales.html.erb @@ -0,0 +1,27 @@ +<% I18n.available_locales.each do |locale| %> + <%= link_to t("admin.translations.remove_language"), "#", + id: "delete-#{locale}", + style: display_translation_style(resource, locale), + class: 'float-right delete js-delete-language', + data: { locale: locale } %> + +<% end %> + + + +
+ <%= select_tag :translation_locale, + options_for_locale_select, + prompt: t("admin.translations.add_language"), + class: "js-globalize-locale" %> +
diff --git a/app/views/admin/shared/_globalize_locales.html.erb b/app/views/admin/shared/_globalize_locales.html.erb index ccce00524..1dd35e79e 100644 --- a/app/views/admin/shared/_globalize_locales.html.erb +++ b/app/views/admin/shared/_globalize_locales.html.erb @@ -1,27 +1,3 @@ -<% I18n.available_locales.each do |locale| %> - <%= link_to t("admin.translations.remove_language"), "#", - id: "delete-#{locale}", - style: display_translation_style(resource, locale), - class: 'float-right delete js-delete-language', - data: { locale: locale } %> - -<% end %> - - - -
- <%= select_tag :translation_locale, - options_for_locale_select, - prompt: t("admin.translations.add_language"), - class: "js-globalize-locale" %> -
+<%= render "admin/shared/common_globalize_locales", + resource: resource, + display_style: lambda { |locale| enable_translation_style(resource, locale) } %> diff --git a/app/views/admin/site_customization/information_texts/_globalize_locales.html.erb b/app/views/admin/site_customization/information_texts/_globalize_locales.html.erb index 722e34d13..ebb900379 100644 --- a/app/views/admin/site_customization/information_texts/_globalize_locales.html.erb +++ b/app/views/admin/site_customization/information_texts/_globalize_locales.html.erb @@ -1,27 +1,3 @@ -<% I18n.available_locales.each do |locale| %> - <%= link_to t("admin.translations.remove_language"), "#", - id: "delete-#{locale}", - style: site_customization_display_translation_style(locale), - class: 'float-right delete js-delete-language', - data: { locale: locale } %> - -<% end %> - - - -
- <%= select_tag :translation_locale, - options_for_locale_select, - prompt: t("admin.translations.add_language"), - class: "js-globalize-locale" %> -
+<%= render "admin/shared/common_globalize_locales", + resource: nil, + display_style: lambda { |locale| site_customization_display_translation_style(locale) } %>