Merge pull request #2765 from mzazrivec/favor_complete_ui_strings_ove…

…r_string_concatenation

Favor complete ui strings over string concatenation
(cherry picked from commit 963dbf9)

app/helpers/application_helper/button/cockpit_console.rb

@@ -2,11 +2,22 @@ class ApplicationHelper::Button::CockpitConsole < ApplicationHelper::Button::Bas
   needs :@record
 
   def disabled?
-    canned_msg = _('The web-based console is not available because the')
-    @error_message = _("%{canned_msg} 'Cockpit' role is not enabled." % {:canned_msg => canned_msg}) unless MiqRegion.my_region.role_active?('cockpit_ws')
-    record_type = @record.respond_to?(:current_state) ? _('VM') : _('Container Node')
-    @error_message = _("%{canned_msg} %{record_type} is not powered on" % {:canned_msg => canned_msg, :record_type => record_type}) unless on?
-    @error_message = _("%{canned_msg} Windows platform is not supported" % {:canned_msg => canned_msg}) unless platform_supported?(record_type)
+    if !MiqRegion.my_region.role_active?('cockpit_ws')
+      @error_message = _("The web-based console is not available because the 'Cockpit' role is not enabled.")
+    end
+
+    if !on?
+      @error_message = if @record.respond_to?(:current_state)
+                         _('The web-based console is not available because the VM is not powered on')
+                       else
+                         _('The web-based console is not available because the Container Node is not powered on')
+                       end
+    end
+
+    if !platform_supported?
+      @error_message = _('The web-based console is not available because the Windows platform is not supported')
+    end
+
     @error_message.present?
   end
 
@@ -17,8 +28,8 @@ def on?
     @record.ready_condition_status == 'True' if @record.respond_to?(:ready_condition_status) # Container status
   end
 
-  def platform_supported?(record_type)
-    if record_type == 'VM'
+  def platform_supported?
+    if @record.respond_to?(:current_state)
       @record.platform.downcase != 'windows'
     else
       true