Node.js based forum software built for the modern web
fix: #14555
Barış Soner Uşaklıe192f39fb434
diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.jsindex ee1538a554..a946d15ef2 100644--- a/public/src/modules/helpers.common.js+++ b/public/src/modules/helpers.common.js@@ -37,6 +37,8 @@ module.exports = function (utils, Benchpress, tx, relative_path) {clamp,quote,concat,+ txDisplayname,+ txUsername,generateWroteReplied,generateRepliedTo,generateWrote,@@ -389,7 +391,7 @@ module.exports = function (utils, Benchpress, tx, relative_path) {}classNames = escape(classNames || '');component = escape(component || '');- const displayname = escape(String(userObj.displayname || ''));+ const displayname = escape(txDisplayname.call(this, userObj));const picture = escape(String(userObj.picture || ''));const iconBgColor = escape(String(userObj['icon:bgColor'] || ''));const iconText = escape(String(userObj['icon:text'] || ''));@@ -445,6 +447,20 @@ module.exports = function (utils, Benchpress, tx, relative_path) {return args.join('');}+ function txDisplayname(user) {+ return txUsernameOrDisplayname.call(this, user, 'displayname');+ }++ function txUsername(user) {+ return txUsernameOrDisplayname.call(this, user, 'username');+ }++ function txUsernameOrDisplayname(user, field) {+ const name = String(user[field] || '');+ const shouldTranslate = user?.uid === 0 && (name === '[[global:former-user]]' || name === '[[global:guest]]');+ return shouldTranslate ? _tx.call(this, name) : escape(name);+ }+function generateWroteReplied(post, timeagoCutoff) {if (post.toPid) {return generateRepliedTo.call(this, post, timeagoCutoff);diff --git a/src/views/emails/partials/digest-topic.tpl b/src/views/emails/partials/digest-topic.tplindex 61e334ad80..220654081d 100644--- a/src/views/emails/partials/digest-topic.tpl+++ b/src/views/emails/partials/digest-topic.tpl@@ -4,7 +4,7 @@<td style="padding: 6px 16px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; width: 32px; vertical-align: middle;">{{renderDigestAvatar(@value)}}</td><td style="padding: 6px 16px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; line-height: 16px; color: #333333;"><p style="margin: 0;"><a style="text-decoration:none !important; text-decoration:none; color: #333333;" href="{url}/topic/{./slug}"><strong>{./title}</strong></a></p>- <p style="margin: 0; font-size: 12px;"><a style="text-decoration:none !important; text-decoration:none; color: #aaaaaa; line-height: 16px;" href="{url}/uid/{./teaser.user.uid}"><strong>{./teaser.user.displayname}</strong></a></p>+ <p style="margin: 0; font-size: 12px;"><a style="text-decoration:none !important; text-decoration:none; color: #aaaaaa; line-height: 16px;" href="{url}/uid/{./teaser.user.uid}"><strong>{{txDisplayname(./teaser.user)}}</strong></a></p></td></tr><tr>diff --git a/src/views/partials/chats/message.tpl b/src/views/partials/chats/message.tplindex ab8175ec4a..74b57e8271 100644--- a/src/views/partials/chats/message.tpl+++ b/src/views/partials/chats/message.tpl@@ -1,4 +1,4 @@-<li component="chat/message" class="chat-message mx-2 pe-2 {{{ if messages.deleted }}} deleted{{{ end }}} {{{ if messages.pinned}}} pinned{{{ end }}} {{{ if messages.newSet }}}border-top pt-3{{{ end }}}" data-mid="{messages.messageId}" data-uid="{messages.fromuid}" data-index="{messages.index}" data-self="{messages.self}" data-break="{messages.newSet}" data-timestamp="{messages.timestamp}" data-username="{messages.fromUser.username}" data-displayname="{messages.fromUser.displayname}">+<li component="chat/message" class="chat-message mx-2 pe-2 {{{ if messages.deleted }}} deleted{{{ end }}} {{{ if messages.pinned}}} pinned{{{ end }}} {{{ if messages.newSet }}}border-top pt-3{{{ end }}}" data-mid="{messages.messageId}" data-uid="{messages.fromuid}" data-index="{messages.index}" data-self="{messages.self}" data-break="{messages.newSet}" data-timestamp="{messages.timestamp}" data-username="{messages.fromUser.username}" data-displayname="{{txDisplayname(messages.fromUser)}}">{{{ if messages.parent }}}<!-- IMPORT partials/chats/parent.tpl -->@@ -6,12 +6,12 @@<div class="message-header lh-1 d-flex align-items-center gap-2 text-sm {{{ if !messages.newSet }}}hidden{{{ end }}} pb-2"><a href="{config.relative_path}/user/{messages.fromUser.userslug}" class="text-decoration-none">{{buildAvatar(messages.fromUser, "18px", true, "not-responsive")}}</a>- <span class="chat-user fw-semibold"><a href="{config.relative_path}/user/{messages.fromUser.userslug}">{messages.fromUser.displayname}</a></span>+ <span class="chat-user fw-semibold"><a href="{config.relative_path}/user/{messages.fromUser.userslug}">{{txDisplayname(messages.fromUser)}}</a></span>{{{ if messages.fromUser.banned }}}- <span class="badge bg-danger">[[user:banned]]</span>+ <span class="badge bg-danger">{{tx("user:banned")}}</span>{{{ end }}}{{{ if messages.fromUser.deleted }}}- <span class="badge bg-danger">[[user:deleted]]</span>+ <span class="badge bg-danger">{{tx("user:deleted")}}</span>{{{ end }}}<span class="chat-timestamp text-muted timeago" title="{messages.timestampISO}"></span>diff --git a/src/views/partials/chats/parent.tpl b/src/views/partials/chats/parent.tplindex deb8a15b16..7ee6a6381e 100644--- a/src/views/partials/chats/parent.tpl+++ b/src/views/partials/chats/parent.tpl@@ -3,7 +3,7 @@<div class="d-flex gap-2 text-sm text-nowrap"><div class="d-flex flex-nowrap gap-1 align-items-center"><a href="{config.relative_path}/user/{messages.parent.user.userslug}" class="text-decoration-none lh-1">{{buildAvatar(messages.parent.user, "14px", true, "not-responsive align-middle")}}</a>- <a class="chat-user fw-semibold text-truncate" style="max-width: 150px;" href="{config.relative_path}/user/{messages.parent.user.userslug}">{messages.parent.user.displayname}</a>+ <a class="chat-user fw-semibold text-truncate" style="max-width: 150px;" href="{config.relative_path}/user/{messages.parent.user.userslug}">{{txDisplayname(messages.parent.user)}}</a></div><span class="chat-timestamp text-muted timeago text-nowrap hidden" title="{messages.parent.timestampISO}"></span></div>diff --git a/src/views/partials/chats/pinned-messages-list.tpl b/src/views/partials/chats/pinned-messages-list.tplindex 7db966801a..029b93361f 100644--- a/src/views/partials/chats/pinned-messages-list.tpl+++ b/src/views/partials/chats/pinned-messages-list.tpl@@ -7,7 +7,7 @@<div class="message-header lh-1 d-flex align-items-center gap-2 text-sm pb-2"><a href="{config.relative_path}/user/{messages.fromUser.userslug}" class="text-decoration-none">{{buildAvatar(messages.fromUser, "18px", true, "not-responsive")}}</a>- <span class="chat-user fw-semibold"><a href="{config.relative_path}/user/{messages.fromUser.userslug}">{messages.fromUser.displayname}</a></span>+ <span class="chat-user fw-semibold"><a href="{config.relative_path}/user/{messages.fromUser.userslug}">{{txDisplayname(messages.fromUser)}}</a></span><span class="chat-timestamp text-muted timeago" title="{messages.timestampISO}"></span><div component="chat/message/edited" class="text-muted ms-auto {{{ if !messages.edited }}}hidden{{{ end }}}" title="[[global:edited-timestamp, {isoTimeToLocaleString(messages.editedISO, config.userLang)}]]"><i class="fa fa-edit"></i></span></div>diff --git a/src/views/partials/chats/room-teaser.tpl b/src/views/partials/chats/room-teaser.tplindex 92f8688e35..0a98ccd232 100644--- a/src/views/partials/chats/room-teaser.tpl+++ b/src/views/partials/chats/room-teaser.tpl@@ -2,7 +2,7 @@{{{ if ./teaser }}}<div class="teaser-content text-sm line-clamp-3 text-break">{{buildAvatar(./teaser.user, "14px", true, "align-middle")}}- <strong class="text-xs fw-semibold teaser-username">{./teaser.user.displayname}:</strong>+ <strong class="text-xs fw-semibold teaser-username">{{txDisplayname(./teaser.user)}}:</strong>{./teaser.content}</div><div class="teaser-timestamp text-muted text-xs">{{{ if ./teaser.timeagoLong }}}{./teaser.timeagoLong}{{{ else }}}<span class="timeago" title="{./teaser.timestampISO}"></span>{{{ end }}}</div>diff --git a/src/views/partials/feed/item.tpl b/src/views/partials/feed/item.tplindex 888b3d13f0..68e73bf0cd 100644--- a/src/views/partials/feed/item.tpl+++ b/src/views/partials/feed/item.tpl@@ -30,7 +30,7 @@<div class="text-sm"><div class="post-author d-flex align-items-center gap-1"><a class="d-inline d-lg-none lh-1 text-decoration-none" href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "16px", true, "not-responsive")}}</a>- <a class="lh-normal fw-semibold text-nowrap" href="{config.relative_path}/user/{./user.userslug}">{./user.displayname}</a>+ <a class="lh-normal fw-semibold text-nowrap" href="{config.relative_path}/user/{./user.userslug}">{{txDisplayname(./user)}}</a></div><span class="timeago text-muted lh-normal" title="{./timestampISO}"></span></div>@@ -76,7 +76,7 @@{{{ end }}}<div class="d-inline-flex flex-column px-3 py-2 rounded gap-2 bg-body-tertiary align-self-start"><div class="d-flex align-items-top gap-2">- <a class="text-decoration-none avatar-tooltip" title="{./topic.teaser.user.displayname}" href="{config.relative_path}/user/{./topic.teaser.user.userslug}">{{buildAvatar(./topic.teaser.user, "18px", true)}} {./topic.teaser.user.displayname}</a>+ <a class="text-decoration-none avatar-tooltip" title="{{txDisplayname(./topic.teaser.user)}}" href="{config.relative_path}/user/{./topic.teaser.user.userslug}">{{buildAvatar(./topic.teaser.user, "18px", true)}} {{txDisplayname(./topic.teaser.user)}}</a><a class="permalink text-muted timeago text-xs" href="{config.relative_path}/topic/{./topic.slug}{{{ if ./index }}}/{./index}{{{ end }}}" title="{./topic.teaser.timestampISO}" aria-label="[[global:lastpost]]"></a></div><div class="post-content text-xs text-break line-clamp-sm-2 lh-sm position-relative flex-fill">diff --git a/src/views/partials/search/results.tpl b/src/views/partials/search/results.tplindex 0b198cc68e..0e71da4da2 100644--- a/src/views/partials/search/results.tpl+++ b/src/views/partials/search/results.tpl@@ -24,7 +24,7 @@<div class="d-flex gap-3 post-info"><div class="post-author d-flex gap-1"><a class="lh-1 text-decoration-none" href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "16px", true, "not-responsive")}}</a>- <a class="fw-semibold text-sm" href="{config.relative_path}/user/{./user.userslug}">{./user.displayname}</a>+ <a class="fw-semibold text-sm" href="{config.relative_path}/user/{./user.userslug}">{{txDisplayname(./user)}}</a></div><span class="timeago text-sm text-muted" title="{./timestampISO}"></span></div>diff --git a/src/views/partials/topic/post-parent.tpl b/src/views/partials/topic/post-parent.tplindex f8512a2bbe..ca7577cd5f 100644--- a/src/views/partials/topic/post-parent.tpl+++ b/src/views/partials/topic/post-parent.tpl@@ -2,7 +2,7 @@<div class="d-flex gap-2 text-nowrap"><div class="d-flex flex-nowrap gap-1 align-items-center"><a href="{config.relative_path}/user/{./parent.user.userslug}" class="text-decoration-none lh-1">{{buildAvatar(./parent.user, "16px", true, "not-responsive align-middle")}}</a>- <a class="fw-semibold text-truncate" style="max-width: 150px;" href="{config.relative_path}/user/{./parent.user.userslug}">{./parent.user.displayname}</a>+ <a class="fw-semibold text-truncate" style="max-width: 150px;" href="{config.relative_path}/user/{./parent.user.userslug}">{{txDisplayname(./parent.user)}}</a></div><a href="{config.relative_path}/post/{encodeURIComponent(./parent.pid)}" class="text-muted timeago text-nowrap hidden" title="{./parent.timestampISO}"></a>diff --git a/src/views/registerComplete.tpl b/src/views/registerComplete.tplindex 136c4c8578..0ea019beec 100644--- a/src/views/registerComplete.tpl+++ b/src/views/registerComplete.tpl@@ -11,7 +11,7 @@</p><ul>{{{each errors}}}- <li>{@value}</li>+ <li>{{tx(@value)}}</li>{{{end}}}</ul></div>