Commit a88d9247 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'bug-interpolation-failure' into 'master'

Fix interpolation failure in strings with  HTLM

See merge request gitlab-org/gitlab!21644
parents 10e9ebf1 70752790
...@@ -44,12 +44,14 @@ export default { ...@@ -44,12 +44,14 @@ export default {
'Serverless|Your repository does not have a corresponding %{startTag}serverless.yml%{endTag} file.', 'Serverless|Your repository does not have a corresponding %{startTag}serverless.yml%{endTag} file.',
), ),
{ startTag: '<code>', endTag: '</code>' }, { startTag: '<code>', endTag: '</code>' },
false,
); );
}, },
noGitlabYamlConfigured() { noGitlabYamlConfigured() {
return sprintf( return sprintf(
s__('Serverless|Your %{startTag}.gitlab-ci.yml%{endTag} file is not properly configured.'), s__('Serverless|Your %{startTag}.gitlab-ci.yml%{endTag} file is not properly configured.'),
{ startTag: '<code>', endTag: '</code>' }, { startTag: '<code>', endTag: '</code>' },
false,
); );
}, },
mismatchedServerlessFunctions() { mismatchedServerlessFunctions() {
...@@ -58,6 +60,7 @@ export default { ...@@ -58,6 +60,7 @@ export default {
"Serverless|The functions listed in the %{startTag}serverless.yml%{endTag} file don't match the namespace of your cluster.", "Serverless|The functions listed in the %{startTag}serverless.yml%{endTag} file don't match the namespace of your cluster.",
), ),
{ startTag: '<code>', endTag: '</code>' }, { startTag: '<code>', endTag: '</code>' },
false,
); );
}, },
}, },
...@@ -111,15 +114,9 @@ export default { ...@@ -111,15 +114,9 @@ export default {
}} }}
</p> </p>
<ul> <ul>
<li> <li v-html="noServerlessConfigFile"></li>
{{ noServerlessConfigFile }} <li v-html="noGitlabYamlConfigured"></li>
</li> <li v-html="mismatchedServerlessFunctions"></li>
<li>
{{ noGitlabYamlConfigured }}
</li>
<li>
{{ mismatchedServerlessFunctions }}
</li>
<li>{{ s__('Serverless|The deploy job has not finished.') }}</li> <li>{{ s__('Serverless|The deploy job has not finished.') }}</li>
</ul> </ul>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment