diff options
| author | Michel Etienne | 2013-10-17 12:29:13 +0200 |
|---|---|---|
| committer | Michel Etienne | 2013-10-17 12:29:13 +0200 |
| commit | aac3d7ebb9de599dfe646c525dcc7fb8812593f0 (patch) | |
| tree | 52f78e01cd0c4f3a435b5f89d76b5deb3ed6fa83 /config | |
| parent | 1cfea5618451d179b7909483836980fa4984af77 (diff) | |
| parent | b18982f41f9910c5ffb70d4d073a7b5940ee5d38 (diff) | |
| download | chouette-core-aac3d7ebb9de599dfe646c525dcc7fb8812593f0.tar.bz2 | |
Merge branch 'V2_1_0'
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/apartment.rb | 2 | ||||
| -rw-r--r-- | config/locales/referentials.yml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb index 4bc95f829..b9873db1b 100644 --- a/config/initializers/apartment.rb +++ b/config/initializers/apartment.rb @@ -1,6 +1,6 @@ Apartment.configure do |config| # set your options (described below) here - config.excluded_models = ["Referential", "Organisation", "User", "Import", "ImportLogMessage", "Export", "ExportLogMessage", "Delayed::Backend::ActiveRecord::Job", "Api::V1::ApiKey"] # these models will not be multi-tenanted, but remain in the global (public) namespace + config.excluded_models = ["Referential", "Organisation", "User", "Import", "ImportLogMessage", "Export", "ExportLogMessage","FileValidation", "FileValidationLogMessage", "Delayed::Backend::ActiveRecord::Job", "Api::V1::ApiKey"] # these models will not be multi-tenanted, but remain in the global (public) namespace # Dynamically get database names to migrate config.database_names = lambda{ Referential.pluck(:slug) } diff --git a/config/locales/referentials.yml b/config/locales/referentials.yml index 7049949b9..d39ec4bcc 100644 --- a/config/locales/referentials.yml +++ b/config/locales/referentials.yml @@ -26,7 +26,8 @@ en: edit: "Edit this data space" errors: pg_excluded: "can't begins with pg_" - public_excluded: "public is reserved value" + public_excluded: "public is a reserved value" + user_excluded: "%{user} is a reserved value" activerecord: models: referential: @@ -98,6 +99,7 @@ fr: errors: pg_excluded: "ne peut pas commencer par pg_ (valeurs réservées)" public_excluded: "public est une valeur réservée" + user_excluded: "%{user} est une valeur réservée" activerecord: models: referential: |