From d1868c4791ced7768b1ce2788d3c40ed11c6a89a Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Wed, 26 Nov 2025 12:01:50 +0100 Subject: [PATCH 1/3] Unify notification setting phrases ref https://www.woltlab.com/community/thread/300068-improve-notification-setting-phrases/ --- wcfsetup/install/lang/en.xml | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 319f8acdd1..6dfb3717c5 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -5386,7 +5386,7 @@ your notifications on {PAGE_TITLE|phras - + {$author} follows you.]]> @@ -5413,24 +5413,24 @@ your notifications on {PAGE_TITLE|phras {$author} on your wall.]]> getLink()}#wall/comment{@$commentID}/response{@$responseID}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]> {@$authorList} replied to {$commentAuthor}’s comment on your wall:

]]> - - - - - - - + + + + + + + {$userTrophy->getTrophy()}.]]> - - + + - - - + + + userID}{$author}{else}A guest{/if} commented on the page {$page->getTitle()}.]]> {$page->getTitle()}.]]> getTitle()}” [URL:{@$page->getLink()}#comment{@$commentID}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]> @@ -5443,9 +5443,9 @@ your notifications on {PAGE_TITLE|phras {$page->getTitle()}.]]> getTitle()}” [URL:{@$page->getLink()}#comment{@$commentID}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]> {@$authorList} replied to your comment on the page {$page->getTitle()}:

]]> - - - + + + @@ -5472,16 +5472,16 @@ your notifications on {PAGE_TITLE|phras {$commentAuthor} on your article {$article->getTitle()}.]]> getTitle()}” [URL:{@$article->getLink()}#comments/comment{@$commentID}/response{@$responseID}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]> {@$authorList} replied to {$commentAuthor}’s comment on your article {$article->getTitle()}:

]]> - + userID}{$author}{else}A guest{/if} wrote the article {$article->getTitle()}.]]> getTitle()}” [URL:{@$articleContent->getLink()}]:]]> {$author} wrote the article {$articleContent->getTitle()}:

]]> - - - - - + + + + + From 369d3f7aeb561b37166f1814856906765dbc54c3 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Wed, 26 Nov 2025 12:02:54 +0100 Subject: [PATCH 2/3] Remove obsolete language variables These were probably never used and were forgotten to be removed when the correct ones were added: https://github.com/WoltLab/WCF/commit/3bac98c91b27fadce206290eee28ad8c90798668 --- wcfsetup/install/lang/de.xml | 3 --- wcfsetup/install/lang/en.xml | 3 --- 2 files changed, 6 deletions(-) diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index bdc963d9a3..b99efa52fd 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -5442,9 +5442,6 @@ Benachrichtigungen auf {PAGE_TITLE|phra {$page->getTitle()} geantwortet.]]> getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Kommentar auf der Seite „{@$page->getTitle()}“ [URL:{@$page->getLink()}#comment{@$commentID}/response{@$responseID}] verfasst{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]> {@$authorList} {if $count == 1 && $guestTimesTriggered < 2 && (!$event->getAuthor()->userID || $guestTimesTriggered == 0)}hat eine Antwort{else}haben Antworten{/if} auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Kommentar auf der Seite {$page->getTitle()} verfasst:

]]> - - - diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 6dfb3717c5..89cee0ebda 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -5443,9 +5443,6 @@ your notifications on {PAGE_TITLE|phras {$page->getTitle()}.]]> getTitle()}” [URL:{@$page->getLink()}#comment{@$commentID}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]> {@$authorList} replied to your comment on the page {$page->getTitle()}:

]]> - - - From 4c7c2d543e44fb1d9bd3793978aa60fa7b05cb92 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Wed, 26 Nov 2025 13:27:14 +0100 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Alexander Ebert --- wcfsetup/install/lang/en.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 89cee0ebda..0ba82b5b6f 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -5413,7 +5413,7 @@ your notifications on {PAGE_TITLE|phras {$author} on your wall.]]> getLink()}#wall/comment{@$commentID}/response{@$responseID}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]> {@$authorList} replied to {$commentAuthor}’s comment on your wall:

]]> - + @@ -5425,7 +5425,7 @@ your notifications on {PAGE_TITLE|phras - + @@ -5475,9 +5475,9 @@ your notifications on {PAGE_TITLE|phras getTitle()}” [URL:{@$articleContent->getLink()}]:]]> {$author} wrote the article {$articleContent->getTitle()}:

]]> - - - + + +