From 58164ee2ecc3dcc99cb0d4a4272daf35d1de2cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Fri, 7 Jun 2019 16:52:11 +0200 Subject: [PATCH] Show validation error at translation interface Only when present --- app/helpers/globalize_helper.rb | 11 +++++++++++ app/views/shared/_common_globalize_locales.html.erb | 1 + 2 files changed, 12 insertions(+) diff --git a/app/helpers/globalize_helper.rb b/app/helpers/globalize_helper.rb index fb33ae49e..65021b350 100644 --- a/app/helpers/globalize_helper.rb +++ b/app/helpers/globalize_helper.rb @@ -67,6 +67,17 @@ module GlobalizeHelper t("shared.translations.languages_in_use_html", count: active_languages_count(resource)) end + def select_language_error(resource) + return if resource.blank? + + current_translation = resource.translation_for(selected_locale(resource)) + if current_translation.errors.added? :base, :translations_too_short + content_tag :div, class: "small error" do + current_translation.errors[:base].join(", ") + end + end + end + def active_languages_count(resource) if resource.blank? no_resource_languages_count diff --git a/app/views/shared/_common_globalize_locales.html.erb b/app/views/shared/_common_globalize_locales.html.erb index c7250a718..43232b2b9 100644 --- a/app/views/shared/_common_globalize_locales.html.erb +++ b/app/views/shared/_common_globalize_locales.html.erb @@ -10,6 +10,7 @@ options_for_select_language(resource), prompt: t("shared.translations.select_language_prompt"), class: "js-select-language" %> + <%= select_language_error(resource) %>
<% if manage_languages %> <% I18n.available_locales.each do |locale| %>