Merge branch 'issue-15068' into production.panel.sutty.nl

app/views/posts/attributes/_new_array.haml

@@ -43,7 +43,7 @@
       .input-group.w-auto.flex-grow-1.my-0
         %input.form-control{ form: form_id, name: 'value', type: 'text', placeholder: t('.add_new') }
         .input-group-append
-          = render 'bootstrap/btn', content: t('.add'), form: form_id, type: 'submit', class: 'mb-0 mr-0'
+          = render 'bootstrap/btn', content: t('.add', layout: ''), form: form_id, type: 'submit', class: 'mb-0 mr-0'
       = render 'bootstrap/btn', content: t('.accept'), action: 'array#accept modal#hide', class: 'm-0 mr-1'
       = render 'bootstrap/btn', content: t('.cancel'), action: 'array#cancel modal#hide', class: 'm-0'
 

config/locales/en.yml

@@ -720,24 +720,6 @@ en:
     new_array:
       remove: "Remove"
     attributes:
-      new_has_many:
-        edit: "Edit"
-        filter: "Start typing to filter..."
-        accept: "Accept"
-        cancel: "Cancel"
-        add: "Add %{layout}"
-      new_predefined_array:
-        edit: "Edit"
-        filter: "Start typing to filter..."
-        accept: "Accept"
-        cancel: "Cancel"
-      new_array:
-        edit: "Edit"
-        filter: "Start typing to filter..."
-        add_new: "Add new option"
-        add: "Add"
-        accept: "Accept"
-        cancel: "Cancel"
       add: Add
       lang:
         label: Language
@@ -956,3 +938,11 @@ en:
       remove: 'Back'
   indexed_posts:
     deleted: "Deleted indexed post %{path} from %{site} (records: %{records})"
+  bootstrap:
+    modal:
+      accept: "Accept"
+      add: "Add %{layout}"
+      add_new: "Add new option"
+      cancel: "Cancel"
+      edit: "Edit"
+      filter: "Start typing to filter..."

config/locales/es.yml

@@ -728,24 +728,6 @@ es:
     new_array:
       remove: "Eliminar"
     attributes:
-      new_has_many:
-        edit: "Editar"
-        filter: "Empezá a escribir para filtrar..."
-        accept: "Aceptar"
-        cancel: "Cancelar"
-        add: "Agregar %{layout}"
-      new_predefined_array:
-        edit: "Editar"
-        filter: "Empezá a escribir para filtrar..."
-        accept: "Aceptar"
-        cancel: "Cancelar"
-      new_array:
-        edit: "Editar"
-        filter: "Empezá a escribir para filtrar..."
-        add_new: "Agregar nueva opción"
-        add: "Agregar"
-        accept: "Aceptar"
-        cancel: "Cancelar"
       add: Agregar
       lang:
         label: Idioma
@@ -964,3 +946,11 @@ es:
       remove: 'Volver'
   indexed_posts:
     deleted: "Eliminado artículo %{path} de %{site} (filas: %{records})"
+  bootstrap:
+    modal:
+      accept: "Aceptar"
+      add: "Agregar %{layout}"
+      add_new: "Agregar nueva opción"
+      cancel: "Cancelar"
+      edit: "Editar"
+      filter: "Empezá a escribir para filtrar..."