diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/deploy.rb | 2 | ||||
| -rw-r--r-- | config/locales/calendars.en.yml | 5 | ||||
| -rw-r--r-- | config/locales/calendars.fr.yml | 5 | ||||
| -rw-r--r-- | config/locales/compliance_check_sets.fr.yml | 4 | ||||
| -rw-r--r-- | config/locales/imports.en.yml | 4 | ||||
| -rw-r--r-- | config/locales/imports.fr.yml | 4 | ||||
| -rw-r--r-- | config/locales/lines.fr.yml | 2 | ||||
| -rw-r--r-- | config/locales/referentials.en.yml | 3 | ||||
| -rw-r--r-- | config/locales/referentials.fr.yml | 3 | ||||
| -rw-r--r-- | config/locales/stop_areas.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/stop_areas.fr.yml | 2 |
11 files changed, 24 insertions, 12 deletions
diff --git a/config/deploy.rb b/config/deploy.rb index a8d44d3e5..33771507f 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -90,6 +90,6 @@ namespace :deploy do desc "Run db:seed" task :seed do - run "cd #{current_path} && #{bundle_cmd} exec /var/lib/gems/2.2.0/bin/rake db:seed RAILS_ENV=#{rails_env}" + run "cd #{current_path} && #{rake} db:seed RAILS_ENV=#{rails_env}" end end diff --git a/config/locales/calendars.en.yml b/config/locales/calendars.en.yml index 0076e5207..d3cc57677 100644 --- a/config/locales/calendars.en.yml +++ b/config/locales/calendars.en.yml @@ -56,8 +56,9 @@ en: end: End activerecord: models: - one: calendar - other: calendars + calendar: + one: calendar + other: calendars attributes: calendar: name: Name diff --git a/config/locales/calendars.fr.yml b/config/locales/calendars.fr.yml index fddb47d64..fc895bf89 100644 --- a/config/locales/calendars.fr.yml +++ b/config/locales/calendars.fr.yml @@ -56,8 +56,9 @@ fr: end: Fin activerecord: models: - one: "calendrier" - other: "calendriers" + calendar: + one: "calendrier" + other: "calendriers" attributes: calendar: name: Nom diff --git a/config/locales/compliance_check_sets.fr.yml b/config/locales/compliance_check_sets.fr.yml index 8f1c066e7..8c4561ae9 100644 --- a/config/locales/compliance_check_sets.fr.yml +++ b/config/locales/compliance_check_sets.fr.yml @@ -10,7 +10,7 @@ fr: name_compliance_control_set: Indiquez le nom d'un jeu de contrôle error_period_filter: La date de fin doit être supérieure ou égale à la date de début0 index: - title: "Liste des jeux de contrôles" + title: "Liste des rapports de contrôles" search_no_results: Aucun rapport de contrôle ne correspond à votre recherche executed: title: Jeu de contrôles exécutés %{name} @@ -24,7 +24,7 @@ fr: activerecord: attributes: compliance_check_set: - ref: réf + ref: Ref creation_date: Date et heure de création associated_object: Objet associé assigned_to: Affectation diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml index 0bb54d90d..462b17196 100644 --- a/config/locales/imports.en.yml +++ b/config/locales/imports.en.yml @@ -74,3 +74,7 @@ en: max_distance_for_connection_link: "Max distance for connection link" ignore_last_word: "ignore last word" ignore_end_chars: "ignore last chars" + flash: + imports: + create: + notice: "The import is in progress. Please wait and refresh the page in a few moments." diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml index 207f5cc31..b545f90df 100644 --- a/config/locales/imports.fr.yml +++ b/config/locales/imports.fr.yml @@ -74,3 +74,7 @@ fr: max_distance_for_connection_link: "Distance max pour créer les correspondances" ignore_last_word: "ignorer le dernier mot" ignore_end_chars: "ignorer les n derniers caractères" + flash: + imports: + create: + notice: "L'import est en cours, veuillez patienter. Actualiser votre page si vous voulez voir l'avancement de votre traitement." diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml index 35f8792f4..36254d754 100644 --- a/config/locales/lines.fr.yml +++ b/config/locales/lines.fr.yml @@ -74,7 +74,7 @@ fr: deactivated: "Activé" name: "Nom de la ligne" published_name: "Nom public" - number: "Nom court" + number: "Numéro" transport_mode: "Mode de transport" transport_submode: "Sous mode de transport" seasonal: "Saisonnière" diff --git a/config/locales/referentials.en.yml b/config/locales/referentials.en.yml index 8420e9539..f41e35446 100644 --- a/config/locales/referentials.en.yml +++ b/config/locales/referentials.en.yml @@ -5,7 +5,6 @@ en: name: 'Search by name' line: 'Seach by associated lines' search_no_results: 'No data space matching your query' - operation_in_progress: The validation process is in progress error_period_filter: "The period filter must have valid bounding dates" index: title: 'Data spaces' @@ -126,6 +125,8 @@ en: notice: referentials: deleted: "Datasets has been successfully destroyed" + duplicate: "The duplication is in progress. Please wait and refresh the page in a few moments." + validate: "The validation is in progress. Please wait and refresh the page in a few moments." referential: archived: "The data space has been successfully archived" unarchived: "The data space has been successfully unarchived" diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml index ec7ed776d..9250a033c 100644 --- a/config/locales/referentials.fr.yml +++ b/config/locales/referentials.fr.yml @@ -5,7 +5,6 @@ fr: name: 'Indiquez un nom de jeu de données...' line: 'Indiquez une ligne...' search_no_results: 'Aucun jeu de données ne correspond à votre recherche' - operation_in_progress: L'opération de validation est en cours error_period_filter: "Le filtre par période doit contenir une date de début et de fin valides" index: title: 'Jeux de données' @@ -124,6 +123,8 @@ fr: notice: referentials: deleted: "Les jeux de données on été supprimés" + duplicate: "La duplication est en cours, veuillez patienter. Actualiser votre page si vous voulez voir l'avancement de votre traitement." + validate: "La validation est en cours, veuillez patienter. Actualiser votre page si vous voulez voir l'avancement de votre traitement." referential: archived: "Le jeu de données a été correctement conservé" unarchived: "Le jeu de données a été correctement déconservé" diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml index 324294892..54a5ebae5 100644 --- a/config/locales/stop_areas.en.yml +++ b/config/locales/stop_areas.en.yml @@ -15,7 +15,7 @@ en: actions: new: "Add a new stop" edit: "Edit this stop" - destroy: "Remove this stop" + destroy: "Remove" deleted_at: "Activated" destroy_confirm: "Are you sure you want destroy this stop and all of his children ?" select_parent: "Create or modify the relation child -> parent" diff --git a/config/locales/stop_areas.fr.yml b/config/locales/stop_areas.fr.yml index bf4dd832f..f96a2e564 100644 --- a/config/locales/stop_areas.fr.yml +++ b/config/locales/stop_areas.fr.yml @@ -15,7 +15,7 @@ fr: actions: new: "Ajouter un arrêt" edit: "Editer cet arrêt" - destroy: "Supprimer cet arrêt" + destroy: "Supprimer" deleted_at: "Activé" destroy_confirm: "Etes vous sûr de supprimer cet arrêt ainsi que tous ses fils?" select_parent: "Créer ou éditer la relation enfant -> parent" |
