Skip to content

Node.js based forum software built for the modern web

Merge branch 'master' into develop

Barış Soner Uşaklıe31f01b41107
diff --cc src/views/admin/manage/api.tpl
index d2a26cbc72,9dd711f1a4..7f2f05bb05
--- a/src/views/admin/manage/api.tpl
+++ b/src/views/admin/manage/api.tpl
@@@ -15,18 -15,17 +15,17 @@@
</div>
<form role="form" class="core-api-settings">
- <p class="lead">[[admin/settings/api:lead-text]]</p>
- <p>[[admin/settings/api:intro]]</p>
- <p class="text-danger">[[admin/settings/api:warning]]</p>
+ <p class="lead">{{tx("admin/settings/api:lead-text")}}</p>
+ <p>{{tx("admin/settings/api:intro")}}</p>
+ <p class="text-danger">{{tx("admin/settings/api:warning")}}</p>
- <p class="d-flex flex-column gap-2">
+ <p class="d-flex flex-column gap-2 mb-4">
<a href="https://docs.nodebb.org/api">
<i class="fa fa-external-link"></i>
- [[admin/settings/api:docs]]
+ {{tx("admin/settings/api:docs")}}
</a>
- <br />
<a href="https://docs.nodebb.org/api/write">
<i class="fa fa-external-link"></i>
- [[admin/settings/api:docs.write]]
+ {{tx("admin/settings/api:docs.write")}}
</a>
</p>
diff --cc src/views/partials/chats/pinned-messages-list.tpl
index d886d978f0,029b93361f..f41adc7d16
--- a/src/views/partials/chats/pinned-messages-list.tpl
+++ b/src/views/partials/chats/pinned-messages-list.tpl
@@@ -7,10 -7,10 +7,10 @@@
<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>
+ <div component="chat/message/edited" class="text-muted ms-auto {{{ if !messages.edited }}}hidden{{{ end }}}" title="{{tx("global:edited-timestamp", isoTimeToLocaleString(messages.editedISO, config.userLang))}}"><i class="fa fa-edit"></i></span></div>
</div>
<div class="message-body-wrapper">
<div component="chat/message/body" class="message-body ps-0 py-0 overflow-auto text-break">
diff --cc src/views/partials/feed/item.tpl
index 9cc0ec59f8,68e73bf0cd..938021ec6e
--- a/src/views/partials/feed/item.tpl
+++ b/src/views/partials/feed/item.tpl
@@@ -76,11 -76,11 +76,11 @@@
{{{ 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>
++ <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)}}</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="{{tx("global:lastpost")}}"></a>
</div>
<div class="post-content text-xs text-break line-clamp-sm-2 lh-sm position-relative flex-fill">
- <a class="stretched-link" tabindex="-1" href="{config.relative_path}/topic/{./topic.slug}{{{ if ./topic.teaser.index }}}/{./topic.teaser.index}{{{ end }}}" aria-label="[[global:lastpost]]"></a>
+ <a class="stretched-link" tabindex="-1" href="{config.relative_path}/topic/{./topic.slug}{{{ if ./topic.teaser.index }}}/{./topic.teaser.index}{{{ end }}}" aria-label="{{tx("global:lastpost")}}"></a>
{{./topic.teaser.content}}
</div>
</div>