Merge branch 'vue-i18n-js-clusters-directory' into 'master'

Vue-i18n: autofix for app/assets/javascripts/clusters directory

See merge request gitlab-org/gitlab-ce!29962

4 files changed, 20 insertions, 9 deletions

diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index 4771090aa7e..cd2121db3b2 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -207,7 +207,7 @@ export default {
         return __('Updating');
       }
 
-      return __('Updated');
+      return this.updateSuccessful ? __('Updated to') : __('Updated');
     },
     updateFailureDescription() {
       return s__('ClusterIntegration|Update failed. Please check the logs and try again.');
@@ -331,8 +331,6 @@ export default {
             class="form-text text-muted label p-0 js-cluster-application-update-details"
           >
             {{ versionLabel }}
-            <span v-if="updateSuccessful">to</span>
-
             <gl-link
               v-if="updateSuccessful"
               :href="chartRepo"
diff --git a/app/assets/javascripts/clusters/components/knative_domain_editor.vue b/app/assets/javascripts/clusters/components/knative_domain_editor.vue
index 480228619a5..e26ef135bc5 100644
--- a/app/assets/javascripts/clusters/components/knative_domain_editor.vue
+++ b/app/assets/javascripts/clusters/components/knative_domain_editor.vue
@@ -2,7 +2,7 @@
 import LoadingButton from '~/vue_shared/components/loading_button.vue';
 import ClipboardButton from '../../vue_shared/components/clipboard_button.vue';
 import { GlLoadingIcon } from '@gitlab/ui';
-import { s__ } from '~/locale';
+import { __, s__ } from '~/locale';
 
 import { APPLICATION_STATUS } from '~/clusters/constants';
 
@@ -32,7 +32,7 @@ export default {
       return [UPDATING].includes(this.knative.status);
     },
     saveButtonLabel() {
-      return this.saving ? this.__('Saving') : this.__('Save changes');
+      return this.saving ? __('Saving') : __('Save changes');
     },
     knativeInstalled() {
       return this.knative.installed;
@@ -122,9 +122,9 @@ export default {
             `ClusterIntegration|To access your application after deployment, point a wildcard DNS to the Knative Endpoint.`,
           )
         }}
-        <a :href="ingressDnsHelpPath" target="_blank" rel="noopener noreferrer">
-          {{ __('More information') }}
-        </a>
+        <a :href="ingressDnsHelpPath" target="_blank" rel="noopener noreferrer">{{
+          __('More information')
+        }}</a>
       </p>
 
       <p
diff --git a/app/assets/javascripts/clusters/components/uninstall_application_button.vue b/app/assets/javascripts/clusters/components/uninstall_application_button.vue
index ef4bcbe14dd..8465312d84d 100644
--- a/app/assets/javascripts/clusters/components/uninstall_application_button.vue
+++ b/app/assets/javascripts/clusters/components/uninstall_application_button.vue
@@ -1,6 +1,7 @@
 <script>
 import LoadingButton from '~/vue_shared/components/loading_button.vue';
 import { APPLICATION_STATUS } from '~/clusters/constants';
+import { __ } from '~/locale';
 
 const { UPDATING, UNINSTALLING } = APPLICATION_STATUS;
 
@@ -22,7 +23,7 @@ export default {
       return this.status === UNINSTALLING;
     },
     label() {
-      return this.loading ? this.__('Uninstalling') : this.__('Uninstall');
+      return this.loading ? __('Uninstalling') : __('Uninstall');
     },
   },
 };
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index f4cad04a70a..c57a974fe11 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8979,6 +8979,9 @@ msgstr ""
 msgid "Save variables"
 msgstr ""
 
+msgid "Saving"
+msgstr ""
+
 msgid "Saving project."
 msgstr ""
 
@@ -11267,6 +11270,12 @@ msgstr ""
 msgid "Unfortunately, your email message to GitLab could not be processed."
 msgstr ""
 
+msgid "Uninstall"
+msgstr ""
+
+msgid "Uninstalling"
+msgstr ""
+
 msgid "Unknown encryption strategy: %{encrypted_strategy}!"
 msgstr ""
 
@@ -11372,6 +11381,9 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
+msgid "Updated to"
+msgstr ""
+
 msgid "Updating"
 msgstr ""