Commit c197ee17 authored by Sarah Groff Hennigh-Palermo's avatar Sarah Groff Hennigh-Palermo

Merge branch 'afontaine/translate-environments' into 'master'

Translate "by <AVATAR LINK>" in Environments

See merge request gitlab-org/gitlab!69009
parents c85351b1 1725355e
<script> <script>
/* eslint-disable @gitlab/vue-require-i18n-strings */ import { GlTooltipDirective, GlIcon, GlLink, GlSprintf } from '@gitlab/ui';
import { GlTooltipDirective, GlIcon, GlLink } from '@gitlab/ui';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import { __, s__, sprintf } from '~/locale'; import { __, s__, sprintf } from '~/locale';
...@@ -32,6 +31,7 @@ export default { ...@@ -32,6 +31,7 @@ export default {
ExternalUrlComponent, ExternalUrlComponent,
GlIcon, GlIcon,
GlLink, GlLink,
GlSprintf,
MonitoringButtonComponent, MonitoringButtonComponent,
PinComponent, PinComponent,
DeleteComponent, DeleteComponent,
...@@ -647,14 +647,17 @@ export default { ...@@ -647,14 +647,17 @@ export default {
</span> </span>
<span v-if="!isFolder && deploymentHasUser" class="text-break-word"> <span v-if="!isFolder && deploymentHasUser" class="text-break-word">
by <gl-sprintf :message="s__('Environments|by %{avatar}')">
<user-avatar-link <template #avatar>
:link-href="deploymentUser.web_url" <user-avatar-link
:img-src="deploymentUser.avatar_url" :link-href="deploymentUser.web_url"
:img-alt="userImageAltDescription" :img-src="deploymentUser.avatar_url"
:tooltip-text="deploymentUser.username" :img-alt="userImageAltDescription"
class="js-deploy-user-container float-none" :tooltip-text="deploymentUser.username"
/> class="js-deploy-user-container float-none"
/>
</template>
</gl-sprintf>
</span> </span>
<div v-if="showNoDeployments" class="commit-title table-mobile-content"> <div v-if="showNoDeployments" class="commit-title table-mobile-content">
...@@ -743,13 +746,16 @@ export default { ...@@ -743,13 +746,16 @@ export default {
</div> </div>
<div class="gl-display-flex"> <div class="gl-display-flex">
<span v-if="upcomingDeployment.user" class="text-break-word"> <span v-if="upcomingDeployment.user" class="text-break-word">
by <gl-sprintf :message="s__('Environments|by %{avatar}')">
<user-avatar-link <template #avatar>
:link-href="upcomingDeployment.user.web_url" <user-avatar-link
:img-src="upcomingDeployment.user.avatar_url" :link-href="upcomingDeployment.user.web_url"
:img-alt="upcomingDeploymentUserImageAltDescription" :img-src="upcomingDeployment.user.avatar_url"
:tooltip-text="upcomingDeployment.user.username" :img-alt="upcomingDeploymentUserImageAltDescription"
/> :tooltip-text="upcomingDeployment.user.username"
/>
</template>
</gl-sprintf>
</span> </span>
</div> </div>
</div> </div>
......
...@@ -12911,6 +12911,9 @@ msgstr "" ...@@ -12911,6 +12911,9 @@ msgstr ""
msgid "Environments|Your feedback helps GitLab make environments better for you and other users. Participate and enter a sweepstake to win a USD 30 gift card." msgid "Environments|Your feedback helps GitLab make environments better for you and other users. Participate and enter a sweepstake to win a USD 30 gift card."
msgstr "" msgstr ""
msgid "Environments|by %{avatar}"
msgstr ""
msgid "Environments|protected" msgid "Environments|protected"
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