From 97eab7445d7a2549ce5c9bfdacb89aff72b49c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?=
 <senenrodero@gmail.com>
Date: Wed, 5 Jun 2019 18:32:13 +0200
Subject: [PATCH] Move translations from admin.yml to general.yml

After extract translation interface partials from admin
folder translations should be placed in general.yml file
inside shared context.
---
 app/views/shared/_common_globalize_locales.html.erb | 6 +++---
 config/locales/en/admin.yml                         | 4 ----
 config/locales/es/admin.yml                         | 4 ----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/views/shared/_common_globalize_locales.html.erb b/app/views/shared/_common_globalize_locales.html.erb
index 514d1faf2..c7250a718 100644
--- a/app/views/shared/_common_globalize_locales.html.erb
+++ b/app/views/shared/_common_globalize_locales.html.erb
@@ -8,12 +8,12 @@
     </span>
     <%= select_tag :select_language,
                    options_for_select_language(resource),
-                   prompt: t("admin.translations.select_language_prompt"),
+                   prompt: t("shared.translations.select_language_prompt"),
                    class: "js-select-language" %>
     <div class="margin-bottom">
       <% if manage_languages %>
         <% I18n.available_locales.each do |locale| %>
-          <%= link_to t("admin.translations.remove_language"), "#",
+          <%= link_to t("shared.translations.remove_language"), "#",
                       style: display_destroy_locale_style(resource, locale),
                       class: "delete js-delete-language js-delete-#{locale}",
                       data: { locale: locale } %>
@@ -25,7 +25,7 @@
     <% if manage_languages %>
       <%= select_tag :add_language,
                      options_for_add_language,
-                     prompt: t("admin.translations.add_language"),
+                     prompt: t("shared.translations.add_language"),
                      class: "js-add-language" %>
     <% end %>
   </div>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index af3441f46..b097258fa 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -1630,10 +1630,6 @@ en:
         submit_header: Save header
         card_title: Edit card
         submit_card: Save card
-    translations:
-      select_language_prompt: "Choose language"
-      remove_language: Remove language
-      add_language: Add language
     change_log:
       title: "Change Log"
       id: "ID"
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 7d4f7b88d..8c46fc408 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -1628,10 +1628,6 @@ es:
         submit_header: Guardar encabezado
         card_title: Editar tarjeta
         submit_card: Guardar tarjeta
-    translations:
-      select_language_prompt: "Seleccionar idioma"
-      remove_language: Eliminar idioma
-      add_language: Añadir idioma
     change_log:
       title: "Historial"
       id: "ID"