diff options
| author | Michel Etienne | 2015-10-26 16:28:01 +0100 |
|---|---|---|
| committer | Michel Etienne | 2015-10-26 16:28:01 +0100 |
| commit | da5dab112c875ac4e63089270b5ca3504cb73fa8 (patch) | |
| tree | f4a68594d5cf398ee99316552e7ec92088cf5fbf /config | |
| parent | 801c4a73eb3c2bf2ba756949fccdc587740b2284 (diff) | |
| download | chouette-core-da5dab112c875ac4e63089270b5ca3504cb73fa8.tar.bz2 | |
HUB profile corrcetions
Diffstat (limited to 'config')
| -rw-r--r-- | config/deploy/private.rb | 2 | ||||
| -rw-r--r-- | config/deploy/unstable.rb | 2 | ||||
| -rw-r--r-- | config/locales/group_of_lines.yml | 4 | ||||
| -rw-r--r-- | config/locales/referentials.yml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/config/deploy/private.rb b/config/deploy/private.rb index 0a9cb5e0c..44823408f 100644 --- a/config/deploy/private.rb +++ b/config/deploy/private.rb @@ -1,3 +1,3 @@ server "chouette-private.marseille.cityway.fr", :app, :web, :db, :primary => true -set :branch, "V2_5" +set :branch, "V3_1" set :gui_cmd, "2.5.2" diff --git a/config/deploy/unstable.rb b/config/deploy/unstable.rb index d363a6fa4..4fab428c7 100644 --- a/config/deploy/unstable.rb +++ b/config/deploy/unstable.rb @@ -1,3 +1,3 @@ server "chouette-p.aix.cityway.fr", :app, :web, :db, :primary => true -set :branch, "master" +set :branch, "V3_1" #set :gui_cmd, "2.5.2" diff --git a/config/locales/group_of_lines.yml b/config/locales/group_of_lines.yml index d92cc3410..53e8021a6 100644 --- a/config/locales/group_of_lines.yml +++ b/config/locales/group_of_lines.yml @@ -55,7 +55,7 @@ en: registration_number: "Positif integer." objectid: "[prefix]:GroupOfLine:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character" hub: - group_of_lines: + group_of_line: name: "maximum 75 characters" registration_number: "Positif integer, unique key, of no more than 8 digits." objectid: "[prefix]:GroupOfLine:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 6." @@ -117,7 +117,7 @@ fr: registration_number: "Entier positif." objectid: "[prefixe]:GroupOfLine:[clé_unique] caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'" hub: - group_of_lines: + group_of_line: name: "maximum 75 caractères" registration_number: "Entier positif, clé unique, d'un maximum de 8 chiffres." objectid: "[prefixe]:GroupOfLine:[clé_unique] caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'. Longueur maximale de la clé unique = 6." diff --git a/config/locales/referentials.yml b/config/locales/referentials.yml index c23e748d3..22e923be7 100644 --- a/config/locales/referentials.yml +++ b/config/locales/referentials.yml @@ -144,7 +144,7 @@ fr: exports: "Exports" compliance_checks: "Validations" rule_parameter_sets: "Jeux de paramètres" - data_format_restrictions: "Appliquer les contraintes de format des données" + data_format_restrictions: "Format d'export privilégié" data_format: "Format d'export privilégié" formtastic: titles: |