diff options
author | Phil Hughes <me@iamphill.com> | 2018-02-06 15:57:48 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-02-06 15:57:48 +0000 |
commit | ba62493009c2360018709b660956a6173f3e1515 (patch) | |
tree | 623ba15e0bb0a07f1483b38ca8e10ec41d702a14 /app/assets | |
parent | 805799b71b059b1bfb3578c4e78db3030ec04b6a (diff) | |
parent | 0ecd759d73abaee5c08adbd8ab3db651c2522b14 (diff) | |
download | gitlab-ce-ba62493009c2360018709b660956a6173f3e1515.tar.gz |
Merge branch 'winh-kubernetes-clusters' into 'master'
Replace "cluster" with "Kubernetes cluster"
Closes #41963
See merge request gitlab-org/gitlab-ce!16778
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/clusters/clusters_bundle.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/clusters/components/applications.vue | 6 | ||||
-rw-r--r-- | app/assets/javascripts/toggle_buttons.js | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js index fd2d1276230..3d6ec37e6dd 100644 --- a/app/assets/javascripts/clusters/clusters_bundle.js +++ b/app/assets/javascripts/clusters/clusters_bundle.js @@ -174,7 +174,7 @@ export default class Clusters { .map(appId => newApplicationMap[appId].title); if (appTitles.length > 0) { - const text = sprintf(s__('ClusterIntegration|%{appList} was successfully installed on your cluster'), { + const text = sprintf(s__('ClusterIntegration|%{appList} was successfully installed on your Kubernetes cluster'), { appList: appTitles.join(', '), }); Flash(text, 'notice', this.successApplicationContainer); diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 3b7195de635..f4259700370 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -27,7 +27,7 @@ computed: { generalApplicationDescription() { return sprintf( - _.escape(s__(`ClusterIntegration|Install applications on your cluster. + _.escape(s__(`ClusterIntegration|Install applications on your Kubernetes cluster. Read more about %{helpLink}`)), { helpLink: `<a href="${this.helpPath}"> @@ -39,7 +39,7 @@ }, helmTillerDescription() { return _.escape(s__( - `ClusterIntegration|Helm streamlines installing and managing Kubernets applications. + `ClusterIntegration|Helm streamlines installing and managing Kubernetes applications. Tiller runs inside of your Kubernetes Cluster, and manages releases of your charts.`, )); @@ -54,7 +54,7 @@ _.escape(s__( `ClusterIntegration|%{boldNotice} This will add some extra resources like a load balancer, which may incur additional costs depending on - the hosting provider Kubernetes is installed on. If you are using GKE, + the hosting provider your Kubernetes cluster is installed on. If you are using GKE, you can %{pricingLink}.`, )), { boldNotice: `<strong>${_.escape(s__('ClusterIntegration|Note:'))}</strong>`, diff --git a/app/assets/javascripts/toggle_buttons.js b/app/assets/javascripts/toggle_buttons.js index 2d680d0f0dc..199b14458ed 100644 --- a/app/assets/javascripts/toggle_buttons.js +++ b/app/assets/javascripts/toggle_buttons.js @@ -8,7 +8,7 @@ import { convertPermissionToBoolean } from './lib/utils/common_utils'; ``` %button.js-project-feature-toggle.project-feature-toggle{ type: "button", class: "#{'is-checked' if enabled?}", - 'aria-label': _('Toggle Cluster') } + 'aria-label': _('Toggle Kubernetes Cluster') } %input{ type: "hidden", class: 'js-project-feature-toggle-input', value: enabled? } ``` */ |