From e06190b39400904137e4ed69b1b2f93adfd8751d Mon Sep 17 00:00:00 2001 From: Gusted Date: Wed, 1 Nov 2023 20:47:40 +0100 Subject: [PATCH] [MODERATION] Prepare moderation for context locale changes (squash) - Resolves https://codeberg.org/forgejo/forgejo/issues/1711 (cherry picked from commit 2e289baea943dcece88f02d110b03d344308a261) (cherry picked from commit 07ecf49c0596b8b49aec1a5c3aeff1ef93f0655c) --- templates/org/settings/blocked_users.tmpl | 4 ++-- templates/org/settings/navbar.tmpl | 2 +- templates/shared/blocked_users_list.tmpl | 6 +++--- templates/shared/user/profile_big_avatar.tmpl | 4 ++-- templates/user/profile.tmpl | 10 +++++----- templates/user/settings/blocked_users.tmpl | 2 +- templates/user/settings/navbar.tmpl | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/templates/org/settings/blocked_users.tmpl b/templates/org/settings/blocked_users.tmpl index 78c9025a83..d6c16bacef 100644 --- a/templates/org/settings/blocked_users.tmpl +++ b/templates/org/settings/blocked_users.tmpl @@ -7,11 +7,11 @@
- +
diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index a46e6821ad..b245768203 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -39,7 +39,7 @@ {{end}} - {{.locale.Tr "settings.blocked_users"}} + {{ctx.Locale.Tr "settings.blocked_users"}} {{ctx.Locale.Tr "org.settings.delete"}} diff --git a/templates/shared/blocked_users_list.tmpl b/templates/shared/blocked_users_list.tmpl index ba399159e3..392947e80c 100644 --- a/templates/shared/blocked_users_list.tmpl +++ b/templates/shared/blocked_users_list.tmpl @@ -9,20 +9,20 @@ {{template "shared/user/name" .}}
- {{$.locale.Tr "settings.blocked_since" (DateTime "short" .CreatedUnix) | Safe}} + {{ctx.Locale.Tr "settings.blocked_since" (DateTime "short" .CreatedUnix) | Safe}}
{{$.CsrfTokenHtml}} - +
{{else}}
- {{$.locale.Tr "settings.blocked_users_none"}} + {{ctx.Locale.Tr "settings.blocked_users_none"}}
{{end}} diff --git a/templates/shared/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl index 4c6675afd3..509111a7f6 100644 --- a/templates/shared/user/profile_big_avatar.tmpl +++ b/templates/shared/user/profile_big_avatar.tmpl @@ -120,12 +120,12 @@
  • {{if $.IsBlocked}} {{else}} {{end}}
  • diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 7e6c24a136..ed35389097 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -43,14 +43,14 @@