From 14f30a9b84da9d93219aa9e9759f93ef71ab3c7f Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Wed, 18 Apr 2018 15:55:19 +0200
Subject: Add layout for devise views, Fix i18n on menu, Delete unused elements
 Refs #6545 @1

---
 config/locales/layouts.en.yml |  2 +-
 config/locales/merges.en.yml  | 23 +++++++++++++++++++++++
 config/locales/merges.fr.yml  | 23 +++++++++++++++++++++++
 config/locales/merges.yml     | 23 -----------------------
 4 files changed, 47 insertions(+), 24 deletions(-)
 create mode 100644 config/locales/merges.en.yml
 create mode 100644 config/locales/merges.fr.yml
 delete mode 100644 config/locales/merges.yml

(limited to 'config')

diff --git a/config/locales/layouts.en.yml b/config/locales/layouts.en.yml
index 76a4d65d1..31bff403c 100644
--- a/config/locales/layouts.en.yml
+++ b/config/locales/layouts.en.yml
@@ -22,7 +22,7 @@ en:
         other: Current offers
       workbench_output:
         organisation: Organisation offers
-        idf: IDF offers
+        workgroup: Workgroup offers
       tools: Tools
       sync: Synchronization
       sync_icar: iCAR synchronization
diff --git a/config/locales/merges.en.yml b/config/locales/merges.en.yml
new file mode 100644
index 000000000..f9e90f1ef
--- /dev/null
+++ b/config/locales/merges.en.yml
@@ -0,0 +1,23 @@
+fr:
+  merges:
+    referential_name: "Merged offer %{date}"
+    index:
+      title: "Merged offers"
+    new:
+      title: "New merged offer"
+    show:
+      title: "Merged offer %{name}"
+    actions:
+      create: Merge data spaces
+  activerecord:
+    models:
+      merge: "Merged offer"
+    attributes:
+      merge:
+        created_at: "Created at"
+        started_at: Started at
+        name: Name
+        ended_at: Ended at
+        status: "Status"
+        creator: "Creator"
+        referentials: "Data spaces"
diff --git a/config/locales/merges.fr.yml b/config/locales/merges.fr.yml
new file mode 100644
index 000000000..345727b74
--- /dev/null
+++ b/config/locales/merges.fr.yml
@@ -0,0 +1,23 @@
+fr:
+  merges:
+    referential_name: "Offre finalisée %{date}"
+    index:
+      title: "Finalisations de l'offre"
+    new:
+      title: "Nouvelle finalisation de l'offre"
+    show:
+      title: "Finalisation de l'offre %{name}"
+    actions:
+      create: Finaliser des Jeux de Données
+  activerecord:
+    models:
+      merge: "Finalisation de l'offre"
+    attributes:
+      merge:
+        created_at: "Créé le"
+        started_at: Démarrage
+        name: Nom
+        ended_at: Achevé à
+        status: "Etat"
+        creator: "Demandeur"
+        referentials: "Jeux de données"
diff --git a/config/locales/merges.yml b/config/locales/merges.yml
deleted file mode 100644
index 345727b74..000000000
--- a/config/locales/merges.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-fr:
-  merges:
-    referential_name: "Offre finalisée %{date}"
-    index:
-      title: "Finalisations de l'offre"
-    new:
-      title: "Nouvelle finalisation de l'offre"
-    show:
-      title: "Finalisation de l'offre %{name}"
-    actions:
-      create: Finaliser des Jeux de Données
-  activerecord:
-    models:
-      merge: "Finalisation de l'offre"
-    attributes:
-      merge:
-        created_at: "Créé le"
-        started_at: Démarrage
-        name: Nom
-        ended_at: Achevé à
-        status: "Etat"
-        creator: "Demandeur"
-        referentials: "Jeux de données"
-- 
cgit v1.2.3