diff options
| -rw-r--r-- | config/locales/footnotes.fr.yml | 4 | ||||
| -rw-r--r-- | config/locales/journey_patterns.fr.yml | 2 | ||||
| -rw-r--r-- | config/locales/routing_constraint_zones.fr.yml | 6 | ||||
| -rw-r--r-- | config/locales/vehicle_journeys.fr.yml | 2 | ||||
| -rw-r--r-- | lib/model_attribute.rb | 16 | ||||
| -rw-r--r-- | spec/lib/model_attribute_spec.rb | 6 |
6 files changed, 9 insertions, 27 deletions
diff --git a/config/locales/footnotes.fr.yml b/config/locales/footnotes.fr.yml index 692098046..5169cfc11 100644 --- a/config/locales/footnotes.fr.yml +++ b/config/locales/footnotes.fr.yml @@ -15,6 +15,6 @@ fr: other: "notes" attributes: footnote: - code: "numéro" + code: "titre" checksum: Signature métier - label: "ligne de texte" + label: "texte" diff --git a/config/locales/journey_patterns.fr.yml b/config/locales/journey_patterns.fr.yml index fb69f4190..8f1dc1e41 100644 --- a/config/locales/journey_patterns.fr.yml +++ b/config/locales/journey_patterns.fr.yml @@ -42,7 +42,7 @@ fr: published_name: "Nom public" section_status: "Status section" comment: "Commentaire" - registration_number: "Numéro d'enregistrement" + registration_number: "Code mission" stop_point_ids: "Sélection des arrêts desservis" objectid: "Identifiant Neptune" object_version: "Version" diff --git a/config/locales/routing_constraint_zones.fr.yml b/config/locales/routing_constraint_zones.fr.yml index 024dd3288..d4b97fff2 100644 --- a/config/locales/routing_constraint_zones.fr.yml +++ b/config/locales/routing_constraint_zones.fr.yml @@ -2,9 +2,9 @@ fr: activerecord: models: routing_constraint_zone: - zero: zone de contrainte - one: zone de contrainte - other: zone de contraintes + zero: ITL + one: ITL + other: ITLs attributes: routing_constraint_zone: checksum: Signature métier diff --git a/config/locales/vehicle_journeys.fr.yml b/config/locales/vehicle_journeys.fr.yml index a43fa4580..a1eb5b3f7 100644 --- a/config/locales/vehicle_journeys.fr.yml +++ b/config/locales/vehicle_journeys.fr.yml @@ -122,7 +122,7 @@ fr: object_version: "Version" objectid: "Identifiant Neptune" on_demand_fs: "Service à la demande" - published_journey_identifier: "Identifiant public" + published_journey_identifier: "Numéro de train" published_journey_name: "Nom public" purchase_window: "Disponibilité commerciale" regular_fs: "Service régulier" diff --git a/lib/model_attribute.rb b/lib/model_attribute.rb index 872c00152..baa37edf1 100644 --- a/lib/model_attribute.rb +++ b/lib/model_attribute.rb @@ -64,26 +64,17 @@ class ModelAttribute # Chouette::Route define :route, :name, :string define :route, :published_name, :string - define :route, :comment, :string - define :route, :number, :string - define :route, :direction, :string define :route, :wayback, :string # Chouette::JourneyPattern define :journey_pattern, :name, :string define :journey_pattern, :published_name, :string - define :journey_pattern, :comment, :string define :journey_pattern, :registration_number, :string define :journey_pattern, :section_status, :integer # Chouette::VehicleJourney - define :vehicle_journey, :comment, :string - define :vehicle_journey, :status_value, :string - define :vehicle_journey, :transport_mode, :string - define :vehicle_journey, :facility, :string define :vehicle_journey, :published_journey_name, :string define :vehicle_journey, :published_journey_identifier, :string - define :vehicle_journey, :vehicle_type_identifier, :string define :vehicle_journey, :number, :integer define :vehicle_journey, :mobility_restricted_suitability, :boolean define :vehicle_journey, :flexible_service, :boolean @@ -92,13 +83,6 @@ class ModelAttribute define :footnote, :code, :string define :footnote, :label, :string - # Chouette::TimeTable - define :time_table, :version, :string - define :time_table, :comment, :string - define :time_table, :start_date, :date - define :time_table, :end_date, :date - define :time_table, :color, :string - # Chouette::RoutingConstraintZone define :routing_constraint_zone, :name, :string diff --git a/spec/lib/model_attribute_spec.rb b/spec/lib/model_attribute_spec.rb index cdba87a90..6da740dcb 100644 --- a/spec/lib/model_attribute_spec.rb +++ b/spec/lib/model_attribute_spec.rb @@ -22,12 +22,10 @@ RSpec.describe ModelAttribute do it "returns the list of classes of ModelAttributes in .all" do ModelAttribute.define(:route, :name, :string) ModelAttribute.define(:journey_pattern, :name, :string) - ModelAttribute.define(:time_table, :start_date, :date) expect(ModelAttribute.classes).to match_array([ 'Route', 'JourneyPattern', - 'TimeTable' ]) end end @@ -68,13 +66,13 @@ RSpec.describe ModelAttribute do it "returns all ModelAttributes for a given class" do ModelAttribute.define(:route, :name, :string) ModelAttribute.define(:route, :published_name, :string) - ModelAttribute.define(:route, :direction, :string) + ModelAttribute.define(:route, :wayback, :string) ModelAttribute.define(:journey_pattern, :name, :string) expect(ModelAttribute.methods_by_class(:route)).to match_array([ ModelAttribute.new(:route, :name, :string), ModelAttribute.new(:route, :published_name, :string), - ModelAttribute.new(:route, :direction, :string) + ModelAttribute.new(:route, :wayback, :string) ]) end end |