diff options
author | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-06-28 14:37:24 +1000 |
---|---|---|
committer | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-06-28 15:08:08 +1000 |
commit | e02dd968563ebf4323296bea3b7812ae473e5716 (patch) | |
tree | 735841d6d9ad14652615d3a8ef088d092b131839 | |
parent | 36451a753ac442250c1ed5a6427383817434d1ec (diff) | |
download | gitlab-ce-ek-interpolated-sprintf-not-working.tar.gz |
Added string to be externalizedek-interpolated-sprintf-not-working
Moved string into a function
-rw-r--r-- | app/assets/javascripts/serverless/components/functions.vue | 13 | ||||
-rw-r--r-- | locale/gitlab.pot | 6 |
2 files changed, 15 insertions, 4 deletions
diff --git a/app/assets/javascripts/serverless/components/functions.vue b/app/assets/javascripts/serverless/components/functions.vue index 94341050b86..b151ab8e3cf 100644 --- a/app/assets/javascripts/serverless/components/functions.vue +++ b/app/assets/javascripts/serverless/components/functions.vue @@ -5,6 +5,7 @@ import FunctionRow from './function_row.vue'; import EnvironmentRow from './environment_row.vue'; import EmptyState from './empty_state.vue'; import { CHECKING_INSTALLED } from '../constants'; +import { sprintf, s__ } from '~/locale' export default { components: { @@ -37,6 +38,9 @@ export default { isInstalled() { return this.installed === true; }, + namespaceCluster(){ + return sprintf(s__('Serverless|The functions listed in the %{startTag}serverless.yml%{endTag} file don\'t match the namespace of your cluster.'), { startTag: '<code>', endTag: '</code>' }) + } }, created() { this.fetchFunctions({ @@ -88,12 +92,13 @@ export default { </p> <ul> <li>Your repository does not have a corresponding <code>serverless.yml</code> file.</li> - <li>Your <code>.gitlab-ci.yml</code> file is not properly configured.</li> <li> - The functions listed in the <code>serverless.yml</code> file don't match the namespace - of your cluster. + {{sprintf(s__('Serverless|Your %{startTag}.gitlab-ci.yml%{endTag} file is not properly configured.'), { startTag: '<code>', endTag: '</code>' })}} + </li> + <li> + {{ namespaceCluster }} </li> - <li>The deploy job has not finished.</li> + <li>{{ sprintf(__('The deploy job has not finished. %{something}'), { something: 'SOME STRING'}) }}</li > </ul> <p> diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 9ea368816f9..7aca8e6e165 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -9154,6 +9154,9 @@ msgstr "" msgid "Serverless|No functions available" msgstr "" +msgid "Serverless|The functions listed in the %{startTag}serverless.yml%{endTag} file don't match the namespace of your cluster." +msgstr "" + msgid "Serverless|There is currently no function data available from Knative. This could be for a variety of reasons including:" msgstr "" @@ -10121,6 +10124,9 @@ msgstr "" msgid "The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository." msgstr "" +msgid "The deploy job has not finished. %{something}" +msgstr "" + msgid "The deployment of this job to %{environmentLink} did not succeed." msgstr "" |