correct error messages

3 files changed, 13 insertions, 20 deletions

diff --git a/app/models/referential.rb b/app/models/referential.rb
index a6910f66a..953038168 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -24,10 +24,10 @@ class Referential < ActiveRecord::Base
   def slug_excluded_values
     if ! slug.nil?
       if slug.start_with? "pg_" 
-        errors.add(:slug,"pg_excluded")
+        errors.add(:slug,I18n.t("referentials.errors.pg_excluded"))
       end
       if slug == 'public'
-        errors.add(:slug,"public_excluded")
+        errors.add(:slug,I18n.t("referentials.errors.public_excluded"))
       end
     end
   end
@@ -166,6 +166,7 @@ Rails.application.config.after_initialize do
       @referential ||= Referential.where(:slug => Apartment::Database.current_database).first!
     end
 
+    # override prefix for good prefix in objectid generation
     def prefix
       self.referential.prefix
     end
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 79eb8a110..e01e30fb4 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -161,6 +161,10 @@ fr:
         other: "Impossible d'enregistrer ce %{model} : %{count} erreurs"
       body: "Veuillez vérifier les champs suivants : "
 
+  activerecord:
+    errors:
+      messages:
+        taken: "n'est pas disponible"
   activemodel:
     errors:
       messages:
diff --git a/config/locales/referentials.yml b/config/locales/referentials.yml
index 5fb5cf3bb..ff09fc35d 100644
--- a/config/locales/referentials.yml
+++ b/config/locales/referentials.yml
@@ -17,16 +17,10 @@ en:
       destroy_confirm: "Do you confirm to destroy this data space ?"
       destroy: Destroy this data space
       edit: Edit this data space
-  activerecord:
     errors:
-      models:
-        referential:
-          slug:
-            pg_excluded: "code can't begins with pg_"
-            public_excluded: "public is reserved value"
-          attributes:
-            name:
-              taken: duplicate name
+      pg_excluded: "can't begins with pg_"
+      public_excluded: "public is reserved value"
+  activerecord:
     models:
       referential: 
         zero: Data space
@@ -85,16 +79,10 @@ fr:
       destroy_confirm: "Etes vous sûr de vouloir supprimer cet espace de données ?"
       destroy: Supprimer cet espace de données
       edit: Modifier cet espace de données
-  activerecord:
     errors:
-      models:
-        referential:
-          slug:
-            pg_excluded: "code ne peut commencer par pg_"
-            public_excluded: "public est une valeur réservée"
-          attributes:
-            name:
-              taken: "déjà utilisé pour un autre référentiel"
+      pg_excluded: "ne peut pas commencer par pg_ (valeurs réservées)"
+      public_excluded: "public est une valeur réservée"
+  activerecord:
     models:
       referential: 
         zero: Espace de Données