Merge pull request Katello#712 from thomasmckay/854801-autoheal

854801-autoheal - word change
mbacovsky · Sep 21, 2012 · b8ce5d7 · b8ce5d7
2 parents c04c680 + e27f46b
commit b8ce5d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/app/helpers/systems_helper.rb b/app/helpers/systems_helper.rb
@@ -80,7 +80,7 @@ def system_releasevers_edit system, releases
   end
 
   def system_servicelevel system
-    _("Auto-subscribe %s, %s") % [
+    _("Auto-heal %s, %s") % [
         system.autoheal ? _("On") : _("Off"),
         system.serviceLevel == '' ? _("No Service Level Preference") : (_("Service Level %s") % system.serviceLevel)
     ]
@@ -89,12 +89,12 @@ def system_servicelevel system
   def system_servicelevel_edit system
     levels = {}
     system.organization.service_levels.each { |level|
-      levels["1#{level}"] = _("Auto-subscribe On, Service Level %s") % level
-      levels["0#{level}"] = _("Auto-subscribe Off, Service Level %s") % level
+      levels["1#{level}"] = _("Auto-heal On, Service Level %s") % level
+      levels["0#{level}"] = _("Auto-heal Off, Service Level %s") % level
     }
 
-    levels['1'] = _("Auto-subscribe On, No Service Level Preference")
-    levels['0'] = _("Auto-subscribe Off, No Service Level Preference")
+    levels['1'] = _("Auto-heal On, No Service Level Preference")
+    levels['0'] = _("Auto-heal Off, No Service Level Preference")
 
     levels["selected"] = system_servicelevel(system)
 

diff --git a/app/views/systems/_subscriptions.html.haml b/app/views/systems/_subscriptions.html.haml
@@ -1,7 +1,7 @@
 = javascript do
   :plain
     localize({
-        "systemSelectAutosubscribe": '#{escape_javascript(_("Select Auto-subscribe Level..."))}'
+        "systemSelectAutoheal": '#{escape_javascript(_("Select Auto-heal Level..."))}'
     });
 = javascript :edit_helpers, :system_subscriptions
 

diff --git a/public/javascripts/system_subscriptions.js b/public/javascripts/system_subscriptions.js
@@ -38,15 +38,15 @@ $(document).ready(function() {
     onNodeShow: function(){$.sparkline_display_visible()}
   });
 
-    // Auto-subscribe with service level used in systems/_subscriptions.html.haml
+    // Auto-heal with service level used in systems/_subscriptions.html.haml
     $('.edit_select_system_servicelevel').each(function(){
         var common_settings = {
                 method          :  'PUT',
                 cancel          :  i18n.cancel,
                 submit          :  i18n.save,
                 indicator       :  i18n.saving,
                 tooltip         :  i18n.clickToEdit,
-                placeholder     :  i18n.systemSelectAutosubscribe,
+                placeholder     :  i18n.systemSelectAutoheal,
                 submitdata      :  $.extend({ authenticity_token: AUTH_TOKEN }, KT.common.getSearchParams()),
                 onerror         :  function(settings, original, xhr) {
                     original.reset();