Moves table component into a separate one

Adds better support for i18n

1 files changed, 6 insertions, 13 deletions

diff --git a/app/views/projects/registry/repositories/index.html.haml b/app/views/projects/registry/repositories/index.html.haml
index 12a5778fed8..36ea5e013e4 100644
--- a/app/views/projects/registry/repositories/index.html.haml
+++ b/app/views/projects/registry/repositories/index.html.haml
@@ -25,30 +25,23 @@
             = s_('ContainerRegistry|How to use the Container Registry')
         .panel-body
           %p
-            = _('First log in to GitLab’s Container Registry using your GitLab username and password. If you have').html_safe
-            = link_to _('2FA enabled'), help_page_path('user/profile/account/two_factor_authentication'), target: '_blank'
-            = _('you need to use a')
-            = succeed ':' do
-              = link_to _('personal access token'), help_page_path('user/profile/account/two_factor_authentication', anchor: 'personal-access-tokens'), target: '_blank'
+            - link_token = link_to(_('personal access token'), help_page_path('user/profile/account/two_factor_authentication', anchor: 'personal-access-tokens'), target: '_blank')
+            - link_2fa = link_to(_('2FA enabled'), help_page_path('user/profile/account/two_factor_authentication'), target: '_blank')
+            = s_('ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:').html_safe % { link_2fa: link_2fa, link_token: link_token }
           %pre
             docker login #{Gitlab.config.registry.host_port}
           %br
           %p
-            = _('Once you log in, you’re free to create and upload a container image using the common').html_safe
-            %code
-              = _('build')
-            = _('and')
-            %code push
-            = _('commands:')
+            = s_('ContainerRegistry|Once you log in, you&rsquo;re free to create and upload a container image using the common %{build} and %{push} commands').html_safe % { build: "<code>build</code>".html_safe, push: "<code>push</code>".html_safe }
           %pre
             :plain
               docker build -t #{escape_once(@project.container_registry_url)} .
               docker push #{escape_once(@project.container_registry_url)}
           %hr
           %h5.prepend-top-default
-            = _('Use different image names')
+            = s_('ContainerRegistry|Use different image names')
           %p.light
-            = _('GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:')
+            = s_('ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:')
           %pre
             :plain
               #{escape_once(@project.container_registry_url)}:tag