Fix translations for compliance_control type translation, compliance_control validation, compliance_control module

1 files changed, 7 insertions, 6 deletions

diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 363ef5d61..bfbc075c6 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -44,10 +44,11 @@ class ComplianceControl < ActiveRecord::Base
     end
   end
 
-  before_validation(on: :create) do
-   self.name ||= self.class.name
-   self.code ||= self.class.default_code
-   self.origin_code ||= self.class.default_code
+  def initialize(attributes = {})
+    super
+    self.name ||= I18n.t("activerecord.models.#{self.class.name.underscore}.one")
+    self.code ||= self.class.default_code
+    self.origin_code ||= self.class.default_code
   end
 
 end
@@ -67,9 +68,7 @@ require_dependency 'route_control/omnibus_journey_pattern'
 require_dependency 'route_control/opposite_route_terminus'
 require_dependency 'route_control/opposite_route'
 require_dependency 'route_control/stop_points_in_journey_pattern'
-require_dependency 'route_control/time_table'
 require_dependency 'route_control/unactivated_stop_points'
-require_dependency 'route_control/vehicle_journey_at_stops'
 require_dependency 'route_control/zdl_stop_area'
 require_dependency 'routing_constraint_zone_control/maximum_length'
 require_dependency 'routing_constraint_zone_control/minimum_length'
@@ -77,3 +76,5 @@ require_dependency 'routing_constraint_zone_control/unactivated_stop_point'
 require_dependency 'vehicle_journey_control/delta'
 require_dependency 'vehicle_journey_control/waiting_time'
 require_dependency 'vehicle_journey_control/speed'
+require_dependency 'vehicle_journey_control/time_table'
+require_dependency 'vehicle_journey_control/vehicle_journey_at_stops'