Unified language variables for "mark as read" buttons

diff --git a/com.woltlab.wcf/templates/articleList.tpl b/com.woltlab.wcf/templates/articleList.tpl
index 6c25bf3722146fb3337a5f186116d992f6c224b5..f5e88a5c4c9ff4099fbc515942ee52c5b995794f 100644 (file)
--- a/com.woltlab.wcf/templates/articleList.tpl
+++ b/com.woltlab.wcf/templates/articleList.tpl
@@ -72,7 +72,7 @@
                </ul>
        </div>
        {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAsRead{/lang}</a>
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAllAsRead{/lang}</a>
        {/if}
 {/capture}
 

diff --git a/com.woltlab.wcf/templates/categoryArticleList.tpl b/com.woltlab.wcf/templates/categoryArticleList.tpl
index 4a99e1cb4871e8160e9f80871cdecb8827e0d96b..174550195ef78cc6a45433ddb7e4c85cae49667a 100644 (file)
--- a/com.woltlab.wcf/templates/categoryArticleList.tpl
+++ b/com.woltlab.wcf/templates/categoryArticleList.tpl
@@ -67,7 +67,7 @@
                <a href="#" class="contentInteractionButton jsSubscribeButton jsOnly button small{if $category->isSubscribed()} active{/if}" data-object-type="com.woltlab.wcf.article.category" data-object-id="{@$category->categoryID}">{lang}wcf.user.objectWatch.button.subscribe{/lang}</a>
        {/if}
        {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAsRead{/lang}</a>
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAllAsRead{/lang}</a>
        {/if}
 {/capture}
 

diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index 1784497c07d579c40ed6da59342b19d8c1632093..4ff9f992da72b01f5e894664c315b4989b7848d6 100644 (file)
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -120,8 +120,8 @@ window.addEventListener('pageshow', function(event) {
                        'wcf.page.pagePosition': '{jslang __literal=true}wcf.page.pagePosition{/jslang}',
                        'wcf.style.changeStyle': '{jslang}wcf.style.changeStyle{/jslang}',
                        'wcf.user.activityPoint': '{jslang}wcf.user.activityPoint{/jslang}',
-                       'wcf.user.panel.markAllAsRead': '{jslang}wcf.user.panel.markAllAsRead{/jslang}',
-                       'wcf.user.panel.markAsRead': '{jslang}wcf.user.panel.markAsRead{/jslang}',
+                       'wcf.global.button.markAllAsRead': '{jslang}wcf.global.button.markAllAsRead{/jslang}',
+                       'wcf.global.button.markAsRead': '{jslang}wcf.global.button.markAsRead{/jslang}',
                        'wcf.user.panel.settings': '{jslang}wcf.user.panel.settings{/jslang}',
                        'wcf.user.panel.showAll': '{jslang}wcf.user.panel.showAll{/jslang}',
                        'wcf.menu.page': '{jslang}wcf.menu.page{/jslang}',

diff --git a/com.woltlab.wcf/templates/moderationList.tpl b/com.woltlab.wcf/templates/moderationList.tpl
index 3840621c6cc0182b617bb6d55508983680c0c68a..a80d8a4339f5eb5c56a82802ec85b0506426c652 100644 (file)
--- a/com.woltlab.wcf/templates/moderationList.tpl
+++ b/com.woltlab.wcf/templates/moderationList.tpl
@@ -11,7 +11,7 @@
 {/capture}
 
 {capture assign='contentInteractionButtons'}
-       <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.moderation.markAllAsRead{/lang}</a>
+       <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAllAsRead{/lang}</a>
 {/capture}
 
 {include file='header'}

diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl
index 5feb4767c126d21422cd04074f42b99251480c1e..187ab6dff25c9c4e40a0862e2df6e0434144e74a 100644 (file)
--- a/com.woltlab.wcf/templates/notificationList.tpl
+++ b/com.woltlab.wcf/templates/notificationList.tpl
@@ -28,7 +28,7 @@
 
 {capture assign='contentInteractionButtons'}
        {if $__wcf->getUserNotificationHandler()->getNotificationCount()}
-               <a href="#" class="jsMarkAllAsConfirmed contentInteractionButton button small jsOnly">{lang}wcf.user.notification.markAllAsConfirmed{/lang}</a>
+               <a href="#" class="jsMarkAllAsConfirmed contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAllAsRead{/lang}</a>
        {/if}
 {/capture}
 
@@ -118,7 +118,6 @@
 <script data-relocate="true">
        $(function() {
                WCF.Language.addObject({
-                       'wcf.user.notification.markAsConfirmed': '{jslang}wcf.user.notification.markAsConfirmed{/jslang}',
                        'wcf.user.notification.markAllAsConfirmed.confirmMessage': '{jslang}wcf.user.notification.markAllAsConfirmed.confirmMessage{/jslang}'
                });
                

diff --git a/com.woltlab.wcf/templates/unreadArticleList.tpl b/com.woltlab.wcf/templates/unreadArticleList.tpl
index 0b98b3ee187e6383879ce83942cd99d3c04973b6..f7e61e94bc9a9aea293fcb4c8a777d24a930898b 100644 (file)
--- a/com.woltlab.wcf/templates/unreadArticleList.tpl
+++ b/com.woltlab.wcf/templates/unreadArticleList.tpl
@@ -45,7 +45,7 @@
 
 {capture assign='contentInteractionButtons'}
        {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAsRead{/lang}</a>
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAllAsRead{/lang}</a>
        {/if}
 {/capture}
 

diff --git a/com.woltlab.wcf/templates/watchedArticleList.tpl b/com.woltlab.wcf/templates/watchedArticleList.tpl
index 8da362a589d091f24ba35ab5c3910b8d1dfc0801..c53b7d70056e9c74a18d2fd39ad95774d2cc5a6e 100644 (file)
--- a/com.woltlab.wcf/templates/watchedArticleList.tpl
+++ b/com.woltlab.wcf/templates/watchedArticleList.tpl
@@ -43,7 +43,7 @@
 
 {capture assign='contentInteractionButtons'}
        {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAsRead{/lang}</a>
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAllAsRead{/lang}</a>
        {/if}
 {/capture}
 

diff --git a/ts/WoltLabSuite/Core/Ui/User/Menu/View.ts b/ts/WoltLabSuite/Core/Ui/User/Menu/View.ts
index b3dd9ea97c3a78b986372c0ddb6a54a0c411ea34..00e04d2c37841ab9697c074253ec0e6151a9b070 100644 (file)
--- a/ts/WoltLabSuite/Core/Ui/User/Menu/View.ts
+++ b/ts/WoltLabSuite/Core/Ui/User/Menu/View.ts
@@ -35,7 +35,7 @@ export class UserMenuView {
       icon: '<span class="icon icon24 fa-check"></span>',
       link: "#",
       name: "markAllAsRead",
-      title: Language.get("wcf.user.panel.markAllAsRead"),
+      title: Language.get("wcf.global.button.markAllAsRead"),
     });
 
     this.focusTrap = createFocusTrap(this.element, {
@@ -166,7 +166,7 @@ export class UserMenuView {
       <div class="userMenuItemMeta"></div>
       <div class="userMenuItemUnread">
         <a href="#" class="userMenuItemMarkAsRead" role="button">
-          <span class="icon icon24 fa-check jsTooltip" title="${Language.get("wcf.user.panel.markAsRead")}"></span>
+          <span class="icon icon24 fa-check jsTooltip" title="${Language.get("wcf.global.button.markAsRead")}"></span>
         </a>
       </div>
     `;

diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js
index 234a89fb6479283a44a01415f5e111795a5c7cf2..5d6a9410422057dafb581de388747ef9e692000c 100644 (file)
--- a/wcfsetup/install/files/js/WCF.User.js
+++ b/wcfsetup/install/files/js/WCF.User.js
@@ -275,7 +275,7 @@ if (COMPILER_TARGET_DEFAULT) {
                                if (this._options.enableMarkAsRead) {
                                        var $outstandingItems = this._dropdown.getItemList().children('.interactiveDropdownItemOutstanding');
                                        if (this._markAllAsReadLink === null && $outstandingItems.length) {
-                                               var $button = this._markAllAsReadLink = $('<li class="interactiveDropdownItemMarkAllAsRead"><a href="#" title="' + WCF.Language.get('wcf.user.panel.markAllAsRead') + '" class="jsTooltip"><span class="icon icon24 fa-check" /></a></li>').appendTo(this._dropdown.getLinkList());
+                                               var $button = this._markAllAsReadLink = $('<li class="interactiveDropdownItemMarkAllAsRead"><a href="#" title="' + WCF.Language.get('wcf.global.button.markAllAsRead') + '" class="jsTooltip"><span class="icon icon24 fa-check" /></a></li>').appendTo(this._dropdown.getLinkList());
                                                $button.click((function (event) {
                                                        this._dropdown.close();
                                                        
@@ -289,7 +289,7 @@ if (COMPILER_TARGET_DEFAULT) {
                                                var $item = $(item).addClass('interactiveDropdownItemOutstandingIcon');
                                                var $objectID = $item.data('objectID');
                                                
-                                               var $button = $('<div class="interactiveDropdownItemMarkAsRead"><a href="#" title="' + WCF.Language.get('wcf.user.panel.markAsRead') + '" class="jsTooltip"><span class="icon icon16 fa-check" /></a></div>').appendTo($item);
+                                               var $button = $('<div class="interactiveDropdownItemMarkAsRead"><a href="#" title="' + WCF.Language.get('wcf.global.button.markAsRead') + '" class="jsTooltip"><span class="icon icon16 fa-check" /></a></div>').appendTo($item);
                                                $button.click((function (event) {
                                                        this._markAsRead(event, $objectID);
                                                        
@@ -1461,7 +1461,7 @@ if (COMPILER_TARGET_DEFAULT) {
                                if (!$item.data('isRead')) {
                                        $item.find('a:not(.userLink)').prop('href', $item.data('link'));
                                        
-                                       var $markAsConfirmed = $('<a href="#" class="icon icon24 fa-check notificationItemMarkAsConfirmed jsTooltip" title="' + WCF.Language.get('wcf.user.notification.markAsConfirmed') + '" />').appendTo($item);
+                                       var $markAsConfirmed = $('<a href="#" class="icon icon24 fa-check notificationItemMarkAsConfirmed jsTooltip" title="' + WCF.Language.get('wcf.global.button.markAsRead') + '" />').appendTo($item);
                                        $markAsConfirmed.click($.proxy(this._markAsConfirmed, this));
                                }
                        }).bind(this));

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Menu/View.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Menu/View.js
index bdf60bf2fe3deb12818c9680c11dd3b3c68ffbd2..b15f0265c5ea8ce8efcdb7f14a301b11b8a41f89 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Menu/View.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Menu/View.js
@@ -25,7 +25,7 @@ define(["require", "exports", "tslib", "../../../Date/Util", "../../../StringUti
                 icon: '<span class="icon icon24 fa-check"></span>',
                 link: "#",
                 name: "markAllAsRead",
-                title: Language.get("wcf.user.panel.markAllAsRead"),
+                title: Language.get("wcf.global.button.markAllAsRead"),
             });
             this.focusTrap = (0, focus_trap_1.createFocusTrap)(this.element, {
                 allowOutsideClick: true,
@@ -133,7 +133,7 @@ define(["require", "exports", "tslib", "../../../Date/Util", "../../../StringUti
       <div class="userMenuItemMeta"></div>
       <div class="userMenuItemUnread">
         <a href="#" class="userMenuItemMarkAsRead" role="button">
-          <span class="icon icon24 fa-check jsTooltip" title="${Language.get("wcf.user.panel.markAsRead")}"></span>
+          <span class="icon icon24 fa-check jsTooltip" title="${Language.get("wcf.global.button.markAsRead")}"></span>
         </a>
       </div>
     `;

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index d8610050a74878630038981a560a55c0ed3dcf70..a9c99744dbc6d9a73c8d5c9226d41fea7236e78d 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -4003,6 +4003,7 @@ Dateianhänge:
                <item name="wcf.global.button.showMenu"><![CDATA[Menü anzeigen]]></item>
                <item name="wcf.global.button.hideMenu"><![CDATA[Menü verbergen]]></item>
                <item name="wcf.global.button.markAsRead"><![CDATA[Als gelesen markieren]]></item>
+               <item name="wcf.global.button.markAllAsRead"><![CDATA[Alle als gelesen markieren]]></item>
                <item name="wcf.global.rss.copy"><![CDATA[Link kopieren]]></item>
                <item name="wcf.global.rss.copy.success"><![CDATA[Der Link wurde erfolgreich kopiert.]]></item>
                <item name="wcf.global.rss.accessToken.info"><![CDATA[Der Link zum anonymen RSS-Feed enthält nur Inhalte, auf die Gäste Zugriff haben. Der Link zum personalisierten RSS-Feed enthält alle Inhalte, auf die {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} Zugriff {if LANGUAGE_USE_INFORMAL_VARIANT}hast{else}haben{/if}.]]></item>
@@ -4324,7 +4325,6 @@ Dateianhänge:
                <item name="wcf.moderation.deletedContent.objectTypes"><![CDATA[Gelöschte Inhalte]]></item>
                <item name="wcf.moderation.comments.description"><![CDATA[Diese Kommentare sind intern und nur für Moderatoren einsehbar]]></item>
                <item name="wcf.moderation.jumpToContent"><![CDATA[Zum Inhalt gehen]]></item>
-               <item name="wcf.moderation.markAllAsRead"><![CDATA[Alle Einträge als gelesen markieren]]></item>
                <item name="wcf.moderation.markAsRead.doubleClick"><![CDATA[Eintrag durch Doppelklick als gelesen markieren]]></item>
                <item name="wcf.moderation.comments"><![CDATA[Kommentare]]></item>
                <item name="wcf.moderation.username"><![CDATA[Autor]]></item>
@@ -4818,8 +4818,6 @@ sich{/if} nicht bei uns registriert {if LANGUAGE_USE_INFORMAL_VARIANT}hast{else}
                <item name="wcf.user.birthdayToday"><![CDATA[Hat heute Geburtstag]]></item>
                <item name="wcf.user.login.blocked"><![CDATA[Aufgrund einer hohen Anzahl von fehlgeschlagenen Anmeldeversuchen durch {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} IP-Adresse steht {if LANGUAGE_USE_INFORMAL_VARIANT}dir{else}Ihnen{/if} die Anmeldung aus Sicherheitsgründen vorübergehend nicht zur Verfügung. Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}versuche{else}versuchen Sie{/if} es später erneut!]]></item>
                <item name="wcf.user.banned"><![CDATA[Der Benutzer {$user->username} wurde{if $user->banExpires != 0} bis zum {@$user->banExpires|date}{/if} gesperrt.]]></item>
-               <item name="wcf.user.panel.markAllAsRead"><![CDATA[Alle als gelesen markieren]]></item>
-               <item name="wcf.user.panel.markAsRead"><![CDATA[Als gelesen markieren]]></item>
                <item name="wcf.user.panel.settings"><![CDATA[Einstellungen]]></item>
                <item name="wcf.user.panel.showAll"><![CDATA[Alle anzeigen]]></item>
                <item name="wcf.user.boxList.description.activityPoints"><![CDATA[{#$boxUser->activityPoints} Punkt{if $boxUser->activityPoints != 1}e{/if}]]></item>
@@ -5285,9 +5283,7 @@ Die E-Mail-Adresse des neuen Benutzers lautet: {@$user->email}.
        <category name="wcf.user.notification">
                <item name="wcf.user.notification.button.confirmed"><![CDATA[OK]]></item>
                <item name="wcf.user.notification.count"><![CDATA[if (data.returnValues.count == 0) { "Keine Benachrichtigungen" } else if (data.returnValues.count == 1) { "Eine Benachrichtigung" } else { data.returnValues.count + " Benachrichtigungen" }]]></item>
-               <item name="wcf.user.notification.markAllAsConfirmed"><![CDATA[Alle als gelesen markieren]]></item>
                <item name="wcf.user.notification.markAllAsConfirmed.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} wirklich alle Benachrichtigungen als gelesen markieren?]]></item>
-               <item name="wcf.user.notification.markAsConfirmed"><![CDATA[Als gelesen markieren]]></item>
                <item name="wcf.user.notification.noMoreNotifications"><![CDATA[Keine aktuellen Benachrichtigungen]]></item>
                <item name="wcf.user.notification.noNotifications"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du hast{else}Sie haben{/if} keine Benachrichtigungen.]]></item>
                <item name="wcf.user.notification.notifications"><![CDATA[Benachrichtigungen]]></item>
@@ -5607,5 +5603,10 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
        <item name="wcf.user.logout.sure"/>
        <item name="wcf.acp.dataImport.existingMapping.confirmMessage"/>
        <item name="wcf.article.markAllAsRead" />
+       <item name="wcf.moderation.markAllAsRead" />
+       <item name="wcf.user.notification.markAllAsConfirmed" />
+       <item name="wcf.user.notification.markAsConfirmed" />
+       <item name="wcf.user.panel.markAllAsRead" />
+       <item name="wcf.user.panel.markAsRead" />
 </delete>
 </language>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 4de92473a6fd0f60fdb780a2c6887ca909922630..ee52c36ebf81f4272739d276b4907e1901886a76 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3951,6 +3951,7 @@ Attachments:
                <item name="wcf.global.button.showMenu"><![CDATA[Show Menu]]></item>
                <item name="wcf.global.button.hideMenu"><![CDATA[Hide Menu]]></item>
                <item name="wcf.global.button.markAsRead"><![CDATA[Mark as Read]]></item>
+               <item name="wcf.global.button.markAllAsRead"><![CDATA[Mark All as Read]]></item>
                <item name="wcf.global.rss.copy"><![CDATA[Copy Link]]></item>
                <item name="wcf.global.rss.copy.success"><![CDATA[The link has been copied successfully.]]></item>
                <item name="wcf.global.rss.accessToken.info"><![CDATA[The link to the anonymous RSS feed only contains contents that guests can access. The link to the personalized RSS feed contains all contents that you can access.]]></item>
@@ -4272,7 +4273,6 @@ Attachments:
                <item name="wcf.moderation.deletedContent.objectTypes"><![CDATA[Deleted Content]]></item>
                <item name="wcf.moderation.comments.description"><![CDATA[All comments are internal and will not be exposed to non-moderators.]]></item>
                <item name="wcf.moderation.jumpToContent"><![CDATA[Go to Related Content]]></item>
-               <item name="wcf.moderation.markAllAsRead"><![CDATA[Mark All Items Read]]></item>
                <item name="wcf.moderation.markAsRead.doubleClick"><![CDATA[Double-Click to Mark This Item Read]]></item>
                <item name="wcf.moderation.comments"><![CDATA[Comments]]></item>
                <item name="wcf.moderation.username"><![CDATA[Author]]></item>
@@ -4817,8 +4817,6 @@ not register with us.]]></item>
                <item name="wcf.user.birthdayToday"><![CDATA[It is their birthday]]></item>
                <item name="wcf.user.login.blocked"><![CDATA[There have been too many failed login attempts originating from your IP address, your login attempts will be temporarily rejected for security reasons. Please try again later!]]></item>
                <item name="wcf.user.banned"><![CDATA[The user “{$user->username}” has been banned{if $user->banExpires != 0} until {@$user->banExpires|date}{/if}.]]></item>
-               <item name="wcf.user.panel.markAllAsRead"><![CDATA[Mark All as Read]]></item>
-               <item name="wcf.user.panel.markAsRead"><![CDATA[Mark as Read]]></item>
                <item name="wcf.user.panel.settings"><![CDATA[Settings]]></item>
                <item name="wcf.user.panel.showAll"><![CDATA[Display All]]></item>
                <item name="wcf.user.boxList.description.activityPoints"><![CDATA[{#$boxUser->activityPoints} Point{if $boxUser->activityPoints != 1}s{/if}]]></item>
@@ -5283,9 +5281,7 @@ You also received a list of emergency codes to use when your second factor becom
        <category name="wcf.user.notification">
                <item name="wcf.user.notification.button.confirmed"><![CDATA[OK]]></item>
                <item name="wcf.user.notification.count"><![CDATA[if (data.returnValues.count == 0) { "No Notifications" } else if (data.returnValues.count == 1) { "1 Notification" } else { data.returnValues.count + " Notifications" }]]></item>
-               <item name="wcf.user.notification.markAllAsConfirmed"><![CDATA[Mark All as Read]]></item>
                <item name="wcf.user.notification.markAllAsConfirmed.confirmMessage"><![CDATA[Do you really want to mark all notifications as read?]]></item>
-               <item name="wcf.user.notification.markAsConfirmed"><![CDATA[Mark as Read]]></item>
                <item name="wcf.user.notification.noMoreNotifications"><![CDATA[You have no recent notifications.]]></item>
                <item name="wcf.user.notification.noNotifications"><![CDATA[There are no notifications at the moment.]]></item>
                <item name="wcf.user.notification.notifications"><![CDATA[Notifications]]></item>
@@ -5609,5 +5605,10 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
        <item name="wcf.user.logout.sure"/>
        <item name="wcf.acp.dataImport.existingMapping.confirmMessage"/>
        <item name="wcf.article.markAllAsRead" />
+       <item name="wcf.moderation.markAllAsRead" />
+       <item name="wcf.user.notification.markAllAsConfirmed" />
+       <item name="wcf.user.notification.markAsConfirmed" />
+       <item name="wcf.user.panel.markAllAsRead" />
+       <item name="wcf.user.panel.markAsRead" />
 </delete>
 </language>