diff options
| author | cedricnjanga | 2018-05-14 17:41:39 -0700 | 
|---|---|---|
| committer | cedricnjanga | 2018-05-14 17:41:39 -0700 | 
| commit | 7b03179f4b88f7e4f57508300722dba5db3b007d (patch) | |
| tree | fb828d28c32d7b92c2f6de6394f972e218689cae /config | |
| parent | 4c94257d93c33bc2d6a2c4f146ebe0843763c89a (diff) | |
| download | chouette-core-7b03179f4b88f7e4f57508300722dba5db3b007d.tar.bz2 | |
Refs #6955 Add new translation + custom delete confirmation modal
Diffstat (limited to 'config')
| -rw-r--r-- | config/breadcrumbs.rb | 3 | ||||
| -rw-r--r-- | config/locales/actions.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/actions.fr.yml | 1 | ||||
| -rw-r--r-- | config/locales/companies.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/layouts.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/layouts.fr.yml | 1 | ||||
| -rw-r--r-- | config/locales/lines.en.yml | 4 | ||||
| -rw-r--r-- | config/locales/networks.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/routing_constraint_zones.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/routing_constraint_zones.fr.yml | 2 | ||||
| -rw-r--r-- | config/locales/stop_areas.en.yml | 2 | 
11 files changed, 14 insertions, 7 deletions
| diff --git a/config/breadcrumbs.rb b/config/breadcrumbs.rb index babaa2c8c..d48ea7e50 100644 --- a/config/breadcrumbs.rb +++ b/config/breadcrumbs.rb @@ -3,7 +3,7 @@ crumb :root do  end  crumb :workbench do |workbench| -  link workbench.name, workbench_path(workbench) +  link I18n.t('workbenches.index.offers.title'), workbench_path(workbench)  end  crumb :workbench_output do |workbench| @@ -160,7 +160,6 @@ end  crumb :stop_areas do |stop_area_referential|    link I18n.t('stop_areas.index.title'), stop_area_referential_stop_areas_path(stop_area_referential) -  parent :stop_area_referential, stop_area_referential  end  crumb :stop_area do |stop_area_referential, stop_area| diff --git a/config/locales/actions.en.yml b/config/locales/actions.en.yml index faf0dcec2..2c48f11a9 100644 --- a/config/locales/actions.en.yml +++ b/config/locales/actions.en.yml @@ -35,3 +35,4 @@ en:    no_result_text: "No Results"    searching_term: "Searching..."    are_you_sure: Are you sure? +  ok: Ok diff --git a/config/locales/actions.fr.yml b/config/locales/actions.fr.yml index 9e1a132a7..f02ab2198 100644 --- a/config/locales/actions.fr.yml +++ b/config/locales/actions.fr.yml @@ -35,3 +35,4 @@ fr:    no_result_text: "Aucun résultat"    searching_term: "Recherche en cours..."    are_you_sure: Etes vous sûr ? +  ok: Ok diff --git a/config/locales/companies.en.yml b/config/locales/companies.en.yml index f2b19bc19..8a746f6b7 100644 --- a/config/locales/companies.en.yml +++ b/config/locales/companies.en.yml @@ -6,7 +6,7 @@ en:        new: "Add a new company"        edit: "Edit this company"        destroy: "Remove this company" -      destroy_confirm: "Are you sure you want destroy this company?" +      destroy_confirm: "Are you sure you want to destroy this company?"      new:        title: "Add a new company"      edit: diff --git a/config/locales/layouts.en.yml b/config/locales/layouts.en.yml index 70e95646e..933a7248d 100644 --- a/config/locales/layouts.en.yml +++ b/config/locales/layouts.en.yml @@ -68,6 +68,7 @@ en:    yesterday: "Yestersday"    edit_periods: "Edit periods"    delete_periods: "Delete periods" +  warning: Warning    attributes:      author: "Edited by"      created_at: "Created at" diff --git a/config/locales/layouts.fr.yml b/config/locales/layouts.fr.yml index 810ede34c..62735d3b8 100644 --- a/config/locales/layouts.fr.yml +++ b/config/locales/layouts.fr.yml @@ -68,6 +68,7 @@ fr:    yesterday: "Hier"    edit_periods: "Editer Périodes"    delete_periods: "Supprimer Périodes" +  warning: Avertissement    attributes:      author: "Edité par"      created_at: "Créé le" diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml index 6501faa57..0f3eaadd9 100644 --- a/config/locales/lines.en.yml +++ b/config/locales/lines.en.yml @@ -8,7 +8,7 @@ en:        activate: "Activate this line"        deactivate: "Deactivate this line"        activate_confirm: "Are you sure you want to activate this line ?" -      deactivate_confirm: "Are you sure you want tode activate this line ?" +      deactivate_confirm: "Are you sure you want to deactivate this line ?"        destroy_confirm: "Are you sure you want to destroy this line ?"        destroy_selection_confirm: "Are you sure you want to destroy those lines ?"        import: "Import lines" @@ -117,7 +117,7 @@ en:          updated_at: Updated at          creator_id: "Created by"          footnotes: "Footnotes" -        stable_id: External permanent idenifier" +        stable_id: External permanent identifier          status: Status          activated: Activated          deactivated: Deactivated diff --git a/config/locales/networks.en.yml b/config/locales/networks.en.yml index 2046a30ae..d4164f9a6 100644 --- a/config/locales/networks.en.yml +++ b/config/locales/networks.en.yml @@ -5,7 +5,7 @@ en:        new: "Add a new network"        edit: "Edit this network"        destroy: "Remove this network" -      destroy_confirm: "Are you sure you want destroy this network?" +      destroy_confirm: "Are you sure you want to destroy this network ?"      new:        title: "Add a new network"      edit: diff --git a/config/locales/routing_constraint_zones.en.yml b/config/locales/routing_constraint_zones.en.yml index 2143ce1e1..a4bb9b36c 100644 --- a/config/locales/routing_constraint_zones.en.yml +++ b/config/locales/routing_constraint_zones.en.yml @@ -39,6 +39,8 @@ en:        title: "Update routing constraint zone %{name}"      show:        title: "Routing constraint zone %{name}" +      route_stop_points: Route stop points +      stop_points: Stop points included in the RCZ      index:        title: "Routing constraint zones"        search_no_results: "No ITL matches your query" diff --git a/config/locales/routing_constraint_zones.fr.yml b/config/locales/routing_constraint_zones.fr.yml index b5e0fa7fb..8de1bc225 100644 --- a/config/locales/routing_constraint_zones.fr.yml +++ b/config/locales/routing_constraint_zones.fr.yml @@ -39,6 +39,8 @@ fr:        title: "Editer l'ITL : %{name}"      show:        title: "Zone de contrainte %{name}" +      route_stop_points: Arrêts de l'itinéraire +      stop_points: Arrêts inclus dans l'ITL      index:        title: "Interdictions de trafic local"        search_no_results: "Aucune ITL ne correspond à votre recherche" diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml index 7f460381c..3a26f93b2 100644 --- a/config/locales/stop_areas.en.yml +++ b/config/locales/stop_areas.en.yml @@ -28,7 +28,7 @@ en:        activate: "Activate this stop"        deactivate: "Deactivate this stop"        activate_confirm: "Are you sure you want to activate this stop ?" -      deactivate_confirm: "Are you sure you want tode activate this stop ?" +      deactivate_confirm: "Are you sure you want to deactivate this stop ?"        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" | 
