diff options
| -rw-r--r-- | app/views/routing_constraint_zones/_form.html.slim | 2 | ||||
| -rw-r--r-- | app/views/workbenches/show.html.slim | 1 | ||||
| -rw-r--r-- | config/locales/lines.en.yml | 6 | ||||
| -rw-r--r-- | config/locales/referentials.en.yml | 3 | ||||
| -rw-r--r-- | config/locales/referentials.fr.yml | 1 | ||||
| -rw-r--r-- | config/locales/routes.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/routing_constraint_zones.en.yml | 14 | ||||
| -rw-r--r-- | config/locales/stop_areas.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/stop_points.en.yml | 12 |
9 files changed, 30 insertions, 11 deletions
diff --git a/app/views/routing_constraint_zones/_form.html.slim b/app/views/routing_constraint_zones/_form.html.slim index 5f33e2649..afc993a0f 100644 --- a/app/views/routing_constraint_zones/_form.html.slim +++ b/app/views/routing_constraint_zones/_form.html.slim @@ -1,7 +1,7 @@ = simple_form_for [@referential, @line, @routing_constraint_zone] do |f| .row .col-lg-6.col-sm-12 - = f.input :name, label: t('activerecord.models.attributes.routing_constraint_zone.name') + = f.input :name .row .col-lg-6.col-sm-12 / Temporarily limit the collection to 10 items... otherwise it kills RoR diff --git a/app/views/workbenches/show.html.slim b/app/views/workbenches/show.html.slim index 5d60863c3..223284523 100644 --- a/app/views/workbenches/show.html.slim +++ b/app/views/workbenches/show.html.slim @@ -30,6 +30,7 @@ :organisation => Proc.new {|w| w.organisation.name}, :validity_period => Proc.new {|w| w.validity_period.nil? ? '-' : t('validity_range', debut: l(w.try(:validity_period).try(:begin), format: :short), end: l(w.try(:validity_period).try(:end), format: :short))}, :lines => Proc.new {|w| w.lines.count}, + :created_at => Proc.new {|w| l(w.created_at, format: :short)}, :updated_at => Proc.new {|w| l(w.updated_at, format: :short)}, :published_at => ''}, [:show, :edit, :archive, :unarchive, :delete], diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml index 35df30037..0e9487286 100644 --- a/config/locales/lines.en.yml +++ b/config/locales/lines.en.yml @@ -61,10 +61,16 @@ en: attributes: line: network: "Network" + networks: + name: "Network" company: "Company" + companies: + name: "Company" registration_number: "Registration number" name: "Name" published_name: "Published name" + registration_number: "Short name" + deactivated: "Activated" number: "Number" transport_mode: "Transport mode" transport_submode: "Transport Submode" diff --git a/config/locales/referentials.en.yml b/config/locales/referentials.en.yml index 2c28d04a2..06a07057a 100644 --- a/config/locales/referentials.en.yml +++ b/config/locales/referentials.en.yml @@ -87,6 +87,9 @@ en: published_at: "Integrated" archived_at: "Archived" created_from: 'Created from' + updated_at: "Updated" + created_at: "Created" + organisation: 'Organisation' formtastic: titles: referential: diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml index a01859cef..a85fdd6f7 100644 --- a/config/locales/referentials.fr.yml +++ b/config/locales/referentials.fr.yml @@ -84,6 +84,7 @@ fr: routing_constraint_zone: Zone de contrainte validity_period: "Période de validité englobante" updated_at: "Modifié" + created_at: "Créé" published_at: "Intégré" archived_at: "Conservé" created_from: 'Créé à partir de' diff --git a/config/locales/routes.en.yml b/config/locales/routes.en.yml index 071dedab3..718521c51 100644 --- a/config/locales/routes.en.yml +++ b/config/locales/routes.en.yml @@ -59,6 +59,7 @@ en: number: "Number" direction: "Direction" wayback: "Wayback" + stop_points: "Nb Stop points" opposite_route: "Reversed route" opposite_route_id: "Reversed route" objectid: "Neptune identifier" diff --git a/config/locales/routing_constraint_zones.en.yml b/config/locales/routing_constraint_zones.en.yml index 2998431fa..7012a1493 100644 --- a/config/locales/routing_constraint_zones.en.yml +++ b/config/locales/routing_constraint_zones.en.yml @@ -2,13 +2,13 @@ en: activerecord: models: routing_constraint_zone: Routing constraint zone - attributes: - routing_constraint_zone: - name: Name - stop_areas: Stop areas - line: Line - created_at: Created at - updated_at: Updated at + attributes: + routing_constraint_zone: + name: Name + stop_areas: Stop areas + line: Line + created_at: Created at + updated_at: Updated at routing_constraint_zones: actions: new: New routing constraint zone diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml index d95f76467..8bb5b52c1 100644 --- a/config/locales/stop_areas.en.yml +++ b/config/locales/stop_areas.en.yml @@ -91,6 +91,7 @@ en: deleted: "Deleted" comment: "Comments" stop_area_type: "Area type" + area_type: "Area type" nearest_topic_name: "Nearest point of interest" street_name: "Street name" country_code: "INSEE code" diff --git a/config/locales/stop_points.en.yml b/config/locales/stop_points.en.yml index 4c8eb2c7f..1ef8002d0 100644 --- a/config/locales/stop_points.en.yml +++ b/config/locales/stop_points.en.yml @@ -38,11 +38,17 @@ en: other: "stop points on route" attributes: stop_point: - lines: "lines" - created_at: Created at - updated_at: Updated at + name: 'Name' + lines: "Lines" + created_at: Created + updated_at: Updated + deleted_at: "Activated" for_boarding: "For boarding" for_alighting: "For alighting" + area_type: "Area type" + city_name: "City name" + zip_code: "Zip code" + position: "Position" simple_form: labels: stop_point: |