Node.js based forum software built for the modern web
refactor: use tx helper
Barış Soner Uşaklıeaaefddee08a
diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.jsindex 31fdc1b06b..9413153680 100644--- a/public/src/modules/helpers.common.js+++ b/public/src/modules/helpers.common.js@@ -230,15 +230,15 @@ module.exports = function (utils, Benchpress, tx, relative_path) {const displayName = groupObj.displayName ? escape(groupObj.displayName) : '';if (groupObj.isMember && groupObj.name !== 'administrators') {- return `<button class="btn btn-danger text-nowrap ${btnClass}" data-action="leave" data-group="${displayName}" ${(groupObj.disableLeave ? ' disabled' : '')}><i class="fa fa-times"></i> [[groups:membership.leave-group]]</button>`;+ return `<button class="btn btn-danger text-nowrap ${btnClass}" data-action="leave" data-group="${displayName}" ${(groupObj.disableLeave ? ' disabled' : '')}><i class="fa fa-times"></i> ${_tx.call(this, 'groups:membership.leave-group')}</button>`;}if (groupObj.isPending && groupObj.name !== 'administrators') {- return `<button class="btn btn-warning text-nowrap disabled ${btnClass}"><i class="fa fa-clock-o"></i> [[groups:membership.invitation-pending]]</button>`;+ return `<button class="btn btn-warning text-nowrap disabled ${btnClass}"><i class="fa fa-clock-o"></i> ${_tx.call(this, 'groups:membership.invitation-pending')}</button>`;} else if (groupObj.isInvited) {- return `<button class="btn btn-warning text-nowrap" data-action="rejectInvite" data-group="${displayName}">[[groups:membership.reject]]</button><button class="btn btn-success" data-action="acceptInvite" data-group="${escape(groupObj.name)}"><i class="fa fa-plus"></i> [[groups:membership.accept-invitation]]</button>`;+ return `<button class="btn btn-warning text-nowrap" data-action="rejectInvite" data-group="${displayName}">${_tx.call(this, 'groups:membership.reject')}</button><button class="btn btn-success" data-action="acceptInvite" data-group="${escape(groupObj.name)}"><i class="fa fa-plus"></i> ${_tx.call(this, 'groups:membership.accept-invitation')}</button>`;} else if (!groupObj.disableJoinRequests && groupObj.name !== 'administrators') {- return `<button class="btn btn-success text-nowrap ${btnClass}" data-action="join" data-group="${displayName}"><i class="fa fa-plus"></i> [[groups:membership.join-group]]</button>`;+ return `<button class="btn btn-success text-nowrap ${btnClass}" data-action="join" data-group="${displayName}"><i class="fa fa-plus"></i> ${_tx.call(this, 'groups:membership.join-group')}</button>`;}return '';}diff --git a/src/views/groups/list.tpl b/src/views/groups/list.tplindex 6d62e93482..dc135b4743 100644--- a/src/views/groups/list.tpl+++ b/src/views/groups/list.tpl@@ -4,15 +4,15 @@{{{end}}}</div><div class="groups list flex-fill">- <h3 class="fw-semibold">[[pages:groups]]</h3>+ <h3 class="fw-semibold">{{tx("pages:groups")}}</h3><div class="d-flex flex-wrap justify-content-between"><div class="mb-2 mb-md-0"><div class="text-sm d-flex flex-wrap align-items-center gap-2">- [[topic:sort-by]]+ {{tx("topic:sort-by")}}<div class="d-flex flex-wrap gap-2">- <a href="?sort=alpha" class="btn btn-ghost btn-sm ff-secondary fw-semibold text-nowrap {{{ if (sort == "alpha") }}}active{{{ end }}}">[[groups:details.group-name]]</a>- <a href="?sort=count" class="btn btn-ghost btn-sm ff-secondary fw-semibold text-nowrap {{{ if (sort == "count") }}}active{{{ end }}}">[[groups:details.member-count]]</a>- <a href="?sort=date" class="btn btn-ghost btn-sm ff-secondary fw-semibold text-nowrap {{{ if (sort == "date") }}}active{{{ end }}}">[[groups:details.creation-date]]</a>+ <a href="?sort=alpha" class="btn btn-ghost btn-sm ff-secondary fw-semibold text-nowrap {{{ if (sort == "alpha") }}}active{{{ end }}}">{{tx("groups:details.group-name")}}</a>+ <a href="?sort=count" class="btn btn-ghost btn-sm ff-secondary fw-semibold text-nowrap {{{ if (sort == "count") }}}active{{{ end }}}">{{tx("groups:details.member-count")}}</a>+ <a href="?sort=date" class="btn btn-ghost btn-sm ff-secondary fw-semibold text-nowrap {{{ if (sort == "date") }}}active{{{ end }}}">{{tx("groups:details.creation-date")}}</a></div></div></div>@@ -20,18 +20,18 @@<div class="d-flex justify-content-end gap-2"><div>{{{ if allowGroupCreation }}}- <button class="btn btn-primary btn-sm text-nowrap" data-action="new"><i class="fa fa-users"></i> [[groups:new-group]]</button>+ <button class="btn btn-primary btn-sm text-nowrap" data-action="new"><i class="fa fa-users"></i> {{tx("groups:new-group")}}</button>{{{ end }}}<select class="form-select hidden" id="search-sort">- <option value="alpha">[[groups:details.group-name]]</option>- <option value="count">[[groups:details.member-count]]</option>- <option value="date">[[groups:details.creation-date]]</option>+ <option value="alpha">{{tx("groups:details.group-name")}}</option>+ <option value="count">{{tx("groups:details.member-count")}}</option>+ <option value="date">{{tx("groups:details.creation-date")}}</option></select></div><div><div class="input-group">- <input type="text" class="form-control form-control-sm" placeholder="[[global:search]]" name="query" id="search-text">- <button id="search-button" class="btn btn-primary btn-sm" aria-label="[[global:search]]">+ <input type="text" class="form-control form-control-sm" placeholder="{{tx("global:search")}}" name="query" id="search-text">+ <button id="search-button" class="btn btn-primary btn-sm" aria-label="{{tx("global:search")}}"><i class="fa fa-search"></i></button></div>@@ -48,7 +48,7 @@{{{ else }}}<div class="col-12"><div class="alert alert-warning">- [[groups:no-groups-found]]+ {{tx("groups:no-groups-found")}}</div></div>{{{ end }}}