nodebb-theme-persona 13.2.35 → 13.2.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "13.2.35",
+  "version": "13.2.37",
   "nbbpm": {
     "compatibility": "^3.5.0"
   },

package/templates/account/blocks.tpl

@@ -3,7 +3,7 @@
 <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"/>
+			<input class="form-control" type="text" id="user-search" placeholder="[[users:enter-username]]" data-bs-toggle="dropdown" autocomplete="off"/>
 
 			<ul class="dropdown-menu block-edit list-unstyled">
 				<li><a href="#" class="dropdown-item">[[admin/menu:search.start-typing]]</a></li>
@@ -13,7 +13,7 @@
 						<div class="text-truncate">
 							<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(edit, "24px", true)} {../username}</a>
 						</div>
-						<button class="btn btn-sm btn-primary text-nowrap" data-uid="{../uid}" data-action="toggle">[[user:block_toggle]]</button>
+						<button class="btn btn-sm btn-primary text-nowrap" data-uid="{../uid}" data-action="toggle">[[user:block-toggle]]</button>
 					</div>
 				</li>
 				{{{ end }}}
@@ -25,7 +25,7 @@
 <div class="users row">
 	<div class="col-12">
 		<!-- IMPORT partials/users_list.tpl -->
-		<div class="alert alert-warning text-center"<!-- IF users.length --> style="display: none;"<!-- END -->>[[user:has_no_blocks]]</div>
+		<div class="alert alert-warning text-center"<!-- IF users.length --> style="display: none;"<!-- END -->>[[user:has-no-blocks]]</div>
 		<!-- IMPORT partials/paginator.tpl -->
 	</div>
 </div>

package/templates/account/categories.tpl

@@ -5,7 +5,7 @@
 	<div class="col-lg-12 mb-2">
 		<div class="btn-group bottom-sheet" component="category/watch/all">
 			<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button">
-				<span>[[user:change_all]]</span>
+				<span>[[user:change-all]]</span>
 				<span class="caret"></span>
 			</button>
 			<ul class="dropdown-menu">

package/templates/account/consent.tpl

@@ -14,7 +14,7 @@
 		</div>
 		<!-- ELSE -->
 		<div class="alert alert-warning">
-			[[user:consent.not_received]]
+			[[user:consent.not-received]]
 			<br /><br />
 			<div class="text-center">
 				<button class="btn btn-warning" data-action="consent">[[user:consent.give]]</button>
@@ -23,11 +23,11 @@
 		<!-- END -->
 		<div class="card">
 			<div class="card-body">
-				<p>[[user:consent.email_intro]]</p>
+				<p>[[user:consent.email-intro]]</p>
 				<!-- IF digest.enabled -->
-				<p>[[user:consent.digest_frequency, {digest.frequency}]]</p>
+				<p>[[user:consent.digest-frequency, {digest.frequency}]]</p>
 				<!-- ELSE -->
-				[[user:consent.digest_off]]
+				[[user:consent.digest-off]]
 				<!-- END -->
 
 				<div class="text-center">
@@ -42,24 +42,24 @@
 	<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>[[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>
 
 				<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> [[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> [[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> [[user:consent.export-uploads]]
 					</a>
 				</div>
 			</div>

package/templates/account/edit/password.tpl

@@ -5,25 +5,25 @@
 
 	<!-- IF isSelf -->
 	<div class="mb-2">
-		<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">[[user:current-password]]</label>
+		<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current-password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword -->>
 	</div>
 	<!-- ENDIF isSelf -->
 
 	<div class="mb-2">
-		<label class="form-label fw-bold" for="inputNewPassword">[[user:new_password]]</label>
+		<label class="form-label fw-bold" for="inputNewPassword">[[user:new-password]]</label>
 		<input class="form-control" type="password" id="inputNewPassword" placeholder="[[user:password]]" value="">
 		<span class="form-feedback" id="password-notify"></span>
 	</div>
 
 	<div class="mb-2">
-		<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">[[user:confirm-password]]</label>
+		<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="[[user:confirm-password]]" value="">
 		<span class="form-feedback" 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> [[user:change-password]]</button>
 	</div>
 </form>
 

package/templates/account/edit/username.tpl

@@ -10,8 +10,8 @@
 
 	<!-- IF isSelf -->
 	<div class="mb-2">
-		<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">[[user:current-password]]</label>
+		<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current-password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword -->>
 	</div>
 	<!-- ENDIF isSelf -->
 
@@ -19,7 +19,7 @@
 
 	<br/>
 	<div class="form-actions">
-		<button id="submitBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_username]]</button>
+		<button id="submitBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change-username]]</button>
 	</div>
 </form>
 

package/templates/account/edit.tpl

@@ -14,16 +14,16 @@
 				</div>
 				<ul class="list-group mb-3">
 					<!-- IF allowProfilePicture -->
-					<a component="profile/change/picture" href="#" class="list-group-item">[[user:change_picture]]</a>
+					<a component="profile/change/picture" href="#" class="list-group-item">[[user:change-picture]]</a>
 					<!-- ENDIF allowProfilePicture -->
 					<!-- IF !username:disableEdit -->
-					<a href="{config.relative_path}/user/{userslug}/edit/username" class="list-group-item">[[user:change_username]]</a>
+					<a href="{config.relative_path}/user/{userslug}/edit/username" class="list-group-item">[[user:change-username]]</a>
 					<!-- ENDIF !username:disableEdit -->
 					<!-- IF !email:disableEdit -->
-					<a href="{config.relative_path}/user/{userslug}/edit/email" class="list-group-item">[[user:change_email]]</a>
+					<a href="{config.relative_path}/user/{userslug}/edit/email" class="list-group-item">[[user:change-email]]</a>
 					<!-- ENDIF !email:disableEdit -->
 					<!-- IF canChangePassword -->
-					<a href="{config.relative_path}/user/{userslug}/edit/password" class="list-group-item">[[user:change_password]]</a>
+					<a href="{config.relative_path}/user/{userslug}/edit/password" class="list-group-item">[[user:change-password]]</a>
 					<!-- ENDIF canChangePassword -->
 					{{{each editButtons}}}
 					<a href="{config.relative_path}{editButtons.link}" class="list-group-item">{editButtons.text}</a>
@@ -33,14 +33,14 @@
 				<!-- 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 -->">[[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">[[user:delete-account]]</a><br/><br/>
 				<!-- ENDIF isSelf -->
 				<!-- ENDIF allowAccountDelete -->
 
@@ -103,7 +103,7 @@
 				<!-- ENDIF !disableSignatures -->
 				<!-- ENDIF allowSignature -->
 
-				<a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a>
+				<a id="submitBtn" href="#" class="btn btn-primary">[[global:save-changes]]</a>
 			</form>
 
 			<hr class="visible-xs visible-sm"/>

package/templates/account/followers.tpl

@@ -7,7 +7,7 @@
 	<!-- IMPORT partials/users_list.tpl -->
 
 	<!-- IF !users.length -->
-	<div class="alert alert-warning text-center">[[user:has_no_follower]]</div>
+	<div class="alert alert-warning text-center">[[user:has-no-follower]]</div>
 	<!-- ENDIF !users.length -->
 
 	<!-- IMPORT partials/paginator.tpl -->

package/templates/account/following.tpl

@@ -7,7 +7,7 @@
 	<!-- IMPORT partials/users_list.tpl -->
 
 	<!-- IF !users.length -->
-	<div class="alert alert-warning text-center">[[user:follows_no_one]]</div>
+	<div class="alert alert-warning text-center">[[user:follows-no-one]]</div>
 	<!-- ENDIF !users.length -->
 
 	<!-- IMPORT partials/paginator.tpl -->

package/templates/account/groups.tpl

@@ -6,7 +6,7 @@
 	<div class="col-12 groups list">
 		<div component="groups/container" id="groups-list" class="row">
 			<!-- IF !groups.length -->
-			<div class="alert alert-warning text-center">[[groups:no_groups_found]]</div>
+			<div class="alert alert-warning text-center">[[groups:no-groups-found]]</div>
 			<!-- ELSE -->
 			<!-- IMPORT partials/groups/list.tpl -->
 			<!-- ENDIF !groups.length -->

package/templates/account/info.tpl

@@ -19,7 +19,7 @@
 				{../browser} {../version} on {../platform}<br />
 				<small class="timeago text-muted" title="{../datetimeISO}"></small>
 				<ul>
-					<li><strong>[[global:ip_address]]</strong>: {../ip}</li>
+					<li><strong>[[global:ip-address]]</strong>: {../ip}</li>
 				</ul>
 			</li>
 			{{{end}}}
@@ -108,11 +108,11 @@
 
 				<!-- IF !banned -->
 				<!-- IF !isSelf -->
-				<button class="btn btn-sm float-end btn-danger" component="account/ban">[[user:ban_account]]</button>
+				<button class="btn btn-sm float-end btn-danger" component="account/ban">[[user:ban-account]]</button>
 				<!-- ENDIF !isSelf -->
 				<!-- ELSE -->
 				<!-- IF !isSelf -->
-				<button class="btn btn-sm float-end btn-success" component="account/unban">[[user:unban_account]]</button>
+				<button class="btn btn-sm float-end btn-success" component="account/unban">[[user:unban-account]]</button>
 				<!-- ENDIF !isSelf -->
 				<!-- ENDIF !banned -->
 			</h5>
@@ -149,11 +149,11 @@
 
 				{{{ if !muted }}}
 				{{{ if !isSelf }}}
-				<button class="btn btn-sm float-end btn-danger" component="account/mute">[[user:mute_account]]</button>
+				<button class="btn btn-sm float-end btn-danger" component="account/mute">[[user:mute-account]]</button>
 				{{{ end }}}
 				{{{ else }}}
 				{{{ if !isSelf }}}
-				<button class="btn btn-sm float-end btn-success" component="account/unmute">[[user:unmute_account]]</button>
+				<button class="btn btn-sm float-end btn-success" component="account/unmute">[[user:unmute-account]]</button>
 				{{{ end }}}
 				{{{ end }}}
 			</h5>

package/templates/account/profile.tpl

@@ -41,7 +41,7 @@
 
 		<div class="stat">
 			<div title="{profileviews}">{humanReadableNumber(profileviews)}</div>
-			<span class="stat-label">[[user:profile_views]]</span>
+			<span class="stat-label">[[user:profile-views]]</span>
 		</div>
 
 		<div class="stat">
@@ -69,7 +69,7 @@
 
 		<!-- IF email -->
 		<span>[[user:email]]</span>
-		<strong><i class="fa fa-eye-slash {emailClass}" title="[[user:email_hidden]]"></i> {email}</strong>
+		<strong><i class="fa fa-eye-slash {emailClass}" title="[[user:email-hidden]]"></i> {email}</strong>
 		<!-- ENDIF email -->
 
 		<!-- IF websiteName -->

package/templates/account/sessions.tpl

@@ -20,7 +20,7 @@
 				{../browser} {../version} on {../platform}<br />
 				<small class="timeago text-muted" title="{../datetimeISO}"></small>
 				<ul>
-					<li><strong>[[global:ip_address]]</strong>: {../ip}</li>
+					<li><strong>[[global:ip-address]]</strong>: {../ip}</li>
 				</ul>
 			</li>
 			{{{end}}}

package/templates/account/settings.tpl

@@ -25,12 +25,12 @@
 						<option value="{homePageRoutes.route}" <!-- IF homePageRoutes.selected -->selected="1"<!-- ENDIF homePageRoutes.selected -->>{homePageRoutes.name}</option>
 						{{{end}}}
 					</select>
-					<p class="form-text">[[user:homepage_description]]</p>
+					<p class="form-text">[[user:homepage-description]]</p>
 				</div>
 				<div id="homePageCustom" class="mb-2" style="display: none;">
-					<label for="homePageCustom">[[user:custom_route]]</label>
+					<label for="homePageCustom">[[user:custom-route]]</label>
 					<input type="text" class="form-control" data-property="homePageCustom" id="homePageCustom" value="{settings.homePageRoute}"/>
-					<p class="form-text">[[user:custom_route_help]]</p>
+					<p class="form-text">[[user:custom-route-help]]</p>
 				</div>
 			</div>
 			<!-- ENDIF allowUserHomePage -->
@@ -41,7 +41,7 @@
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" data-property="showemail" <!-- IF settings.showemail -->checked <!-- ENDIF settings.showemail -->/>
 					<strong>
-						<label class="form-check-label">[[user:show_email]]</label>
+						<label class="form-check-label">[[user:show-email]]</label>
 					</strong>
 				</div>
 				<!-- ENDIF !hideEmail -->
@@ -50,7 +50,7 @@
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" data-property="showfullname" <!-- IF settings.showfullname -->checked<!-- ENDIF settings.showfullname -->/>
 					<strong>
-						<label class="form-check-label">[[user:show_fullname]]</label>
+						<label class="form-check-label">[[user:show-fullname]]</label>
 					</strong>
 				</div>
 				<!-- ENDIF !hideFullname -->
@@ -58,7 +58,7 @@
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" data-property="restrictChat" <!-- IF settings.restrictChat -->checked<!-- ENDIF settings.restrictChat -->/>
 					<strong>
-						<label class="form-check-label">[[user:restrict_chats]]</label>
+						<label class="form-check-label">[[user:restrict-chats]]</label>
 					</strong>
 				</div>
 				<!-- ENDIF !config.disableChat -->
@@ -69,28 +69,28 @@
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" data-property="openOutgoingLinksInNewTab" <!-- IF settings.openOutgoingLinksInNewTab -->checked<!-- ENDIF settings.openOutgoingLinksInNewTab -->/>
 					<strong>
-						<label class="form-check-label">[[user:open_links_in_new_tab]]</label>
+						<label class="form-check-label">[[user:open-links-in-new-tab]]</label>
 					</strong>
 				</div>
 				<!-- IF inTopicSearchAvailable -->
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" data-property="topicSearchEnabled" <!-- IF settings.topicSearchEnabled -->checked<!-- ENDIF settings.topicSearchEnabled -->/>
 					<strong>
-						<label class="form-check-label">[[user:enable_topic_searching]]</label>
+						<label class="form-check-label">[[user:enable-topic-searching]]</label>
 					</strong>
 				</div>
-				<p class="form-text">[[user:topic_search_help]]</p>
+				<p class="form-text">[[user:topic-search-help]]</p>
 				<!-- ENDIF inTopicSearchAvailable -->
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" data-property="updateUrlWithPostIndex" {{{ if settings.updateUrlWithPostIndex }}}checked{{{ end }}}/>
 					<strong>
-						<label class="form-check-label">[[user:update_url_with_post_index]]</label>
+						<label class="form-check-label">[[user:update-url-with-post-index]]</label>
 					</strong>
 				</div>
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" data-property="scrollToMyPost" <!-- IF settings.scrollToMyPost -->checked<!-- ENDIF settings.scrollToMyPost -->/>
 					<strong>
-						<label class="form-check-label">[[user:scroll_to_my_post]]</label>
+						<label class="form-check-label">[[user:scroll-to-my-post]]</label>
 					</strong>
 				</div>
 			</div>
@@ -98,14 +98,14 @@
 			<h4>[[global:pagination]]</h4>
 			<div class="card card-body mb-3">
 				<div class="mb-2 form-check">
-					<input type="checkbox" class="form-check-input" data-property="usePagination" <!-- IF settings.usePagination -->checked<!-- ENDIF settings.usePagination -->> <strong><label class="form-check-label">[[user:paginate_description]]</label></strong>
+					<input type="checkbox" class="form-check-input" data-property="usePagination" <!-- IF settings.usePagination -->checked<!-- ENDIF settings.usePagination -->> <strong><label class="form-check-label">[[user:paginate-description]]</label></strong>
 				</div>
 				<div class="mb-3">
-					<strong><label class="form-label">[[user:topics_per_page]] ([[user:max_items_per_page, {maxTopicsPerPage}]])</label></strong>
+					<strong><label class="form-label">[[user:topics-per-page]] ([[user:max-items-per-page, {maxTopicsPerPage}]])</label></strong>
 					<input type="text" class="form-control" data-property="topicsPerPage" value="{settings.topicsPerPage}">
 				</div>
 				<div class="">
-					<strong><label class="form-label">[[user:posts_per_page]] ([[user:max_items_per_page, {maxPostsPerPage}]])</label></strong>
+					<strong><label class="form-label">[[user:posts-per-page]] ([[user:max-items-per-page, {maxPostsPerPage}]])</label></strong>
 					<input type="text" class="form-control" data-property="postsPerPage" value="{settings.postsPerPage}">
 				</div>
 			</div>
@@ -117,19 +117,19 @@
 				<div class="mb-2">
 					<label class="form-label">[[user:category-topic-sort]]</label>
 					<select class="form-select" data-property="categoryTopicSort">
-						<option value="newest_to_oldest" {{{ if (settings.categoryTopicSort == "newest_to_oldest") }}}selected{{{ end }}}>[[topic:newest_to_oldest]]</option>
-						<option value="oldest_to_newest" {{{ if (settings.categoryTopicSort == "oldest_to_newest") }}}selected{{{ end }}}>[[topic:oldest_to_newest]]</option>
-						<option value="most_posts" {{{ if (settings.categoryTopicSort == "most_posts") }}}selected{{{ end }}}>[[topic:most_posts]]</option>
-						<option value="most_votes" {{{ if (settings.categoryTopicSort == "most_votes") }}}selected{{{ end }}}>[[topic:most_votes]]</option>
-						<option value="most_views" {{{ if (settings.categoryTopicSort == "most_views") }}}selected{{{ end }}}>[[topic:most_views]]</option>
+						<option value="newest_to_oldest" {{{ if (settings.categoryTopicSort == "newest_to_oldest") }}}selected{{{ end }}}>[[topic:newest-to-oldest]]</option>
+						<option value="oldest_to_newest" {{{ if (settings.categoryTopicSort == "oldest_to_newest") }}}selected{{{ end }}}>[[topic:oldest-to-newest]]</option>
+						<option value="most_posts" {{{ if (settings.categoryTopicSort == "most_posts") }}}selected{{{ end }}}>[[topic:most-posts]]</option>
+						<option value="most_votes" {{{ if (settings.categoryTopicSort == "most_votes") }}}selected{{{ end }}}>[[topic:most-votes]]</option>
+						<option value="most_views" {{{ if (settings.categoryTopicSort == "most_views") }}}selected{{{ end }}}>[[topic:most-views]]</option>
 					</select>
 				</div>
 				<div class="">
 					<label class="form-label">[[user:topic-post-sort]]</label>
 					<select class="form-select" data-property="topicPostSort">
-						<option value="oldest_to_newest" {{{ if (settings.topicPostSort == "oldest_to_newest") }}}selected{{{ end }}}>[[topic:oldest_to_newest]]</option>
-						<option value="newest_to_oldest" {{{ if (settings.topicPostSort == "newest_to_oldest") }}}selected{{{ end }}}>[[topic:newest_to_oldest]]</option>
-						<option value="most_votes" {{{ if (settings.topicPostSort == "most_votes") }}}selected{{{ end }}}>[[topic:most_votes]]</option>
+						<option value="oldest_to_newest" {{{ if (settings.topicPostSort == "oldest_to_newest") }}}selected{{{ end }}}>[[topic:oldest-to-newest]]</option>
+						<option value="newest_to_oldest" {{{ if (settings.topicPostSort == "newest_to_oldest") }}}selected{{{ end }}}>[[topic:newest-to-oldest]]</option>
+						<option value="most_votes" {{{ if (settings.topicPostSort == "most_votes") }}}selected{{{ end }}}>[[topic:most-votes]]</option>
 					</select>
 				</div>
 			</div>
@@ -138,13 +138,13 @@
 			<h4>[[global:email]]</h4>
 			<div class="card card-body mb-3">
 				<div class="mb-2">
-					<label for="dailyDigestFreq">[[user:digest_label]]</label>
+					<label for="dailyDigestFreq">[[user:digest-label]]</label>
 					<select class="form-select" id="dailyDigestFreq" data-property="dailyDigestFreq" autocomplete="off">
 						{{{each dailyDigestFreqOptions}}}
 						<option value="{dailyDigestFreqOptions.value}" <!-- IF dailyDigestFreqOptions.selected -->selected="1"<!-- ENDIF dailyDigestFreqOptions.selected -->>{dailyDigestFreqOptions.name}</option>
 						{{{end}}}
 					</select>
-					<p class="form-text">[[user:digest_description]]</p>
+					<p class="form-text">[[user:digest-description]]</p>
 				</div>
 			</div>
 			<!-- ENDIF !disableEmailSubscriptions -->
@@ -172,7 +172,7 @@
 				</div>
 				<!-- IF isAdmin -->
 				<!-- IF isSelf -->
-				<label>[[user:acp_language]]</label>
+				<label>[[user:acp-language]]</label>
 				<div class="row">
 					<div class="mb-2 col-lg-12">
 						<select data-property="acpLang" class="form-select">
@@ -191,13 +191,13 @@
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" data-property="followTopicsOnCreate" <!-- IF settings.followTopicsOnCreate -->checked <!-- ENDIF settings.followTopicsOnCreate -->/>
 					<strong>
-						<label class="form-check-label">[[user:follow_topics_you_create]]</label>
+						<label class="form-check-label">[[user:follow-topics-you-create]]</label>
 					</strong>
 				</div>
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" data-property="followTopicsOnReply" <!-- IF settings.followTopicsOnReply -->checked<!-- ENDIF settings.followTopicsOnReply -->/>
 					<strong>
-						 <label class="form-check-label">[[user:follow_topics_you_reply_to]]</label>
+						 <label class="form-check-label">[[user:follow-topics-you-reply-to]]</label>
 					</strong>
 				</div>
 				<div class="mb-2">
@@ -221,9 +221,9 @@
 					<div class="mb-2 col-5">
 						<select class="form-select" data-property="{notificationSettings.name}">
 							<option value="none" <!-- IF notificationSettings.none -->selected<!-- ENDIF notificationSettings.none -->>[[notifications:none]]</option>
-							<option value="notification" <!-- IF notificationSettings.notification -->selected<!-- ENDIF notificationSettings.notification -->>[[notifications:notification_only]]</option>
-							<option value="email" <!-- IF notificationSettings.email -->selected<!-- ENDIF notificationSettings.email -->>[[notifications:email_only]]</option>
-							<option value="notificationemail" <!-- IF notificationSettings.notificationemail -->selected<!-- ENDIF notificationSettings.notificationemail -->>[[notifications:notification_and_email]]</option>
+							<option value="notification" <!-- IF notificationSettings.notification -->selected<!-- ENDIF notificationSettings.notification -->>[[notifications:notification-only]]</option>
+							<option value="email" <!-- IF notificationSettings.email -->selected<!-- ENDIF notificationSettings.email -->>[[notifications:email-only]]</option>
+							<option value="notificationemail" <!-- IF notificationSettings.notificationemail -->selected<!-- ENDIF notificationSettings.notificationemail -->>[[notifications:notification-and-email]]</option>
 						</select>
 					</div>
 				</div>
@@ -247,7 +247,7 @@
 		</div>
 	</div>
 	<div class="form-actions">
-		<a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a>
+		<a id="submitBtn" href="#" class="btn btn-primary">[[global:save-changes]]</a>
 	</div>
 </div>
 

package/templates/account/theme.tpl

@@ -20,7 +20,7 @@
 		</select>
 	</div>
 
-	<button id="save" type="button" class="btn btn-primary">[[global:save_changes]]</button>
+	<button id="save" type="button" class="btn btn-primary">[[global:save-changes]]</button>
 </form>
 
 <!-- IMPORT partials/account/footer.tpl -->

package/templates/account/topics.tpl

@@ -5,7 +5,7 @@
 	<!-- IF showSort -->
 	<div class="btn-toolbar justify-content-end mb-2">
 		<div class="btn-group bottom-sheet" component="thread/sort">
-			<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button"><span>[[topic:sort_by]]</span> <span class="caret"></span></button>
+			<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button"><span>[[topic:sort-by]]</span> <span class="caret"></span></button>
 			<ul class="dropdown-menu dropdown-menu-end">
 				{{{each sortOptions }}}
 				<li><a class="dropdown-item" href="{config.relative_path}{sortOptions.url}"><i class="fa fa-fw {{{if sortOptions.selected}}}fa-check{{{end}}}"></i>{sortOptions.name}</a></li>

package/templates/category.tpl

@@ -12,7 +12,7 @@
 		<div class="topic-list-header sticky-top btn-toolbar justify-content-between py-2 mb-2 flex-nowrap">
 			<div class="d-flex gap-1 align-items-stretch">
 				{{{ if privileges.topics:create }}}
-				<a href="{config.relative_path}/compose?cid={cid}" component="category/post" id="new_topic" class="btn btn-primary text-nowrap" data-ajaxify="false" role="button">[[category:new_topic_button]]</a>
+				<a href="{config.relative_path}/compose?cid={cid}" component="category/post" id="new_topic" class="btn btn-primary text-nowrap" data-ajaxify="false" role="button">[[category:new-topic-button]]</a>
 				{{{ else }}}
 					{{{ if !loggedIn }}}
 					<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
@@ -34,7 +34,7 @@
 		{{{ if (!topics.length && privileges.topics:create)}}}
 		<hr class="visible-xs" />
 		<div class="alert alert-warning" id="category-no-topics">
-			[[category:no_topics]]
+			[[category:no-topics]]
 		</div>
 		{{{ end }}}
 

package/templates/chat.tpl

@@ -32,7 +32,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="imagedrop"><div>[[topic:composer.drag_and_drop_images]]</div></div>
+			<div class="imagedrop"><div>[[topic:composer.drag-and-drop-images]]</div></div>
 		</div>
 	</div>
 </div>

package/templates/chats.tpl

@@ -47,5 +47,5 @@
 	<div component="chat/main-wrapper" class="flex-grow-1 ms-md-2 ps-md-2 border-1 border-start-md h-100" style="min-width: 0;" data-roomid="{roomId}">
 		<!-- IMPORT partials/chats/message-window.tpl -->
 	</div>
-	<div class="imagedrop"><div>[[topic:composer.drag_and_drop_images]]</div></div>
+	<div class="imagedrop"><div>[[topic:composer.drag-and-drop-images]]</div></div>
 </div>

package/templates/flags/detail.tpl

@@ -152,17 +152,17 @@
 							{{{ end }}}
 							<li class="dropdown-divider"></li>
 							{{{ if privileges.ban }}}
-							<li class="{{{ if target.user.banned }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="ban">[[user:ban_account]]</a></li>
-							<li class="{{{ if !target.user.banned }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="unban">[[user:unban_account]]</a></li>
+							<li class="{{{ if target.user.banned }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="ban">[[user:ban-account]]</a></li>
+							<li class="{{{ if !target.user.banned }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="unban">[[user:unban-account]]</a></li>
 							{{{ end }}}
 							{{{ if privileges.mute}}}
-							<li class="{{{ if target.user.muted }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="mute">[[user:mute_account]]</a></li>
-							<li class="{{{ if !target.user.muted }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="unmute">[[user:unmute_account]]</a></li>
+							<li class="{{{ if target.user.muted }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="mute">[[user:mute-account]]</a></li>
+							<li class="{{{ if !target.user.muted }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="unmute">[[user:unmute-account]]</a></li>
 							{{{ end }}}
 							{{{ if privileges.admin:users }}}
-							<li><a class="dropdown-item" href="#" data-action="delete-account">[[user:delete_account_as_admin]]</a></li>
-							<li><a class="dropdown-item" href="#" data-action="delete-content">[[user:delete_content]]</a></li>
-							<li><a class="dropdown-item" href="#" data-action="delete-all">[[user:delete_all]]</a></li>
+							<li><a class="dropdown-item" href="#" data-action="delete-account">[[user:delete-account-as-admin]]</a></li>
+							<li><a class="dropdown-item" href="#" data-action="delete-content">[[user:delete-content]]</a></li>
+							<li><a class="dropdown-item" href="#" data-action="delete-all">[[user:delete-all]]</a></li>
 							{{{ end }}}
 						</ul>
 					</div>

package/templates/groups/details.tpl

@@ -64,7 +64,7 @@
 	<div class="col-lg-8 col-12">
 		<div class="col-lg-11">
 			<!-- IF !posts.length -->
-			<div class="alert alert-info">[[groups:details.has_no_posts]]</div>
+			<div class="alert alert-info">[[groups:details.has-no-posts]]</div>
 			<!-- ENDIF !posts.length -->
 			<!-- IMPORT partials/posts_list.tpl -->
 		</div>

package/templates/groups/list.tpl

@@ -8,16 +8,16 @@
 	<div class="row justify-content-between">
 		<div class="col-lg-6">
 			<!-- IF allowGroupCreation -->
-			<button class="btn btn-primary" data-action="new"><i class="fa fa-plus"></i> [[groups:new_group]]</button>
+			<button class="btn btn-primary" data-action="new"><i class="fa fa-plus"></i> [[groups:new-group]]</button>
 			<!-- ENDIF allowGroupCreation -->
 		</div>
 		<div class="col-lg-6">
 			<div class="row justify-content-end">
 				<div class="col-5 col-md-6">
 					<select class="form-select" 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">[[groups:details.group-name]]</option>
+						<option value="count">[[groups:details.member-count]]</option>
+						<option value="date">[[groups:details.creation-date]]</option>
 					</select>
 				</div>
 				<div class="col-7 col-md-6">
@@ -40,7 +40,7 @@
 		<!-- ELSE -->
 		<div class="col-12">
 			<div class="alert alert-warning">
-			[[groups:no_groups_found]]
+			[[groups:no-groups-found]]
 			</div>
 		</div>
 		<!-- ENDIF groups.length -->