katello 4.11.0 → 4.11.1

data/app/views/overrides/activation_keys/_host_tab_pane.html.erb

@@ -21,9 +21,11 @@
     </div>
 
     <p><%= _('Activation keys and subscriptions can be managed') %>
-      <b><a href="/activation_keys" target="_blank"> <%= _('here') %></a></b>
+      <b><a href="/activation_keys" target="_blank"> <%= _('here.') %></a></b>
     </p>
-    <p><%= subscription_manager_configuration_url %></p>
+    <p translate>
+    Activation keys may be used during <a href="/hosts/register">system registration.</a>
+  </p>
     <p><a href="" id="ak_refresh_subscriptions"><%= _('Reload data') %></a></p>
   </div>
 </div>

data/app/views/overrides/organizations/_edit_override.html.erb

@@ -19,7 +19,8 @@
   end %>
 
   <div class="alert alert-warning" role="alert">
-    <%= _('Simple Content Access will be required for all organizations in Katello 4.12.') %>
+    <%= link_to _('Simple Content Access'), 'https://access.redhat.com/articles/transition_of_subscription_services_to_the_hybrid_cloud_console', :rel => "external" %>
+    <%= _(' will be required for all organizations in Katello 4.12.') %>
   </div>
 
 <% end %>

data/db/migrate/20240122150431_remove_content_counts_index.rb

@@ -0,0 +1,5 @@
+class RemoveContentCountsIndex < ActiveRecord::Migration[6.1]
+  def change
+    remove_index :smart_proxies, :content_counts
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-info.html

@@ -2,11 +2,8 @@
 
 <div bst-alert="info">
   <span translate>
-    This activation key may be used during system registration. For example:
+    This activation key may be used during <a href="/hosts/register?initialAKSelection={{ activationKey.name }}">system registration.</a>
   </span>
-  <p translate>
-    subscription-manager register --org="{{ activationKey.organization.label }}" --activationkey="{{ activationKey.name }}"
-  </p>
 </div>
 
 <div data-extend-template="layouts/two-column-details.html">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot

@@ -53,7 +53,7 @@ msgid "{{ file.name }}"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html
-msgid "{{ host.name }}"
+msgid "{{ host.display_name }}"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/common/views/rhel-lifecycle-notice.html
@@ -621,7 +621,7 @@ msgid "Apply Errata"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html
-msgid "Apply Errata to Content Host \"{{host.name}}\"?"
+msgid "Apply Errata to Content Host \"{{host.display_name}}\"?"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/errata/details/views/erratum-content-hosts.html
@@ -683,7 +683,7 @@ msgid "Are you sure you want to add the sync plan to the selected products(s)?"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html
-msgid "Are you sure you want to apply Errata to content host \"{{ host.name }}\"?"
+msgid "Are you sure you want to apply Errata to content host \"{{ host.display_name }}\"?"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html
@@ -795,7 +795,7 @@ msgid "Are you sure you want to reset to default the {{ table.numSelected }} rep
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-traces.html
-msgid "Are you sure you want to restart services on content host \"{{ host.name }}\"?"
+msgid "Are you sure you want to restart services on content host \"{{ host.display_name }}\"?"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-traces-modal.html
@@ -2252,6 +2252,10 @@ msgstr ""
 msgid "Last Puppet Report"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js
+msgid "Last reclaim failed:"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js
 msgid "Last reclaim space failed:"
 msgstr ""
@@ -3677,7 +3681,7 @@ msgid "Restart Selected"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-traces.html
-msgid "Restart Services on Content Host \"{{host.name}}\"?"
+msgid "Restart Services on Content Host \"{{host.display_name}}\"?"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
@@ -4495,7 +4499,7 @@ msgid "Unregister Host"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html
-msgid "Unregister Host \"{{host.name}}\"?"
+msgid "Unregister Host \"{{host.display_name}}\"?"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html