From bf80842b4f14a075c6840b6fe37d59b5ac3fac44 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sun, 19 Oct 2025 18:35:25 +0200 Subject: [PATCH] chore(ui): a few consistency improvements for modals (#9746) A bucket of water for a lake of acidic modal inconsistencies but this PR exists. ## Change 1 Followup to https://codeberg.org/forgejo/forgejo/pulls/9636/files#diff-ed78a3f2bb5b010be9410d4a6be8ab08e50df2c4. Remove a few extra `center` wraps from the HTML. They are no longer doing anything anymore. No visual changes. ## Change 2 Improve a few titles: Preview: - https://codeberg.org/attachments/4216f29f-687c-4b88-8a56-246282ae699b - https://codeberg.org/attachments/14c493d1-21f2-4433-ac4d-fc2e985239b0 - https://codeberg.org/attachments/d18bd923-a46e-427c-9132-4e60a8ba0a9d Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9746 Reviewed-by: Gusted --- options/locale/locale_en-US.ini | 6 +++--- templates/admin/emails/list.tmpl | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index fbd5d18d8e..118a0ee540 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1718,8 +1718,8 @@ issues.lock.notice_3 = - You can always unlock this issue again in the future. issues.unlock.notice_1 = - Everyone would be able to comment on this issue once more. issues.unlock.notice_2 = - You can always lock this issue again in the future. issues.lock.reason = Reason for locking -issues.lock.title = Lock conversation on this issue. -issues.unlock.title = Unlock conversation on this issue. +issues.lock.title = Lock conversation +issues.unlock.title = Unlock conversation issues.comment_on_locked = You cannot comment on a locked issue. issues.delete = Delete issues.delete.title = Delete this issue? @@ -3100,7 +3100,7 @@ emails.not_updated = Failed to update the requested email address: %v emails.duplicate_active = This email address is already active for a different user. emails.change_email_header = Update email properties emails.change_email_text = Are you sure you want to update this email address? -emails.delete = Delete Email +emails.delete = Delete email address emails.delete_desc = Are you sure you want to delete this email address? emails.deletion_success = The email address has been deleted. emails.delete_primary_email_error = You can not delete the primary email. diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 035185c55c..c9c2a5668e 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -79,7 +79,7 @@
{{ctx.Locale.Tr "admin.emails.change_email_header"}}
-

{{ctx.Locale.Tr "admin.emails.change_email_text"}}

+ {{ctx.Locale.Tr "admin.emails.change_email_text"}}
{{$.CsrfTokenHtml}} @@ -94,9 +94,7 @@ -
- {{template "base/modal_actions_confirm" .}} -
+ {{template "base/modal_actions_confirm" .}}