kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Mike Greiling 2019-07-02 05:11:48 +00:00
parent 5e10faa345 cada1d7cb6
commit df0be8b226
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/clusters/components/application_row.vue
View File

@ -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"

10
app/assets/javascripts/clusters/components/knative_domain_editor.vue
View File

@ -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

3
app/assets/javascripts/clusters/components/uninstall_application_button.vue
View File

@ -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');
},
},
};

12
locale/gitlab.pot
View File

@ -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 ""