Merge pull request #16468 from mzazrivec/fix_string_interpolations

Fix string interpolations
ManageIQ · Nov 14, 2017 · 44c7c81 · 44c7c81
2 parents d2b8327 + 0530342
commit 44c7c81
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/app/models/physical_server/operations/config_pattern.rb b/app/models/physical_server/operations/config_pattern.rb
@@ -1,7 +1,8 @@
 module PhysicalServer::Operations::ConfigPattern
   def apply_config_pattern(pattern_id)
     unless ext_management_system
-      raise _("A Server #{self} <%{name}> with Id: <%{id}> is not associated with a provider.") % {:name => name, :id => id}
+      raise _("A Server %{server} <%{name}> with Id: <%{id}> is not associated with a provider.") %
+            {:server => self, :name => name, :id => id}
     end
 
     _log.info("Apply config pattern with ID: #{pattern_id} to server with UUID: #{ems_ref}")

diff --git a/app/models/physical_server/operations/led.rb b/app/models/physical_server/operations/led.rb
@@ -15,8 +15,8 @@ def turn_off_loc_led
 
   def change_state(verb)
     unless ext_management_system
-      raise _("A Server #{self} <%{name}> with Id: <%{id}> is not associated \
-with a provider.") % {:name => name, :id => id}
+      raise _("A Server %{server} <%{name}> with Id: <%{id}> is not associated with a provider.") %
+            {:server => self, :name => name, :id => id}
     end
 
     options = {:uuid => ems_ref}

diff --git a/app/models/physical_server/operations/power.rb b/app/models/physical_server/operations/power.rb
@@ -31,8 +31,8 @@ def restart_mgmt_controller
 
   def change_state(verb)
     unless ext_management_system
-      raise _(" A Server #{self} <%{name}> with Id: <%{id}>
-      is not associated with a provider.") % {:name => name, :id => id}
+      raise _(" A Server %{server} <%{name}> with Id: <%{id}> is not associated with a provider.") %
+            {:server => self, :name => name, :id => id}
     end
     options = {:uuid => ems_ref}
     _log.info("Begin #{verb} server: #{name}  with UUID: #{ems_ref}")