Merge language categories

See #2716

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index 33827fcc3eb706959dcb8f2cc533e17b99d1ffe0..9ed63fc807235dd97367da4f84a97e84af292061 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -31,8 +31,7 @@
                        'wcf.acp.user.ban.neverExpires': '{lang}wcf.acp.user.ban.neverExpires{/lang}',
                        'wcf.acp.user.sendNewPassword.workerTitle': '{lang}wcf.acp.user.sendNewPassword.workerTitle{/lang}',
                        'wcf.acp.worker.abort.confirmMessage': '{lang}wcf.acp.worker.abort.confirmMessage{/lang}',
-                       'wcf.acp.user.content.removeContent': '{lang}wcf.acp.user.content.removeContent{/lang}',
-                       'wcf.acp.user.content.removeContent.confirmMessage': '{lang}wcf.acp.user.content.removeContent.confirmMessage{/lang}',
+                       'wcf.acp.content.removeContent': '{lang}wcf.acp.content.removeContent{/lang}'
                });
                WCF.ACP.User.BanHandler.init();
                
@@ -132,7 +131,7 @@
                                                                        {if $user->deletable}
                                                                                <li class="dropdownDivider"></li>
                                                                                <li><a href="#" class="jsDispatchDelete">{lang}wcf.global.button.delete{/lang}</a></li>
-                                                                               <li><a href="#" class="jsDeleteContent">{lang}wcf.acp.user.content.removeContent{/lang}</a></li>
+                                                                               <li><a href="#" class="jsDeleteContent">{lang}wcf.acp.content.removeContent{/lang}</a></li>
                                                                        {/if}
                                                                        
                                                                        {if $user->editable}

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Handler.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Handler.js
index 249125556922a25aee1c66f3bc3ba4dce14bcb97..299263600f98c6d86a16a84cc32507928d89ec8b 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Handler.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Handler.js
@@ -44,7 +44,7 @@ define(['Ajax', 'Language', 'Ui/Dialog', 'WoltLabSuite/Core/Acp/Ui/Worker'], fun
                        new Worker({
                                // dialog
                                dialogId: 'removeContentWorker',
-                               dialogTitle: Language.get('wcf.acp.user.content.removeContent'),
+                               dialogTitle: Language.get('wcf.acp.content.removeContent'),
                                
                                // ajax
                                className: '\\wcf\\system\\worker\\UserContentRemoveWorker',
@@ -97,7 +97,7 @@ define(['Ajax', 'Language', 'Ui/Dialog', 'WoltLabSuite/Core/Acp/Ui/Worker'], fun
                        return {
                                id: 'userRemoveContentHandler-' + this._userId,
                                options: {
-                                       title: Language.get('wcf.acp.user.content.removeContent')
+                                       title: Language.get('wcf.acp.content.removeContent')
                                },
                                source: null
                        };

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 2741c9d9c77c0652293c3817f7c6bee2eae389b6..d9a091097d87243141fdc6e23729a2c0a5b7ce96 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -275,6 +275,7 @@
                <item name="wcf.acp.contact.settings"><![CDATA[Kontaktformular bearbeiten]]></item>
        </category>
        <category name="wcf.acp.content">
+               <item name="wcf.acp.content.removeContent"><![CDATA[Inhalte des Benutzers löschen]]></item>
                <item name="wcf.acp.content.provider.removeContentSectionTitle"><![CDATA[Inhalte]]></item>
                <item name="wcf.acp.content.provider.removeContentInfo"><![CDATA[Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}wähle{else}wählen Sie{/if} aus, welche Inhalte vom Benutzer „<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user->username}</a>“ gelöscht werden sollen.]]></item>
                <item name="wcf.acp.content.provider.removeContentWarning"><![CDATA[<strong>Achtung</strong>: Der ausgewählte Inhalt wird nach dem Absenden <strong>unwiderruflich und ohne zusätzliche Sicherheitsabfrage</strong> gelöscht!]]></item>
@@ -2435,8 +2436,6 @@ Benutzerkontos nun in vollem Umfang nutzen.]]></item>
                <item name="wcf.acp.user.action.sendNewPassword"><![CDATA[Neues Passwort zusenden]]></item>
                <item name="wcf.acp.user.action.sendNewPassword.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} diesem Benutzer wirklich ein neues Kennwort zusenden?]]></item>
                <item name="wcf.acp.user.exportGdpr"><![CDATA[Persönliche Daten exportieren (DSGVO)]]></item>
-               <item name="wcf.acp.user.content.removeContent"><![CDATA[Inhalte des Benutzers löschen]]></item>
-               <item name="wcf.acp.user.content.removeContent.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} wirklich alle Inhalte von dem Benutzer löschen?]]></item>
        </category>
        <category name="wcf.acp.worker">
                <item name="wcf.acp.worker.abort.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} die Ausführung wirklich abbrechen?]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index a6c02a558188cb9ae63a53810dae8d40681bbe36..d2b08aae0c511b504de4becd9354855517452d4a 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2773,8 +2773,6 @@ full extend.]]></item>
                <item name="wcf.acp.user.action.sendNewPassword"><![CDATA[Send New Password]]></item>
                <item name="wcf.acp.user.action.sendNewPassword.confirmMessage"><![CDATA[Do you really want to send a new password to this user?]]></item>
                <item name="wcf.acp.user.exportGdpr"><![CDATA[Export Personal Data (GDPR)]]></item>
-               <item name="wcf.acp.user.content.removeContent"><![CDATA[Delete User Content]]></item>
-               <item name="wcf.acp.user.content.removeContent.confirmMessage"><![CDATA[Do you really want to delete all user content from this user?]]></item>
        </category>
        <category name="wcf.acp.worker">
                <item name="wcf.acp.worker.abort.confirmMessage"><![CDATA[Do you really want to terminate the execution?]]></item>
@@ -3036,6 +3034,7 @@ Email: {@$emailAddress} {* this line ends with a space *}
                <item name="wcf.acp.contact.settings"><![CDATA[Edit Contact Form]]></item>
        </category>
        <category name="wcf.acp.content">
+               <item name="wcf.acp.content.removeContent"><![CDATA[Delete User Content]]></item>
                <item name="wcf.acp.content.provider.removeContentSectionTitle"><![CDATA[Content]]></item>
                <item name="wcf.acp.content.provider.removeContentInfo"><![CDATA[Please select which content of the user “<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user->username}</a>” should be deleted.]]></item>
                <item name="wcf.acp.content.provider.removeContentWarning"><![CDATA[<strong>Heads up</strong>: The content will be deleted irrevocably and without any further confirmation prompt!]]></item>