Merge branch 'user-friendly-instance-configuration' into 'master'

Show description when SSH public key is not available on a GitLab instance

See merge request gitlab-org/gitlab!18363

app/views/help/instance_configuration/_ssh_info.html.haml

 - ssh_info = @instance_configuration.settings[:ssh_algorithms_hashes]
-- if ssh_info.any?
-  - content_for :table_content do
-    %li= link_to 'SSH host keys fingerprints', '#ssh-host-keys-fingerprints'
+- content_for :table_content do
+  %li
+    = link_to _('SSH host key fingerprints'), '#ssh-host-keys-fingerprints'
 
-  - content_for :settings_content do
-    %h2#ssh-host-keys-fingerprints
-      SSH host keys fingerprints
+- content_for :settings_content do
+  %h2#ssh-host-keys-fingerprints
+    = _('SSH host key fingerprints')
 
+  - if ssh_info.blank?
     %p
-      Below are the fingerprints for the current instance SSH host keys.
+      = _('SSH host keys are not available on this system. Please use <code>ssh-keyscan</code> command or contact your GitLab administrator for more information.').html_safe
+  - else
+    %p
+      = _('Below are the fingerprints for the current instance SSH host keys.')
 
     .table-responsive
       %table
         %thead
           %tr
-            %th Algorithm
-            %th MD5
-            %th SHA256
+            %th
+              = _('Algorithm')
+            %th
+              = _('MD5')
+            %th
+              = _('SHA256')
         %tbody
           - ssh_info.each do |algorithm|
             %tr

changelogs/unreleased/user-friendly-instance-configuration.yml

+---
+title: Make instance configuration user friendly
+merge_request: 18363
+author: Takuya Noguchi
+type: other

locale/gitlab.pot

@@ -1323,6 +1323,9 @@ msgstr ""
 msgid "Alerts endpoint"
 msgstr ""
 
+msgid "Algorithm"
+msgstr ""
+
 msgid "All"
 msgstr ""
 
@@ -2358,6 +2361,9 @@ msgstr ""
 msgid "Below are examples of regex for existing tools:"
 msgstr ""
 
+msgid "Below are the fingerprints for the current instance SSH host keys."
+msgstr ""
+
 msgid "Below you will find all the groups that are public."
 msgstr ""
 
@@ -9707,6 +9713,9 @@ msgstr ""
 msgid "Logs"
 msgstr ""
 
+msgid "MD5"
+msgstr ""
+
 msgid "MERGED"
 msgstr ""
 
@@ -13912,6 +13921,9 @@ msgstr ""
 msgid "SAML for %{group_name}"
 msgstr ""
 
+msgid "SHA256"
+msgstr ""
+
 msgid "SSH Key"
 msgstr ""
 
@@ -13921,9 +13933,15 @@ msgstr ""
 msgid "SSH Keys Help"
 msgstr ""
 
+msgid "SSH host key fingerprints"
+msgstr ""
+
 msgid "SSH host keys"
 msgstr ""
 
+msgid "SSH host keys are not available on this system. Please use <code>ssh-keyscan</code> command or contact your GitLab administrator for more information."
+msgstr ""
+
 msgid "SSH keys allow you to establish a secure connection between your computer and GitLab."
 msgstr ""