diff --git a/scss/mobilebar.scss b/scss/mobilebar.scss index e986d3f7..f52215e0 100644 --- a/scss/mobilebar.scss +++ b/scss/mobilebar.scss @@ -31,7 +31,7 @@ font-size: 9px; line-height: 12px; } - @include media-breakpoint-down(md) { + @include media-breakpoint-down(lg) { .dropdown-menu { left: 0!important; right: 0!important; diff --git a/templates/account/blocks.tpl b/templates/account/blocks.tpl index 3827411c..8a1be32c 100644 --- a/templates/account/blocks.tpl +++ b/templates/account/blocks.tpl @@ -1,17 +1,17 @@
-

[[pages:account/blocks, {username}]]

+

{{tx("pages:account/blocks", txEscape(username))}}

- +
- - + +
{{{ end }}} diff --git a/templates/account/categories.tpl b/templates/account/categories.tpl index 7227012b..573fe5a6 100644 --- a/templates/account/categories.tpl +++ b/templates/account/categories.tpl @@ -8,43 +8,43 @@
diff --git a/templates/account/consent.tpl b/templates/account/consent.tpl index e908455a..24eff2ae 100644 --- a/templates/account/consent.tpl +++ b/templates/account/consent.tpl @@ -1,8 +1,8 @@ -

[[user:consent.title]]

+

{{tx("user:consent.title")}}

-

[[user:consent.lead]]

-

[[user:consent.intro]]

+

{{tx("user:consent.lead")}}

+

{{tx("user:consent.intro")}}

@@ -10,31 +10,31 @@
{{{ if gdpr_consent }}}
- [[user:consent.received]] + {{tx("user:consent.received")}}
{{{ else }}}
- [[user:consent.not-received]] + {{tx("user:consent.not-received")}}

- +
{{{ end }}}
-

[[user:consent.email-intro]]

+

{{tx("user:consent.email-intro")}}

{{{ if digest.enabled }}} -

[[user:consent.digest-frequency, {digest.frequency}]]

+

{{tx("user:consent.digest-frequency", digest.frequency)}}

{{{ else }}} -

[[user:consent.digest-off]]

+

{{tx("user:consent.digest-off")}}

{{{ end }}}
- [[pages:account/settings]] + {{tx("pages:account/settings")}}
@@ -43,27 +43,27 @@
-

[[user:consent.right-of-access]]

-

[[user:consent.right-of-access-description]]

-

[[user:consent.right-to-rectification]]

-

[[user:consent.right-to-rectification-description]]

-

[[user:consent.right-to-erasure]]

-

[[user:consent.right-to-erasure-description]]

-

[[user:consent.right-to-data-portability]]

-

[[user:consent.right-to-data-portability-description]]

+

{{tx("user:consent.right-of-access")}}

+

{{tx("user:consent.right-of-access-description")}}

+

{{tx("user:consent.right-to-rectification")}}

+

{{tx("user:consent.right-to-rectification-description")}}

+

{{tx("user:consent.right-to-erasure")}}

+

{{tx("user:consent.right-to-erasure-description")}}

+

{{tx("user:consent.right-to-data-portability")}}

+

{{tx("user:consent.right-to-data-portability-description")}}

{{{ if canExport }}}
- [[user:consent.export-profile]] + {{tx("user:consent.export-profile")}} - [[user:consent.export-posts]] + {{tx("user:consent.export-posts")}} - [[user:consent.export-uploads]] + {{tx("user:consent.export-uploads")}}
{{{ end }}} diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl index dcdb867f..e60edf6a 100644 --- a/templates/account/edit.tpl +++ b/templates/account/edit.tpl @@ -1,19 +1,19 @@
-

{{{ if isSelf }}}[[user:edit-profile]]{{{ else }}}[[pages:account/edit, {username}]]{{{ end }}}

- +

{{{ if isSelf }}}{{tx("user:edit-profile")}}{{{ else }}}{{tx("pages:account/edit", txEscape(username))}}{{{ end }}}

+
- - + +
- +
@@ -44,18 +44,18 @@ {{{ if groups.length }}}
- +
{{{ each groups }}}
- - + + {{{ if allowMultipleBadges }}} - - + + {{{ end }}}
@@ -66,14 +66,14 @@ {{{ if allowAboutMe }}}
- +
{{{ end }}} {{{ if (allowSignature && !disableSignatures) }}}
- +
{{{ end }}} @@ -85,41 +85,41 @@
{{{ if config.requireEmailConfirmation }}} {{{ if (email && isSelf) }}} - [[user:confirm-email]]

+ {{tx("user:confirm-email")}}

{{{ end }}} {{{ end }}}
{{{ if sso.length }}} - +
{{{ each sso }}}
{{{ if ./icon }}}{{{ end }}} - {{{ if ./associated }}}[[user:sso.associated]]{{{ else }}}[[user:sso.not-associated]]{{{ end }}} + {{{ if ./associated }}}{{tx("user:sso.associated")}}{{{ else }}}{{tx("user:sso.not-associated")}}{{{ end }}} {./name} {{{ if ./deauthUrl }}} - [[user:sso.dissociate]] + {{tx("user:sso.dissociate")}} {{{ end }}}
{{{ end }}} @@ -129,7 +129,7 @@
{{{ if (allowAccountDelete && isSelf) }}}
- +
{{{ end }}}
diff --git a/templates/account/edit/password.tpl b/templates/account/edit/password.tpl index 4505529f..846ae68f 100644 --- a/templates/account/edit/password.tpl +++ b/templates/account/edit/password.tpl @@ -1,6 +1,6 @@ -

{{{ if isSelf }}}[[user:change-password]]{{{ else }}}[[pages:{template.name}, {username}]]{{{ end }}}

+

{{{ if isSelf }}}{{tx("user:change-password")}}{{{ else }}}{{tx("pages:account/edit/password", txEscape(username))}}{{{ end }}}

@@ -8,25 +8,25 @@ {{{ if isSelf }}}
- - + +
{{{ end }}}
- - + +
- - + +
- +
diff --git a/templates/account/edit/username.tpl b/templates/account/edit/username.tpl index a98f78eb..5fd34da3 100644 --- a/templates/account/edit/username.tpl +++ b/templates/account/edit/username.tpl @@ -1,27 +1,27 @@ -

{{{ if isSelf }}}[[user:change-username]]{{{ else }}}[[pages:{template.name}, {username}]]{{{ end }}}

+

{{{ if isSelf }}}{{tx("user:change-username")}}{{{ else }}}{{tx("pages:account/edit/username", txEscape(username))}}{{{ end }}}

- - + +
{{{ if isSelf }}}
- - + +
{{{ end }}}
- +
diff --git a/templates/account/followers.tpl b/templates/account/followers.tpl index bde07512..b3954be5 100644 --- a/templates/account/followers.tpl +++ b/templates/account/followers.tpl @@ -1,8 +1,8 @@ -

[[pages:{template.name}, {username}]]

+

{{tx("pages:account/followers", txEscape(username))}}

{{{ if !users.length }}} -
[[user:has-no-follower]]
+
{{tx("user:has-no-follower")}}
{{{ end }}} diff --git a/templates/account/following.tpl b/templates/account/following.tpl index 5e5abeaa..0ad7e4e6 100644 --- a/templates/account/following.tpl +++ b/templates/account/following.tpl @@ -1,9 +1,9 @@ -

[[pages:{template.name}, {username}]]

+

{{tx("pages:account/following", txEscape(username))}}

{{{ if !users.length }}} -
[[user:follows-no-one]]
+
{{tx("user:follows-no-one")}}
{{{ end }}} diff --git a/templates/account/groups.tpl b/templates/account/groups.tpl index c1faf808..dfbea792 100644 --- a/templates/account/groups.tpl +++ b/templates/account/groups.tpl @@ -1,11 +1,11 @@ -

[[pages:{template.name}, {username}]]

+

{{tx("pages:account/groups", txEscape(username))}}

{{{ if !groups.length }}} -
[[groups:no-groups-found]]
+
{{tx("groups:no-groups-found")}}
{{{ else }}} {{{ end }}} diff --git a/templates/account/info.tpl b/templates/account/info.tpl index 17c79024..7fdccb29 100644 --- a/templates/account/info.tpl +++ b/templates/account/info.tpl @@ -2,7 +2,7 @@ {{{ if sessions.length }}}
-
[[global:sessions]]
+
{{tx("global:sessions")}}
@@ -13,7 +13,7 @@
{{{ if invitedBy}}}
-
[[user:info.invited-by]]
+
{{tx("user:info.invited-by")}}
{{buildAvatar(invitedBy, "24px", true)}} {invitedBy.username} @@ -22,7 +22,7 @@ {{{ end }}}
-
[[global:recentips]]
+
{{tx("global:recentips")}}
    {{{each ips}}} @@ -33,7 +33,7 @@
-
[[user:info.username-history]]
+
{{tx("user:info.username-history")}}
    {{{ each usernames }}} @@ -54,7 +54,7 @@
-
[[user:info.email-history]]
+
{{tx("user:info.email-history")}}
    {{{ each emails }}} @@ -74,7 +74,7 @@
-
[[user:info.latest-flags]]
+
{{tx("user:info.latest-flags")}}
{{{ if history.flags.length }}}
    @@ -83,20 +83,20 @@
    {{{ if (./type == "user")}}} - [[user:info.profile]] + {{tx("user:info.profile")}} {{{ else }}} - [[user:info.post]] + {{tx("user:info.post")}} {{{ end }}}
    - [[user:info.view-flag]] + {{tx("user:info.view-flag")}}
    {{{ if (./type == "post") }}}

    {{{ if history.flags.targetPurged }}} -

    [[flags:target-purged]]
    +
    {{tx("flags:target-purged")}}
    {{{ else }}} {./title} {{{ end }}} @@ -104,7 +104,7 @@ {{{ end }}}
    - [[user:info.reported-by]] + {{tx("user:info.reported-by")}}
    {{{ each ./reports }}} {{buildAvatar(./reporter, "24px", true)}} @@ -115,20 +115,20 @@ {{{ end }}}
{{{ else }}} -
[[user:info.no-flags]]
+
{{tx("user:info.no-flags")}}
{{{ end }}}
- [[user:info.ban-history]] + {{tx("user:info.ban-history")}} {{{ if (!banned && !isSelf) }}} - + {{{ end }}} {{{ if (banned && !isSelf) }}} - + {{{ end }}}
@@ -155,10 +155,10 @@

{{{ if ./until }}} - [[user:info.banned-until, {isoTimeToLocaleString(./untilISO, config.userLang)}]] + {{tx("user:info.banned-until", isoTimeToLocaleString(./untilISO, config.userLang))}} {{{ else }}} {{{ if (./type != "unban") }}} - [[user:info.banned-permanently]] + {{tx("user:info.banned-permanently")}} {{{ end }}} {{{ end }}}

@@ -166,22 +166,22 @@ {{{ end }}} {{{ else }}} -
[[user:info.no-ban-history]]
+
{{tx("user:info.no-ban-history")}}
{{{ end }}}
- [[user:info.mute-history]] + {{tx("user:info.mute-history")}} {{{ if !muted }}} {{{ if !isSelf }}} - + {{{ end }}} {{{ else }}} {{{ if !isSelf }}} - + {{{ end }}} {{{ end }}}
@@ -199,24 +199,24 @@
{{{ if (./type != "unmute") }}} - [[user:muted]] + {{tx("user:muted")}} {{{ else }}} - [[user:unmuted]] + {{tx("user:unmuted")}} {{{ end }}}

- [[user:info.banned-reason-label]]: {{tx(./reason)}} + {{tx("user:info.banned-reason-label")}}: {{tx(./reason)}}

{{{ if ./until }}} - [[user:info.muted-until, {isoTimeToLocaleString(./untilISO, config.userLang)}]] + {{tx("user:info.muted-until", isoTimeToLocaleString(./untilISO, config.userLang))}} {{{ end }}}

{{{ end }}} {{{ else }}} -
[[user:info.no-mute-history]]
+
{{tx("user:info.no-mute-history")}}
{{{ end }}}
@@ -227,12 +227,12 @@ {{{ if isAdminOrGlobalModerator }}}
- [[user:info.moderation-note]] + {{tx("user:info.moderation-note")}}
- + - +
{{{ each moderationNotes }}} @@ -252,14 +252,14 @@
{./note}
- +
diff --git a/templates/account/posts.tpl b/templates/account/posts.tpl index bc7a0307..6ca6a6ce 100644 --- a/templates/account/posts.tpl +++ b/templates/account/posts.tpl @@ -1,21 +1,21 @@
-

[[global:posts]]

+

{{tx("global:posts")}}

- [[global:header.recent]] + {{tx("global:header.recent")}} {{{ if !reputation:disabled }}} - [[global:best]] - [[global:controversial]] + {{tx("global:best")}} + {{tx("global:controversial")}} {{{ if canEdit }}} - [[global:upvoted]] + {{tx("global:upvoted")}} {{{ if !downvote:disabled }}} - [[global:downvoted]] + {{tx("global:downvoted")}} {{{ end }}} {{{ end }}} {{{ end }}} {{{ if canEdit }}} - [[user:bookmarks]] + {{tx("user:bookmarks")}} {{{ end }}}
diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl index e0b97fae..dd5ecf10 100644 --- a/templates/account/profile.tpl +++ b/templates/account/profile.tpl @@ -27,14 +27,14 @@ {{{ if !reputation:disabled }}}
- [[global:reputation]] + {{tx("global:reputation")}} {humanReadableNumber(reputation)}
{{{ end }}}
- [[user:profile-views]] + {{tx("user:profile-views")}} {humanReadableNumber(profileviews)}
@@ -42,14 +42,14 @@
- [[user:joined]] + {{tx("user:joined")}}
- [[user:lastonline]] + {{tx("user:lastonline")}}
@@ -57,7 +57,7 @@ {{{ if email }}}
- [[user:email]] {{{ if emailHidden}}}([[global:hidden]]){{{ end }}} + {{tx("user:email")}} {{{ if emailHidden}}}({{tx("global:hidden")}}){{{ end }}} {email}
@@ -66,7 +66,7 @@ {{{ if age }}}
- [[user:age]] + {{tx("user:age")}} {age}
diff --git a/templates/account/sessions.tpl b/templates/account/sessions.tpl index 679d0877..90b133de 100644 --- a/templates/account/sessions.tpl +++ b/templates/account/sessions.tpl @@ -1,6 +1,6 @@ -

[[user:sessions.description]]

+

{{tx("user:sessions.description")}}