From e6762d6bcacc9c9feb5d629b138f26bc59c5ac17 Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Fri, 21 Sep 2018 20:50:23 +0200
Subject: [PATCH] handle non-underscored locale names for cktext_area

---
 app/helpers/translatable_form_helper.rb         | 11 ++++++++++-
 .../admin/poll/questions/answers/_form.html.erb | 17 +----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/app/helpers/translatable_form_helper.rb b/app/helpers/translatable_form_helper.rb
index 41aa1181a..14d5b5b66 100644
--- a/app/helpers/translatable_form_helper.rb
+++ b/app/helpers/translatable_form_helper.rb
@@ -35,6 +35,10 @@ module TranslatableFormHelper
       translatable_field(:text_area, method, options)
     end
 
+    def translatable_cktext_area(method, options = {})
+      translatable_field(:cktext_area, method, options)
+    end
+
     private
 
       def translatable_field(field_type, method, options = {})
@@ -47,7 +51,12 @@ module TranslatableFormHelper
               final_options = @template.merge_translatable_field_options(options, locale)
                                        .reverse_merge(label: label_without_locale)
 
-              @template.concat send(field_type, localized_attr_name, final_options)
+              if field_type == :cktext_area
+                @template.concat content_tag :span, send(field_type, localized_attr_name, final_options),
+                                             @template.merge_translatable_field_options(options, locale)
+              else
+                @template.concat send(field_type, localized_attr_name, final_options)
+              end
             end
           end
         end
diff --git a/app/views/admin/poll/questions/answers/_form.html.erb b/app/views/admin/poll/questions/answers/_form.html.erb
index 975f0995e..1ca05d9ab 100644
--- a/app/views/admin/poll/questions/answers/_form.html.erb
+++ b/app/views/admin/poll/questions/answers/_form.html.erb
@@ -9,22 +9,7 @@
   <%= f.translatable_text_field :title %>
 
   <div class="ckeditor">
-    <%= f.label :description, t("admin.shared.description") %>
-    <% @answer.globalize_locales.each do |locale| %>
-      <% globalize(locale) do %>
-        <%= content_tag :span, class: "js-globalize-attribute",
-                               data: { locale: locale },
-                               style: display_translation?(locale) do %>
-
-          <%= f.cktext_area "description_#{locale}",
-                            maxlength: Poll::Question.description_max_length,
-                            ckeditor: { language: locale },
-                            class: "js-globalize-attribute",
-                            data: { locale: locale },
-                            label: false %>
-        <% end %>
-      <% end %>
-    <% end %>
+    <%= f.translatable_cktext_area :description, maxlength: Poll::Question.description_max_length %>
   </div>
 
   <div class="small-12 medium-4 large-2 margin-top">