Refs #5879 correct the predicate traductions errors5879_compliance_control_predicates

4 files changed, 6 insertions, 5 deletions

diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 2bde5b95a..298a63ab9 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -3,8 +3,6 @@ class ComplianceControl < ActiveRecord::Base
   class << self
     def criticities; %i(warning error) end
     def default_code; "" end
-    def prerequisite; I18n.t('compliance_controls.metas.no_prerequisite'); end
-    def predicate; I18n.t("compliance_controls.#{self.name.underscore}.description") end
     def dynamic_attributes
       stored_attributes[:control_attributes] || []
     end
@@ -65,6 +63,9 @@ def initialize(attributes = {})
   self.origin_code ||= self.class.default_code
 end
 
+def predicate; I18n.t("compliance_controls.#{self.class.name.underscore}.description") end
+def prerequisite; I18n.t('compliance_controls.metas.no_prerequisite'); end
+
 end
 
 # Ensure STI subclasses are loaded
diff --git a/app/models/line_control/route.rb b/app/models/line_control/route.rb
index b4b2bd9d8..b6c1f3630 100644
--- a/app/models/line_control/route.rb
+++ b/app/models/line_control/route.rb
@@ -3,6 +3,6 @@ module LineControl
 
     def self.default_code; "3-Line-1" end
 
-    def self.prerequisite; I18n.t("compliance_controls.#{self.name.underscore}.prerequisite") end
+    def prerequisite; I18n.t("compliance_controls.#{self.class.name.underscore}.prerequisite") end
   end
 end
diff --git a/app/models/route_control/opposite_route.rb b/app/models/route_control/opposite_route.rb
index d5616ca6f..e0e9572ce 100644
--- a/app/models/route_control/opposite_route.rb
+++ b/app/models/route_control/opposite_route.rb
@@ -4,6 +4,6 @@ module RouteControl
 
     def self.default_code; "3-Route-2" end
 
-    def self.prerequisite; I18n.t("compliance_controls.#{self.name.underscore}.prerequisite") end
+    def prerequisite; I18n.t("compliance_controls.#{self.class.name.underscore}.prerequisite") end
   end
 end
diff --git a/app/models/route_control/opposite_route_terminus.rb b/app/models/route_control/opposite_route_terminus.rb
index 24c557734..e70d2c702 100644
--- a/app/models/route_control/opposite_route_terminus.rb
+++ b/app/models/route_control/opposite_route_terminus.rb
@@ -3,6 +3,6 @@ module RouteControl
 
     def self.default_code; "3-Route-5" end
 
-    def self.prerequisite; I18n.t("compliance_controls.#{self.name.underscore}.prerequisite") end     
+    def prerequisite; I18n.t("compliance_controls.#{self.class.name.underscore}.prerequisite") end     
   end
 end