diff options
| author | jpl | 2017-03-17 13:05:00 +0100 |
|---|---|---|
| committer | jpl | 2017-03-17 13:05:12 +0100 |
| commit | 8504bcdd0f643ce2f07a7de38f1747cdfcb7fdb5 (patch) | |
| tree | 077d777483a1106606086dd97d119dd9a507806c | |
| parent | e95ef1aaa9676e6e1e20944bab34bc9e9062ee71 (diff) | |
| download | chouette-core-8504bcdd0f643ce2f07a7de38f1747cdfcb7fdb5.tar.bz2 | |
Refs #2859: fixing wording issues
| -rw-r--r-- | app/views/layouts/navigation/_main_nav_left.html.slim | 10 | ||||
| -rw-r--r-- | config/locales/line_referentials.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/line_referentials.fr.yml | 2 | ||||
| -rw-r--r-- | config/locales/referentials.fr.yml | 2 | ||||
| -rw-r--r-- | config/locales/routes.fr.yml | 6 | ||||
| -rw-r--r-- | spec/features/workbenches_spec.rb | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/app/views/layouts/navigation/_main_nav_left.html.slim b/app/views/layouts/navigation/_main_nav_left.html.slim index bcda959f7..5df421a50 100644 --- a/app/views/layouts/navigation/_main_nav_left.html.slim +++ b/app/views/layouts/navigation/_main_nav_left.html.slim @@ -34,11 +34,11 @@ = link_to '#', class: "list-group-item #{params[:controller] == 'workbenches' ? 'active' : ''}" do span Jeux de données = link_to '#', class: 'list-group-item' do - span Rapports d'import + span Import = link_to '#', class: 'list-group-item' do - span Modèles de calendrier + span Modèle de calendrier = link_to '#', class: 'list-group-item' do - span Rapports de contrôle + span Rapport de contrôle = link_to '#', class: 'list-group-item' do span Jeux de contrôle @@ -62,7 +62,7 @@ #miFour.panel-collapse.collapse .list-group = link_to line_referential_path(1), class: "list-group-item #{(@localizationUrl == 'line_referentials#show') ? 'active' : ''}" do - span Synchronisation iLLICO + span Synchronisation iLICO = link_to stop_area_referential_path(1), class: "list-group-item #{(@localizationUrl == 'stop_area_referentials#show') ? 'active' : ''}" do span Synchronisation iCAR @@ -82,7 +82,7 @@ = link_to Rails.application.config.try(:codifligne_url), target: '_blank', class: 'list-group-item' do span span.fa.fa-2x.fa-circle - |Codifligne (iLLICO) + |Codifligne (iLICO) = link_to Rails.application.config.try(:reflex_url), target: '_blank', class: 'list-group-item' do span diff --git a/config/locales/line_referentials.en.yml b/config/locales/line_referentials.en.yml index ad0782a38..7d84a24f8 100644 --- a/config/locales/line_referentials.en.yml +++ b/config/locales/line_referentials.en.yml @@ -7,7 +7,7 @@ en: edit: title: "Edit %{line_referential} referential" show: - title: "iLLICO synchronization" + title: "iLICO synchronization" activerecord: models: line_referential: diff --git a/config/locales/line_referentials.fr.yml b/config/locales/line_referentials.fr.yml index 0a0caacc8..d415b8172 100644 --- a/config/locales/line_referentials.fr.yml +++ b/config/locales/line_referentials.fr.yml @@ -7,7 +7,7 @@ fr: edit: title: "Modifier le référentiel %{line_referential}" show: - title: 'Synchronisation iLLICO' + title: 'Synchronisation iLICO' activerecord: models: line_referential: diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml index a85fdd6f7..43d131b75 100644 --- a/config/locales/referentials.fr.yml +++ b/config/locales/referentials.fr.yml @@ -27,7 +27,7 @@ fr: title: 'Dupliquer un JDD' submit: "Enregistrer" actions: - new: "Ajouter un jeu de données" + new: "Créer un jeu de données" destroy_confirm: "Etes vous sûr de vouloir supprimer ce jeu de données ?" destroy: "Supprimer ce jeu de données" edit: "Modifier ce jeu de données" diff --git a/config/locales/routes.fr.yml b/config/locales/routes.fr.yml index fbab1ce4a..7de3374b1 100644 --- a/config/locales/routes.fr.yml +++ b/config/locales/routes.fr.yml @@ -21,7 +21,7 @@ fr: title: "Itinéraire %{route} de la ligne %{line}" stop_points: "Liste des arrêts de l'itinéraire" journey_patterns: "Liste des missions" - no_opposite_route: "Aucun itinéraire associé en sens opposé" + no_opposite_route: "Aucun itinéraire associé" undefined: "Non défini" index: title: "Itinéraires" @@ -61,8 +61,8 @@ fr: wayback: "Sens" stop_points: "Nb arrêts" journey_patterns: "Nb missions" - opposite_route: "Itinéraire associé en sens opposé" - opposite_route_id: "Itinéraire associé en sens opposé" + opposite_route: "Itinéraire associé" + opposite_route_id: "Itinéraire associé" objectid: "Identifiant Neptune" object_version: "Version" created_at: "Créé le" diff --git a/spec/features/workbenches_spec.rb b/spec/features/workbenches_spec.rb index 1b3886985..068c382d6 100644 --- a/spec/features/workbenches_spec.rb +++ b/spec/features/workbenches_spec.rb @@ -29,7 +29,7 @@ describe 'Workbenches', type: :feature do it "create a new Referential with a specifed line and period" do visit workbench_path(workbench) - click_link "Ajouter un jeu de données" + click_link "Créer un jeu de données" fill_in "referential[name]", with: "Referential to test creation" # Nom du JDD fill_in "referential[slug]", with: "test" # Code |
