Skip to content

update all language keys to use tx() helper #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
barisusakli wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update all language keys to use tx() helper #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions templates/account/blocks.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<!-- IMPORT partials/account/header.tpl -->
<h1 class="fs-4">[[pages:account/blocks, {username}]]</h1>
<h1 class="fs-4">{{tx("pages:account/blocks", txEscape(username))}}</h1>
<div class="row justify-content-end mb-2">
<div class="col-3">
<div class="dropdown">
<input class="form-control" type="text" id="user-search" placeholder="[[users:enter-username]]" data-bs-toggle="dropdown" autocomplete="off" aria-haspopup="true" aria-expanded="false"/>
<input class="form-control" type="text" id="user-search" placeholder="{{tx("users:enter-username")}}" data-bs-toggle="dropdown" autocomplete="off" aria-haspopup="true" aria-expanded="false"/>

<ul component="blocks/search/list" class="dropdown-menu p-1 block-edit list-unstyled" role="menu">
<li component="blocks/start-typing">
<a href="#" class="dropdown-item rounded-1" role="menuitem">[[admin/menu:search.start-typing]]</a>
<a href="#" class="dropdown-item rounded-1" role="menuitem">{{tx("admin/menu:search.start-typing")}}</a>
</li>
<li component="blocks/no-users" class="hidden">
<a href="#" class="dropdown-item rounded-1" role="menuitem">[[users:no-users-found]]</a>
<a href="#" class="dropdown-item rounded-1" role="menuitem">{{tx("users:no-users-found")}}</a>
</li>
{{{ each edit }}}
<li component="blocks/search/match">
Expand All @@ -19,8 +19,8 @@
<a href="{config.relative_path}/uid/{../uid}">{{buildAvatar(edit, "24px", true)}} {../username}</a>
</div>

<button class="btn btn-sm btn-outline-danger text-nowrap {{{ if ./isBlocked }}}hidden{{{ end }}}" data-uid="{./uid}" data-action="block">[[user:block-user]]</button>
<button class="btn btn-sm btn-outline-primary text-nowrap {{{ if !./isBlocked }}}hidden{{{ end }}}" data-uid="{./uid}" data-action="unblock">[[user:unblock-user]]</button>
<button class="btn btn-sm btn-outline-danger text-nowrap {{{ if ./isBlocked }}}hidden{{{ end }}}" data-uid="{./uid}" data-action="block">{{tx("user:block-user")}}</button>
<button class="btn btn-sm btn-outline-primary text-nowrap {{{ if !./isBlocked }}}hidden{{{ end }}}" data-uid="{./uid}" data-action="unblock">{{tx("user:unblock-user")}}</button>
</div>
</li>
{{{ end }}}
Expand All @@ -30,12 +30,12 @@
</div>

<div class="users row">
<div class="alert alert-warning text-center {{{ if users.length }}}hidden{{{ end }}}">[[user:has-no-blocks]]</div>
<div class="alert alert-warning text-center {{{ if users.length }}}hidden{{{ end }}}">{{tx("user:has-no-blocks")}}</div>
<div id="users-container" class="users-container list-unstyled d-flex flex-wrap gap-2">
{{{ each users }}}
<div class="d-flex flex-column gap-1">
<!-- IMPORT partials/users/item.tpl -->
<button class="btn btn-sm btn-outline-primary text-nowrap mx-auto" data-uid="{./uid}" data-action="unblock">[[user:unblock-user]]</button>
<button class="btn btn-sm btn-outline-primary text-nowrap mx-auto" data-uid="{./uid}" data-action="unblock">{{tx("user:unblock-user")}}</button>
</div>
{{{ end }}}

Expand Down
10 changes: 5 additions & 5 deletions templates/account/categories.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<div class="mb-2">
<div class="dropdown bottom-sheet" component="category/watch/all">
<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
<span>[[user:change-all]]</span>
<span>{{tx("user:change-all")}}</span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu p-1" role="menu">
<li><a class="dropdown-item rounded-1" href="#" component="category/watching" data-state="watching" role="menuitem"><i class="fa fa-fw fa-bell-o"></i> [[category:watching]]<p class="help-text"><small>[[category:watching.description]]</small></p></a></li>
<li><a class="dropdown-item rounded-1" href="#" component="category/tracking" data-state="tracking" role="menuitem"><i class="fa fa-fw fa-inbox"></i> [[category:tracking]]<p class="help-text"><small>[[category:tracking.description]]</small></p></a></li>
<li><a class="dropdown-item rounded-1" href="#" component="category/notwatching" data-state="notwatching" role="menuitem"><i class="fa fa-fw fa-clock-o"></i> [[category:not-watching]]<p class="help-text"><small>[[category:not-watching.description]]</small></p></a></li>
<li><a class="dropdown-item rounded-1" href="#" component="category/ignoring" data-state="ignoring" role="menuitem"><i class="fa fa-fw fa-eye-slash"></i> [[category:ignoring]]<p class="help-text"><small>[[category:ignoring.description]]</small></p></a></li>
<li><a class="dropdown-item rounded-1" href="#" component="category/watching" data-state="watching" role="menuitem"><i class="fa fa-fw fa-bell-o"></i> {{tx("category:watching")}}<p class="help-text"><small>{{tx("category:watching.description")}}</small></p></a></li>
<li><a class="dropdown-item rounded-1" href="#" component="category/tracking" data-state="tracking" role="menuitem"><i class="fa fa-fw fa-inbox"></i> {{tx("category:tracking")}}<p class="help-text"><small>{{tx("category:tracking.description")}}</small></p></a></li>
<li><a class="dropdown-item rounded-1" href="#" component="category/notwatching" data-state="notwatching" role="menuitem"><i class="fa fa-fw fa-clock-o"></i> {{tx("category:not-watching")}}<p class="help-text"><small>{{tx("category:not-watching.description")}}</small></p></a></li>
<li><a class="dropdown-item rounded-1" href="#" component="category/ignoring" data-state="ignoring" role="menuitem"><i class="fa fa-fw fa-eye-slash"></i> {{tx("category:ignoring")}}<p class="help-text"><small>{{tx("category:ignoring.description")}}</small></p></a></li>
</ul>
</div>
</div>
Expand Down
42 changes: 21 additions & 21 deletions templates/account/consent.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
<!-- IMPORT partials/account/header.tpl -->
<h3>[[user:consent.title]]</h3>
<p class="lead">[[user:consent.lead]]</p>
<p>[[user:consent.intro]]</p>
<h3>{{tx("user:consent.title")}}</h3>
<p class="lead">{{tx("user:consent.lead")}}</p>
<p>{{tx("user:consent.intro")}}</p>

<hr />

<div class="row">
<div class="col-sm-6">
<!-- IF gdpr_consent -->
<div class="alert alert-success d-flex gap-3">
[[user:consent.received]]
{{tx("user:consent.received")}}
<i class="fa fa-check fa-3x"></i>
</div>
<!-- ELSE -->
<div class="alert alert-warning">
[[user:consent.not-received]]
{{tx("user:consent.not-received")}}
<br /><br />
<div class="text-center">
<button class="btn btn-warning" data-action="consent">[[user:consent.give]]</button>
<button class="btn btn-warning" data-action="consent">{{tx("user:consent.give")}}</button>
</div>
</div>
<!-- END -->
<div class="card">
<div class="card-body">
<p>[[user:consent.email-intro]]</p>
<p>{{tx("user:consent.email-intro")}}</p>
<!-- IF digest.enabled -->
<p>[[user:consent.digest-frequency, {digest.frequency}]]</p>
<p>{{tx("user:consent.digest-frequency", digest.frequency)}}</p>
<!-- ELSE -->
[[user:consent.digest-off]]
{{tx("user:consent.digest-off")}}
<!-- END -->

<div class="text-center">
<a class="btn btn-outline-secondary" href="./settings">
<i class="fa fa-cog"></i>
[[pages:account/settings]]
{{tx("pages:account/settings")}}
</a>
</div>
</div>
Expand All @@ -42,25 +42,25 @@
<div class="col-sm-6">
<div class="card">
<div class="card-body">
<p><strong>[[user:consent.right-of-access]]</strong></p>
<p>[[user:consent.right-of-access-description]]</p>
<p><strong>[[user:consent.right-to-rectification]]</strong></p>
<p>[[user:consent.right-to-rectification-description]]</p>
<p><strong>[[user:consent.right-to-erasure]]</strong></p>
<p>[[user:consent.right-to-erasure-description]]</p>
<p><strong>[[user:consent.right-to-data-portability]]</strong></p>
<p>[[user:consent.right-to-data-portability-description]]</p>
<p><strong>{{tx("user:consent.right-of-access")}}</strong></p>
<p>{{tx("user:consent.right-of-access-description")}}</p>
<p><strong>{{tx("user:consent.right-to-rectification")}}</strong></p>
<p>{{tx("user:consent.right-to-rectification-description")}}</p>
<p><strong>{{tx("user:consent.right-to-erasure")}}</strong></p>
<p>{{tx("user:consent.right-to-erasure-description")}}</p>
<p><strong>{{tx("user:consent.right-to-data-portability")}}</strong></p>
<p>{{tx("user:consent.right-to-data-portability-description")}}</p>

{{{ if canExport }}}
<div class="btn-group-vertical d-grid">
<a data-action="export-profile" class="btn btn-outline-secondary">
<i class="fa fa-download"></i> [[user:consent.export-profile]]
<i class="fa fa-download"></i> {{tx("user:consent.export-profile")}}
</a>
<a data-action="export-posts" class="btn btn-outline-secondary">
<i class="fa fa-download"></i> [[user:consent.export-posts]]
<i class="fa fa-download"></i> {{tx("user:consent.export-posts")}}
</a>
<a data-action="export-uploads" class="btn btn-outline-secondary">
<i class="fa fa-download"></i> [[user:consent.export-uploads]]
<i class="fa fa-download"></i> {{tx("user:consent.export-uploads")}}
</a>
</div>
{{{ end }}}
Expand Down
42 changes: 21 additions & 21 deletions templates/account/edit.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,33 @@
<div class="account-picture-block text-center">
<ul class="list-group mb-3">
{{{ if allowProfilePicture }}}
<li class="list-group-item"><a component="profile/change/picture" href="#" class="text-decoration-none text-reset">[[user:change-picture]]</a></li>
<li class="list-group-item"><a component="profile/change/picture" href="#" class="text-decoration-none text-reset">{{tx("user:change-picture")}}</a></li>
{{{ end }}}
{{{ if !username:disableEdit }}}
<li class="list-group-item"><a href="{config.relative_path}/user/{userslug}/edit/username" class="text-decoration-none text-reset">[[user:change-username]]</a></li>
<li class="list-group-item"><a href="{config.relative_path}/user/{userslug}/edit/username" class="text-decoration-none text-reset">{{tx("user:change-username")}}</a></li>
{{{ end }}}
{{{ if !email:disableEdit }}}
<li class="list-group-item"><a href="{config.relative_path}/user/{userslug}/edit/email" class="text-decoration-none text-reset">[[user:change-email]]</a></li>
<li class="list-group-item"><a href="{config.relative_path}/user/{userslug}/edit/email" class="text-decoration-none text-reset">{{tx("user:change-email")}}</a></li>
{{{ end }}}
{{{ if canChangePassword }}}
<li class="list-group-item"><a href="{config.relative_path}/user/{userslug}/edit/password" class="text-decoration-none text-reset">[[user:change-password]]</a></li>
<li class="list-group-item"><a href="{config.relative_path}/user/{userslug}/edit/password" class="text-decoration-none text-reset">{{tx("user:change-password")}}</a></li>
{{{ end }}}
{{{ each editButtons }}}
<li class="list-group-item"><a href="{config.relative_path}{./link}" class="text-decoration-none text-reset">{./text}</a></li>
<li class="list-group-item"><a href="{config.relative_path}{./link}" class="text-decoration-none text-reset">{{tx(./text)}}</a></li>
{{{ end }}}
</ul>

<!-- IF config.requireEmailConfirmation -->
<!-- IF email -->
<!-- IF isSelf -->
<a id="confirm-email" href="#" class="btn btn-warning <!-- IF email:confirmed -->hide<!-- ENDIF email:confirmed -->">[[user:confirm-email]]</a><br/><br/>
<a id="confirm-email" href="#" class="btn btn-warning <!-- IF email:confirmed -->hide<!-- ENDIF email:confirmed -->">{{tx("user:confirm-email")}}</a><br/><br/>
<!-- ENDIF isSelf -->
<!-- ENDIF email -->
<!-- ENDIF config.requireEmailConfirmation -->

<!-- IF allowAccountDelete -->
<!-- IF isSelf -->
<a id="deleteAccountBtn" href="#" class="btn btn-danger">[[user:delete-account]]</a><br/><br/>
<a id="deleteAccountBtn" href="#" class="btn btn-danger">{{tx("user:delete-account")}}</a><br/><br/>
<!-- ENDIF isSelf -->
<!-- ENDIF allowAccountDelete -->

Expand All @@ -41,12 +41,12 @@
<div class="<!-- IF !sso.length -->col-md-9 col-sm-8<!-- ELSE -->col-md-5 col-sm-4<!-- ENDIF !sso.length -->">
<form role="form" component="profile/edit/form">
<div class="mb-2">
<label class="form-label fw-bold" for="fullname">[[user:fullname]]</label>
<input class="form-control" type="text" id="fullname" name="fullname" placeholder="[[user:fullname]]" value="{fullname}">
<label class="form-label fw-bold" for="fullname">{{tx("user:fullname")}}</label>
<input class="form-control" type="text" id="fullname" name="fullname" placeholder="{{tx("user:fullname")}}" value="{fullname}">
</div>

<div class="mb-2">
<label class="form-label fw-bold" for="birthday">[[user:birthday]]</label>
<label class="form-label fw-bold" for="birthday">{{tx("user:birthday")}}</label>
<input class="form-control" type="date" id="birthday" name="birthday" value="{birthday}" placeholder="mm/dd/yyyy">
</div>

Expand Down Expand Up @@ -76,18 +76,18 @@
{{{ end }}}

<div class="mb-2">
<label class="form-label fw-bold" for="groupTitle">[[user:grouptitle]]</label>
<label class="form-label fw-bold" for="groupTitle">{{tx("user:grouptitle")}}</label>

<div class="d-flex flex-column gap-2" component="group/badge/list">
{{{ each groups }}}
<div component="group/badge/item" class="d-flex gap-2 justify-content-between align-items-center" data-value="{./displayName}" data-selected="{./selected}">
<!-- IMPORT partials/groups/badge.tpl -->
<div class="d-flex gap-1">
<button component="group/toggle/hide" type="button" class="btn btn-ghost btn-sm {{{ if !./selected }}}hidden{{{ end }}}" title="[[user:hide-group-title]]"><i class="fa fa-fw fa-eye"></i></button>
<button component="group/toggle/show" type="button" class="btn btn-ghost btn-sm {{{ if ./selected }}}hidden{{{ end }}}" title="[[user:show-group-title]]"><i class="fa fa-fw fa-eye-slash"></i></button>
<button component="group/toggle/hide" type="button" class="btn btn-ghost btn-sm {{{ if !./selected }}}hidden{{{ end }}}" title="{{tx("user:hide-group-title")}}"><i class="fa fa-fw fa-eye"></i></button>
<button component="group/toggle/show" type="button" class="btn btn-ghost btn-sm {{{ if ./selected }}}hidden{{{ end }}}" title="{{tx("user:show-group-title")}}"><i class="fa fa-fw fa-eye-slash"></i></button>
{{{ if allowMultipleBadges }}}
<button component="group/order/up" type="button" class="btn btn-ghost btn-sm" title="[[user:order-group-up]]"><i class="fa fa-fw fa-chevron-up"></i></button>
<button component="group/order/down" type="button" class="btn btn-ghost btn-sm" title="[[user:order-group-down]]"><i class="fa fa-fw fa-chevron-down"></i></button>
<button component="group/order/up" type="button" class="btn btn-ghost btn-sm" title="{{tx("user:order-group-up")}}"><i class="fa fa-fw fa-chevron-up"></i></button>
<button component="group/order/down" type="button" class="btn btn-ghost btn-sm" title="{{tx("user:order-group-down")}}"><i class="fa fa-fw fa-chevron-down"></i></button>
{{{ end }}}
</div>
</div>
Expand All @@ -97,38 +97,38 @@

<!-- IF allowAboutMe -->
<div class="mb-2">
<label class="form-label fw-bold" for="aboutme">[[user:aboutme]]</label> <small><label id="aboutMeCharCountLeft"></label></small>
<label class="form-label fw-bold" for="aboutme">{{tx("user:aboutme")}}</label> <small><label id="aboutMeCharCountLeft"></label></small>
<textarea class="form-control" id="aboutme" name="aboutme" rows="5">{aboutme}</textarea>
</div>
<!-- ENDIF allowAboutMe -->

<!-- IF allowSignature -->
<!-- IF !disableSignatures -->
<div class="mb-2">
<label class="form-label fw-bold" for="signature">[[user:signature]]</label> <small><label id="signatureCharCountLeft"></label></small>
<label class="form-label fw-bold" for="signature">{{tx("user:signature")}}</label> <small><label id="signatureCharCountLeft"></label></small>
<textarea class="form-control" id="signature" name="signature" rows="5">{signature}</textarea>
</div>
<!-- ENDIF !disableSignatures -->
<!-- ENDIF allowSignature -->

<a id="submitBtn" href="#" class="btn btn-primary">[[global:save-changes]]</a>
<a id="submitBtn" href="#" class="btn btn-primary">{{tx("global:save-changes")}}</a>
</form>

<hr class="visible-xs visible-sm"/>
</div>

<!-- IF sso.length -->
<div class="col-md-4 col-sm-4">
<label>[[user:sso.title]]</label>
<label>{{tx("user:sso.title")}}</label>
<div class="list-group">
{{{each sso}}}
<div class="list-group-item">
<!-- IF ../deauthUrl -->
<a data-component="{../component}" class="btn btn-outline-secondary btn-sm float-end" href="{../deauthUrl}">[[user:sso.dissociate]]</a>
<a data-component="{../component}" class="btn btn-outline-secondary btn-sm float-end" href="{../deauthUrl}">{{tx("user:sso.dissociate")}}</a>
<!-- END -->
<a data-component="{../component}" href="{{{ if ./url }}}{./url}{{{ else }}}#{{{ end }}}" target="<!-- IF ../associated -->_blank<!-- ELSE -->_top<!-- ENDIF ../associated -->">
<!-- IF ../icon --><i class="fa {../icon}"></i><!-- ENDIF ../icon -->
<!-- IF ../associated -->[[user:sso.associated]]<!-- ELSE -->[[user:sso.not-associated]]<!-- ENDIF ../associated -->
<!-- IF ../associated -->{{tx("user:sso.associated")}}<!-- ELSE -->{{tx("user:sso.not-associated")}}<!-- ENDIF ../associated -->
{../name}
</a>
</div>
Expand Down
14 changes: 7 additions & 7 deletions templates/account/edit/password.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@

<!-- IF isSelf -->
<div class="mb-3">
<label class="form-label fw-bold" for="inputCurrentPassword">[[user:current-password]]</label>
<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current-password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword -->>
<label class="form-label fw-bold" for="inputCurrentPassword">{{tx("user:current-password")}}</label>
<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="{{tx("user:current-password")}}" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword -->>
</div>
<!-- ENDIF isSelf -->

<div class="mb-3">
<label class="form-label fw-bold" for="inputNewPassword">[[user:new-password]]</label>
<input class="form-control" type="password" id="inputNewPassword" placeholder="[[user:password]]" value="">
<label class="form-label fw-bold" for="inputNewPassword">{{tx("user:new-password")}}</label>
<input class="form-control" type="password" id="inputNewPassword" placeholder="{{tx("user:new-password")}}" value="">
<span class="form-text" id="password-notify"></span>
</div>

<div class="mb-3">
<label class="form-label fw-bold" for="inputNewPasswordAgain">[[user:confirm-password]]</label>
<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="[[user:confirm-password]]" value="">
<label class="form-label fw-bold" for="inputNewPasswordAgain">{{tx("user:confirm-password")}}</label>
<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="{{tx("user:confirm-password")}}" value="">
<span class="form-text" id="password-confirm-notify"></span>
</div>

<div class="form-actions">
<button id="changePasswordBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change-password]]</button>
<button id="changePasswordBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> {{tx("user:change-password")}}</button>
</div>
</form>

Expand Down
Loading