Skip to content
代码片段 群组 项目
未验证 提交 414663bc 编辑于 作者: Lee Tickett's avatar Lee Tickett 提交者: GitLab
浏览文件

Merge branch 'fix-translation-escaping' into 'master'

Fix character escaping in fork divergence message

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147808



Merged-by: default avatarLee Tickett <ltickett@gitlab.com>
Approved-by: default avatarLorenz van Herwaarden <lvanherwaarden@gitlab.com>
Approved-by: default avatarJustin Ho Tuan Duong <hduong@gitlab.com>
Approved-by: default avatarCostel Maxim <cmaxim@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -214,9 +214,13 @@ export default { ...@@ -214,9 +214,13 @@ export default {
return this.$options.i18n.unknown; return this.$options.i18n.unknown;
} }
if (this.hasBehindAheadMessage) { if (this.hasBehindAheadMessage) {
return sprintf(this.$options.i18n.behindAhead, { return sprintf(
messages: this.behindAheadMessage, this.$options.i18n.behindAhead,
}); {
messages: this.behindAheadMessage,
},
false,
);
} }
return this.$options.i18n.upToDate; return this.$options.i18n.upToDate;
}, },
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册