Commit 6ae01f77 authored by Mark Florian's avatar Mark Florian

Merge branch 'Update-externalization-of-gl-sprintf-usages' into 'master'

Update usages of GlSprintf with dynamic message prop

See merge request gitlab-org/gitlab!24303
parents e5ecbae9 cd42c5d6
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
<template> <template>
<div class="d-flex"> <div class="d-flex">
<gl-sprintf message="by %{user}"> <gl-sprintf :message="__('by %{user}')">
<template #user> <template #user>
<user-avatar-link <user-avatar-link
class="prepend-left-4" class="prepend-left-4"
......
...@@ -165,7 +165,7 @@ export default { ...@@ -165,7 +165,7 @@ export default {
<gl-icon :name="visibilityLevelIcon" :size="14" /> <gl-icon :name="visibilityLevelIcon" :size="14" />
</div> </div>
<div class="creator"> <div class="creator">
<gl-sprintf message="Authored %{timeago} by %{author}"> <gl-sprintf :message="__('Authored %{timeago} by %{author}')">
<template #timeago> <template #timeago>
<time-ago-tooltip <time-ago-tooltip
:time="snippet.createdAt" :time="snippet.createdAt"
...@@ -218,7 +218,7 @@ export default { ...@@ -218,7 +218,7 @@ export default {
errorMessage errorMessage
}}</gl-alert> }}</gl-alert>
<gl-sprintf message="Are you sure you want to delete %{name}?"> <gl-sprintf :message="__('Are you sure you want to delete %{name}?')">
<template #name <template #name
><strong>{{ snippet.title }}</strong></template ><strong>{{ snippet.title }}</strong></template
> >
......
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
</div> </div>
<small v-if="snippet.updatedAt !== snippet.createdAt" class="edited-text"> <small v-if="snippet.updatedAt !== snippet.createdAt" class="edited-text">
<gl-sprintf message="Edited %{timeago}"> <gl-sprintf :message="__('Edited %{timeago}')">
<template #timeago> <template #timeago>
<time-ago-tooltip :time="snippet.updatedAt" tooltip-placement="bottom" /> <time-ago-tooltip :time="snippet.updatedAt" tooltip-placement="bottom" />
</template> </template>
......
...@@ -82,7 +82,7 @@ export default { ...@@ -82,7 +82,7 @@ export default {
class="daterange-indicator d-flex flex-row flex-lg-row align-items-flex-start align-items-lg-center" class="daterange-indicator d-flex flex-row flex-lg-row align-items-flex-start align-items-lg-center"
> >
<span class="number-of-days pl-2 pr-1"> <span class="number-of-days pl-2 pr-1">
<gl-sprintf message="%{numberOfDays} days"> <gl-sprintf :message="__('%{numberOfDays} days')">
<template #numberOfDays>{{ numberOfDays }}</template> <template #numberOfDays>{{ numberOfDays }}</template>
</gl-sprintf> </gl-sprintf>
</span> </span>
......
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
variant="light" variant="light"
:title="moreTagsTooltip" :title="moreTagsTooltip"
class="d-none d-md-block prepend-left-4" class="d-none d-md-block prepend-left-4"
><gl-sprintf message="+%{tags} more"> ><gl-sprintf :message="__('+%{tags} more')">
<template #tags> <template #tags>
{{ moreTagsDisplay }} {{ moreTagsDisplay }}
</template> </template>
......
...@@ -340,6 +340,9 @@ msgstr "" ...@@ -340,6 +340,9 @@ msgstr ""
msgid "%{name}'s avatar" msgid "%{name}'s avatar"
msgstr "" msgstr ""
msgid "%{numberOfDays} days"
msgstr ""
msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead" msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead"
msgstr "" msgstr ""
...@@ -537,6 +540,9 @@ msgstr "" ...@@ -537,6 +540,9 @@ msgstr ""
msgid "+%{extraOptionCount} more" msgid "+%{extraOptionCount} more"
msgstr "" msgstr ""
msgid "+%{tags} more"
msgstr ""
msgid ", or " msgid ", or "
msgstr "" msgstr ""
...@@ -2146,6 +2152,9 @@ msgstr "" ...@@ -2146,6 +2152,9 @@ msgstr ""
msgid "Are you sure you want to cancel editing this comment?" msgid "Are you sure you want to cancel editing this comment?"
msgstr "" msgstr ""
msgid "Are you sure you want to delete %{name}?"
msgstr ""
msgid "Are you sure you want to delete these artifacts?" msgid "Are you sure you want to delete these artifacts?"
msgstr "" msgstr ""
...@@ -2411,6 +2420,9 @@ msgstr "" ...@@ -2411,6 +2420,9 @@ msgstr ""
msgid "Author" msgid "Author"
msgstr "" msgstr ""
msgid "Authored %{timeago} by %{author}"
msgstr ""
msgid "Authorization code:" msgid "Authorization code:"
msgstr "" msgstr ""
...@@ -6918,6 +6930,9 @@ msgstr "" ...@@ -6918,6 +6930,9 @@ msgstr ""
msgid "Edit your most recent comment in a thread (from an empty textarea)" msgid "Edit your most recent comment in a thread (from an empty textarea)"
msgstr "" msgstr ""
msgid "Edited %{timeago}"
msgstr ""
msgid "Editing" msgid "Editing"
msgstr "" msgstr ""
...@@ -22167,6 +22182,9 @@ msgstr "" ...@@ -22167,6 +22182,9 @@ msgstr ""
msgid "by" msgid "by"
msgstr "" msgstr ""
msgid "by %{user}"
msgstr ""
msgid "cannot be changed if a personal project has container registry tags." msgid "cannot be changed if a personal project has container registry tags."
msgstr "" msgstr ""
......
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