From 82391594e3cb4afa0853b732bd076dc21d62af28 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 6 Nov 2018 15:03:33 -0600 Subject: Update copy above new cluster form --- app/views/clusters/clusters/_sidebar.html.haml | 14 +++++++++----- locale/gitlab.pot | 9 ++++++--- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/views/clusters/clusters/_sidebar.html.haml b/app/views/clusters/clusters/_sidebar.html.haml index 3d10348212f..5f941f6cf0e 100644 --- a/app/views/clusters/clusters/_sidebar.html.haml +++ b/app/views/clusters/clusters/_sidebar.html.haml @@ -2,8 +2,12 @@ - help_link_start = "".html_safe - help_link_end = ''.html_safe %h4.prepend-top-0 - = s_('ClusterIntegration|Kubernetes cluster integration') -%p - = s_('ClusterIntegration|With a Kubernetes cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way.') -%p - = s_('ClusterIntegration|Learn more about %{help_link_start}Kubernetes%{help_link_end}.').html_safe % { help_link_start: help_link_start % { url: clusters_help_url }, help_link_end: help_link_end } + = s_('ClusterIntegration|Add a Kubernetes cluster integration') +- if clusterable.is_project? + %p + = s_('ClusterIntegration|With a Kubernetes cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way.') + %p + = s_('ClusterIntegration|Learn more about %{help_link_start}Kubernetes%{help_link_end}.').html_safe % { help_link_start: help_link_start % { url: clusters_help_url }, help_link_end: help_link_end } +- else + %p + = s_('ClusterIntegration|Adding a Kubernetes cluster to your group will automatically share the cluster across all your projects. Use review apps, deploy your applications, and easily run your pipelines for all projects using the same cluster.') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index bb7e235b25f..3ed3fc1baf0 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1364,6 +1364,12 @@ msgstr "" msgid "ClusterIntegration|Add Kubernetes cluster" msgstr "" +msgid "ClusterIntegration|Add a Kubernetes cluster integration" +msgstr "" + +msgid "ClusterIntegration|Adding a Kubernetes cluster to your group will automatically share the cluster across all your projects. Use review apps, deploy your applications, and easily run your pipelines for all projects using the same cluster." +msgstr "" + msgid "ClusterIntegration|Adding an integration to your group will share the cluster across all your projects." msgstr "" @@ -1526,9 +1532,6 @@ msgstr "" msgid "ClusterIntegration|Kubernetes cluster details" msgstr "" -msgid "ClusterIntegration|Kubernetes cluster integration" -msgstr "" - msgid "ClusterIntegration|Kubernetes cluster is being created on Google Kubernetes Engine..." msgstr "" -- cgit v1.2.1