aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorLuc Donnet2018-04-18 15:55:19 +0200
committerLuc Donnet2018-04-19 09:31:18 +0200
commit14f30a9b84da9d93219aa9e9759f93ef71ab3c7f (patch)
treef531d2478a62233581b26dfa2ac57fea384bd01b /config
parente5b11ab69698502c1642652e3c1249c2abd573b2 (diff)
downloadchouette-core-14f30a9b84da9d93219aa9e9759f93ef71ab3c7f.tar.bz2
Add layout for devise views, Fix i18n on menu, Delete unused elements Refs #6545 @1
Diffstat (limited to 'config')
-rw-r--r--config/locales/layouts.en.yml2
-rw-r--r--config/locales/merges.en.yml23
-rw-r--r--config/locales/merges.fr.yml (renamed from config/locales/merges.yml)0
3 files changed, 24 insertions, 1 deletions
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.yml b/config/locales/merges.fr.yml
index 345727b74..345727b74 100644
--- a/config/locales/merges.yml
+++ b/config/locales/merges.fr.yml