Skip to content

Node.js based forum software built for the modern web

refactor: use double {{}} on tx

Barış Soner Uşaklı29dffc6c3f7b
diff --git a/install/package.json b/install/package.json
index 4cf13bd3ec..4d910ec381 100644
--- a/install/package.json
+++ b/install/package.json
@@ -112,10 +112,10 @@
"nodebb-plugin-spam-be-gone": "2.3.3",
"nodebb-plugin-web-push": "0.7.11",
"nodebb-rewards-essentials": "1.0.3",
- "nodebb-theme-harmony": "3.0.11",
- "nodebb-theme-lavender": "8.0.5",
- "nodebb-theme-peace": "3.0.5",
- "nodebb-theme-persona": "15.0.10",
+ "nodebb-theme-harmony": "3.0.12",
+ "nodebb-theme-lavender": "8.0.6",
+ "nodebb-theme-peace": "3.0.6",
+ "nodebb-theme-persona": "15.0.11",
"nodebb-widget-essentials": "8.0.0",
"nodemailer": "8.0.11",
"nprogress": "0.2.0",
diff --git a/src/views/500.tpl b/src/views/500.tpl
index 88552df5ec..3d125e2dd1 100644
--- a/src/views/500.tpl
+++ b/src/views/500.tpl
@@ -7,7 +7,7 @@
<i class="text-secondary fa fa-fw fa-4x fa-triangle-exclamation"></i>
</div>
[[global:500.message]]
- {{{ if error }}}<div class="text-sm text-muted">{tx(error)}</div>{{{ end }}}
+ {{{ if error }}}<div class="text-sm text-muted">{{tx(error)}}</div>{{{ end }}}
</div>
</div>
</div>
\ No newline at end of file
diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl
index 3112d73207..ea00be2dd7 100644
--- a/src/views/admin/extend/widgets.tpl
+++ b/src/views/admin/extend/widgets.tpl
@@ -33,7 +33,7 @@
<div class="tab-pane {{{ if @first }}}active{{{ end }}}" data-template="{./template}">
{{{ each templates.areas }}}
<div class="area" data-template="{templates.template}" data-location="{./location}">
- <h5>{tx(./name)} <span class="fs-6 text-secondary">{templates.template} / {./location}</span></h5>
+ <h5>{{tx(./name)}} <span class="fs-6 text-secondary">{templates.template} / {./location}</span></h5>
<div class="card card-body text-bg-light widget-area {{{ if (./location == "drafts")}}} overflow-auto{{{ end }}}" {{{ if (./location == "drafts")}}}style="max-height: calc(100vh - 200px);"{{{ end }}}>
</div>
diff --git a/src/views/admin/federation/errors.tpl b/src/views/admin/federation/errors.tpl
index d850ecef30..830dda0612 100644
--- a/src/views/admin/federation/errors.tpl
+++ b/src/views/admin/federation/errors.tpl
@@ -1,6 +1,6 @@
<div component="settings/main/header" class="row border-bottom py-2 m-0 mb-3 sticky-top acp-page-main-header align-items-center">
<div class="col-12 col-md-8 px-0 mb-1 mb-md-0">
- <h4 class="fw-bold tracking-tight mb-0">{tx(title)}</h4>
+ <h4 class="fw-bold tracking-tight mb-0">{{tx(title)}}</h4>
</div>
</div>
diff --git a/src/views/admin/federation/relays.tpl b/src/views/admin/federation/relays.tpl
index c0f449b2fb..f9fc2df052 100644
--- a/src/views/admin/federation/relays.tpl
+++ b/src/views/admin/federation/relays.tpl
@@ -1,6 +1,6 @@
<div component="settings/main/header" class="row border-bottom py-2 m-0 mb-3 sticky-top acp-page-main-header align-items-center">
<div class="col-12 col-md-8 px-0 mb-1 mb-md-0">
- <h4 class="fw-bold tracking-tight mb-0">{tx(title)}</h4>
+ <h4 class="fw-bold tracking-tight mb-0">{{tx(title)}}</h4>
</div>
</div>
diff --git a/src/views/admin/manage/api.tpl b/src/views/admin/manage/api.tpl
index 686db99071..1734a68fc8 100644
--- a/src/views/admin/manage/api.tpl
+++ b/src/views/admin/manage/api.tpl
@@ -1,7 +1,7 @@
<div class="px-lg-4">
<div component="settings/main/header" class="row d-flex flex-wrap justify-content-between border-bottom py-2 m-0 sticky-top acp-page-main-header align-items-center mb-3">
<div class="col-12 col-md-8 px-0 mb-1 mb-md-0">
- <h4 class="fw-bold tracking-tight mb-0">{tx(./title)}</h4>
+ <h4 class="fw-bold tracking-tight mb-0">{{tx(./title)}}</h4>
</div>
<div class="col-12 col-md-4 px-0 px-md-3">
<div class="d-flex gap-1 justify-content-end">
diff --git a/src/views/admin/partials/dashboard/stats.tpl b/src/views/admin/partials/dashboard/stats.tpl
index b45b793548..aece2ac32d 100644
--- a/src/views/admin/partials/dashboard/stats.tpl
+++ b/src/views/admin/partials/dashboard/stats.tpl
@@ -22,7 +22,7 @@
<tr>
<td class="fw-semibold text-nowrap">
{{{ if ./href }}}
- <a href="{./href}">{tx(./name)}</a>
+ <a href="{./href}">{{tx(./name)}}</a>
{{{ else }}}
{tx(./name)}
{{{ end }}}
diff --git a/src/views/admin/partials/navigation.tpl b/src/views/admin/partials/navigation.tpl
index 7097a55d27..c55fafceb0 100644
--- a/src/views/admin/partials/navigation.tpl
+++ b/src/views/admin/partials/navigation.tpl
@@ -160,14 +160,14 @@
<div id="collapsePlugins" class="accordion-collapse collapse" data-bs-parent="#accordionACP">
<div class="accordion-body p-0 d-grid">
{{{ each plugins }}}
- <a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin{./route}">{tx(./name)}</a>
+ <a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin{./route}">{{tx(./name)}}</a>
{{{ end }}}
{{{ if authentication.length }}}
<hr/>
<div class="text-sm ms-4">[[admin/menu:section-social-auth]]</div>
{{{ each authentication }}}
- <a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin{./route}">{tx(./name)}</a>
+ <a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin{./route}">{{tx(./name)}}</a>
{{{ end }}}
{{{ end }}}
<hr/>
diff --git a/src/views/admin/partials/privileges/category.tpl b/src/views/admin/partials/privileges/category.tpl
index 153e90faeb..dbd5a10879 100644
--- a/src/views/admin/partials/privileges/category.tpl
+++ b/src/views/admin/partials/privileges/category.tpl
@@ -18,7 +18,7 @@
<th colspan="2">[[admin/manage/categories:privileges.section-group]]</th>
<th class="text-center">[[admin/manage/privileges:select-clear-all]]</th>
{{{ each privileges.labelData }}}
- <th class="text-center" data-type="{./type}">{tx(./label)}</th>
+ <th class="text-center" data-type="{./type}">{{tx(./label)}}</th>
{{{ end }}}
</tr>
</thead>
@@ -111,7 +111,7 @@
<th colspan="2">[[admin/manage/categories:privileges.section-user]]</th>
<th class="text-center">[[admin/manage/privileges:select-clear-all]]</th>
{{{ each privileges.labelData }}}
- <th class="text-center" data-type="{./type}">{tx(./label)}</th>
+ <th class="text-center" data-type="{./type}">{{tx(./label)}}</th>
{{{ end }}}
</tr>
</thead>
diff --git a/src/views/admin/partials/privileges/global.tpl b/src/views/admin/partials/privileges/global.tpl
index beb4fbb7d2..ce838141cb 100644
--- a/src/views/admin/partials/privileges/global.tpl
+++ b/src/views/admin/partials/privileges/global.tpl
@@ -20,7 +20,7 @@
<th colspan="2">[[admin/manage/categories:privileges.section-group]]</th>
<th class="text-center">[[admin/manage/privileges:select-clear-all]]</th>
{{{ each privileges.labelData }}}
- <th class="text-center" data-type="{./type}">{tx(./label)}</th>
+ <th class="text-center" data-type="{./type}">{{tx(./label)}}</th>
{{{ end }}}
</tr>
</thead>
@@ -86,7 +86,7 @@
<th colspan="2">[[admin/manage/categories:privileges.section-user]]</th>
<th class="text-center">[[admin/manage/privileges:select-clear-all]]</th>
{{{ each privileges.labelData }}}
- <th class="text-center" data-type="{./type}">{tx(./label)}</th>
+ <th class="text-center" data-type="{./type}">{{tx(./label)}}</th>
{{{ end }}}
</tr>
</thead>
diff --git a/src/views/admin/partials/settings/header.tpl b/src/views/admin/partials/settings/header.tpl
index 993277741e..790ad81f3c 100644
--- a/src/views/admin/partials/settings/header.tpl
+++ b/src/views/admin/partials/settings/header.tpl
@@ -1,6 +1,6 @@
<div component="settings/main/header" class="row border-bottom py-2 m-0 sticky-top acp-page-main-header align-items-center">
<div class="col-12 col-md-8 px-0 mb-1 mb-md-0">
- <h4 class="fw-bold tracking-tight mb-0">{tx(title)}</h4>
+ <h4 class="fw-bold tracking-tight mb-0">{{tx(title)}}</h4>
</div>
{{{ if !hideSave }}}
<div class="col-12 col-md-4 px-0 px-md-3">
diff --git a/src/views/admin/settings/navigation.tpl b/src/views/admin/settings/navigation.tpl
index f9638e59fe..3616aff61d 100644
--- a/src/views/admin/settings/navigation.tpl
+++ b/src/views/admin/settings/navigation.tpl
@@ -137,7 +137,7 @@
</div>
<div class="d-flex flex-column">
<p class="mb-0">
- <strong>{tx(./text)}</strong>
+ <strong>{{tx(./text)}}</strong>
</p>
<p class="mb-0">
{{{ if ./core }}}
diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl
index 047829efd8..67a86a9609 100644
--- a/src/views/admin/settings/user.tpl
+++ b/src/views/admin/settings/user.tpl
@@ -350,7 +350,7 @@
{{{ each notificationSettings }}}
<div class="row">
<div class="mb-3 col-7">
- <label class="form-label">{tx(./label)}</label>
+ <label class="form-label">{{tx(./label)}}</label>
</div>
<div class="mb-3 col-5">
<select class="form-select" data-field="{./name}">
diff --git a/src/views/flags/detail.tpl b/src/views/flags/detail.tpl
index 499d4bc574..82418b0b31 100644
--- a/src/views/flags/detail.tpl
+++ b/src/views/flags/detail.tpl
@@ -93,7 +93,7 @@
<ul class="list-unstyled">
{{{ each ./fields }}}
<li>
- [[flags:{@key}]]{{{ if @value }}} &rarr; <span class="fw-semibold">{tx(@value)}</span>{{{ end }}}
+ [[flags:{@key}]]{{{ if @value }}} &rarr; <span class="fw-semibold">{{tx(@value)}}</span>{{{ end }}}
</li>
{{{ end }}}
{{{ each ./meta }}}
diff --git a/src/views/login.tpl b/src/views/login.tpl
index fdd1d043f0..497edbf0ab 100644
--- a/src/views/login.tpl
+++ b/src/views/login.tpl
@@ -12,7 +12,7 @@
<div class="login-block">
<form class="d-flex flex-column gap-3" role="form" method="post" id="login-form">
<div class="mb-2 d-flex flex-column gap-2">
- <label for="username">{tx(allowLoginWith)}</label>
+ <label for="username">{{tx(allowLoginWith)}}</label>
<input class="form-control" type="text" placeholder="{tx(allowLoginWith)}" name="username" id="username" autocorrect="off" autocapitalize="off" autocomplete="nickname" value="{username}" aria-required="true"/>
</div>
@@ -33,7 +33,7 @@
{{{ each loginFormEntry }}}
<div class="mb-2 loginFormEntry d-flex flex-column gap-2 {./styleName}">
- <label for="{./inputId}">{tx(./label)}</label>
+ <label for="{./inputId}">{{tx(./label)}}</label>
<div>{{./html}}</div>
</div>
{{{ end }}}
diff --git a/src/views/modals/upload-file.tpl b/src/views/modals/upload-file.tpl
index b0733f8ba6..ae7daa0f8b 100644
--- a/src/views/modals/upload-file.tpl
+++ b/src/views/modals/upload-file.tpl
@@ -2,14 +2,14 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
- <h5 class="modal-title">{tx(title)}</h5>
+ <h5 class="modal-title">{{tx(title)}}</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="[[global:buttons.close]]"></button>
</div>
<div class="modal-body">
<form class="mb-3" id="uploadForm" action="" method="post" enctype="multipart/form-data">
<div>
{{{ if description }}}
- <label class="form-label" for="fileInput">{tx(description)}</label>
+ <label class="form-label" for="fileInput">{{tx(description)}}</label>
{{{ end }}}
<input type="file" id="fileInput" name="files[]" {{{ if accept }}}accept="{accept}"{{{ end }}}>
{{{ if showHelp }}}
@@ -37,7 +37,7 @@
</div>
<div class="modal-footer">
<button class="btn btn-outline-secondary" data-bs-dismiss="modal">[[global:close]]</button>
- <button id="fileUploadSubmitBtn" class="btn btn-primary">{tx(button)}</button>
+ <button id="fileUploadSubmitBtn" class="btn btn-primary">{{tx(button)}}</button>
</div>
</div>
</div>
diff --git a/src/views/partials/category/sort.tpl b/src/views/partials/category/sort.tpl
index 06bfad0d97..b50e73b7f0 100644
--- a/src/views/partials/category/sort.tpl
+++ b/src/views/partials/category/sort.tpl
@@ -1,7 +1,7 @@
<div class="dropdown bottom-sheet" component="thread/sort">
<button class="btn btn-ghost btn-sm ff-secondary d-flex gap-2 align-items-center dropdown-toggle h-100" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false" aria-label="[[aria:topic-sort-option, {sortOptionLabel}]]">
<i class="fa fa-fw fa-arrow-down-wide-short text-primary"></i>
- <span class="d-none d-md-inline fw-semibold">{tx(sortOptionLabel)}</span>
+ <span class="d-none d-md-inline fw-semibold">{{tx(sortOptionLabel)}}</span>
</button>
<ul class="dropdown-menu p-1 text-sm" role="menu">
diff --git a/src/views/partials/toast.tpl b/src/views/partials/toast.tpl
index 77a777586a..054d4e9a26 100644
--- a/src/views/partials/toast.tpl
+++ b/src/views/partials/toast.tpl
@@ -6,7 +6,7 @@
{{{ end }}}
<div class="d-flex flex-column gap-2">
{{{ if title }}}
- <strong component="toast/title">{tx(title)}</strong>
+ <strong component="toast/title">{{tx(title)}}</strong>
{{{ end }}}
{{{ if message }}}
diff --git a/src/views/partials/topic-filters.tpl b/src/views/partials/topic-filters.tpl
index 48cfcfbb85..0810fd5bf7 100644
--- a/src/views/partials/topic-filters.tpl
+++ b/src/views/partials/topic-filters.tpl
@@ -1,13 +1,13 @@
<div class="dropdown bottom-sheet{{{ if !filters.length }}} hidden{{{ end }}}">
<button type="button" class="btn btn-ghost btn-sm ff-secondary d-flex gap-2 align-items-center dropdown-toggle h-100" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-fw fa-filter text-primary"></i>
- <span class="visible-md-inline visible-lg-inline fw-semibold">{tx(selectedFilter.name)}</span>
+ <span class="visible-md-inline visible-lg-inline fw-semibold">{{tx(selectedFilter.name)}}</span>
</button>
<ul class="dropdown-menu p-1 text-sm" role="menu">
{{{each filters}}}
<li role="presentation" class="category {{{if filters.selected}}}selected{{{end}}}">
<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menuitem" href="{config.relative_path}/{filters.url}">
- <div class="flex-grow-1">{tx(filters.name)}</div>
+ <div class="flex-grow-1">{{tx(filters.name)}}</div>
<i class="flex-shrink-0 fa fa-fw {{{ if filters.selected }}}fa-check{{{ end }}}"></i>
</a>
</li>
diff --git a/src/views/partials/topic-terms.tpl b/src/views/partials/topic-terms.tpl
index f9ff6ad837..691d0a5c74 100644
--- a/src/views/partials/topic-terms.tpl
+++ b/src/views/partials/topic-terms.tpl
@@ -1,13 +1,13 @@
<div class="dropdown bottom-sheet {{{ if !terms.length }}}hidden{{{ end }}}">
<button type="button" class="btn btn-ghost btn-sm ff-secondary d-flex align-items-center gap-2 dropdown-toggle h-100" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-fw fa-clock text-primary"></i>
- <span class="visible-md-inline visible-lg-inline fw-semibold">{tx(selectedTerm.name)}</span>
+ <span class="visible-md-inline visible-lg-inline fw-semibold">{{tx(selectedTerm.name)}}</span>
</button>
<ul class="dropdown-menu p-1 text-sm" role="menu">
{{{each terms}}}
<li role="presentation" class="category">
<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menuitem" href="{config.relative_path}/{terms.url}">
- <div class="flex-grow-1">{tx(terms.name)}</div>
+ <div class="flex-grow-1">{{tx(terms.name)}}</div>
<i class="flex-shrink-0 fa fa-fw {{{ if terms.selected }}}fa-check{{{ end }}}"></i>
</a>
</li>
diff --git a/src/views/partials/topic/merged-message.tpl b/src/views/partials/topic/merged-message.tpl
index 0129a877a5..999397f4d4 100644
--- a/src/views/partials/topic/merged-message.tpl
+++ b/src/views/partials/topic/merged-message.tpl
@@ -1,5 +1,5 @@
<div component="topic/merged/message" class="alert alert-info d-flex justify-content-between flex-wrap">
- <span>{tx("topic:merged-message", mergedIntoHref, merger.mergedIntoTitle)}</span>
+ <span>{{tx("topic:merged-message", mergedIntoHref, merger.mergedIntoTitle)}}</span>
<span>
<a class="fw-bold" href="{config.relative_path}/user/{merger.userslug}">{merger.username}</strong></a> <small class="timeago" title="{mergedTimestampISO}"></small>
</span>
diff --git a/src/views/register.tpl b/src/views/register.tpl
index c3613a36be..40734d180a 100644
--- a/src/views/register.tpl
+++ b/src/views/register.tpl
@@ -42,7 +42,7 @@
{{{ each regFormEntry }}}
<div class="mb-2 regFormEntry d-flex flex-column gap-2 {./styleName}">
- <label for="{./inputId}">{tx(./label)}</label>
+ <label for="{./inputId}">{{tx(./label)}}</label>
<div>{{./html}}</div>
</div>
{{{ end }}}