From df0fd7e2f4dd8999504dc44acadffa921e71e517 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Thu, 9 Jul 2026 16:53:16 +0200 Subject: [PATCH 1/4] Migrate deprecated Language.get() usages to getPhrase() ref https://github.com/WoltLab/WCF/issues/6499 --- .../Devtools/Project/AbstractPackageList.ts | 18 +++---- .../Devtools/Project/ExcludedPackages.ts | 6 +-- .../Field/Devtools/Project/Instructions.ts | 50 +++++++++--------- .../Devtools/Project/OptionalPackages.ts | 4 +- .../Devtools/Project/RequiredPackages.ts | 4 +- ts/WoltLabSuite/Core/Acp/Ui/Article/Add.ts | 4 +- ts/WoltLabSuite/Core/Acp/Ui/Box/Add.ts | 4 +- ts/WoltLabSuite/Core/Acp/Ui/Box/Copy.ts | 4 +- ts/WoltLabSuite/Core/Acp/Ui/Box/Handler.ts | 8 +-- .../Core/Acp/Ui/DataImport/Manager.ts | 10 ++-- .../Ui/Devtools/Missing/Language/Item/List.ts | 8 +-- .../Core/Acp/Ui/Devtools/Notification/Test.ts | 4 +- .../Project/Installation/Confirmation.ts | 4 +- .../Acp/Ui/Devtools/Project/Pip/Entry/List.ts | 8 +-- .../Acp/Ui/Devtools/Project/QuickSetup.ts | 6 +-- .../Core/Acp/Ui/Devtools/Project/Sync.ts | 10 ++-- .../Core/Acp/Ui/Maintenance/RebuildData.ts | 4 +- .../Core/Acp/Ui/Option/EmailSmtpTest.ts | 16 +++--- .../Core/Acp/Ui/Option/RewriteGenerator.ts | 8 +-- .../Core/Acp/Ui/Option/RewriteTest.ts | 6 +-- .../Acp/Ui/Package/PrepareInstallation.ts | 8 +-- .../Core/Acp/Ui/Package/QuickInstallation.ts | 10 ++-- .../Core/Acp/Ui/Package/Update/Manager.ts | 12 ++--- ts/WoltLabSuite/Core/Acp/Ui/Page/Add.ts | 4 +- ts/WoltLabSuite/Core/Acp/Ui/Page/BoxOrder.ts | 6 +-- ts/WoltLabSuite/Core/Acp/Ui/Page/Copy.ts | 4 +- ts/WoltLabSuite/Core/Acp/Ui/Trophy/Upload.ts | 4 +- .../Acp/Ui/User/Action/Handler/Ban/Dialog.ts | 16 +++--- .../Ui/User/Action/Handler/SendNewPassword.ts | 6 +-- .../Acp/Ui/User/Content/Remove/Clipboard.ts | 6 +-- .../Acp/Ui/User/Content/Remove/Handler.ts | 6 +-- ts/WoltLabSuite/Core/Acp/Ui/User/Editor.ts | 6 +-- ts/WoltLabSuite/Core/Acp/Ui/Worker.ts | 4 +- ts/WoltLabSuite/Core/Ajax/Error.ts | 8 +-- ts/WoltLabSuite/Core/Ajax/Request.ts | 6 +-- .../Core/Component/Confirmation/Custom.ts | 8 +-- .../Core/Component/Dialog/Controls.ts | 8 +-- ts/WoltLabSuite/Core/Controller/Clipboard.ts | 4 +- .../Core/Controller/Map/Route/Planner.ts | 20 ++++---- .../Controller/User/Notification/Settings.ts | 6 +-- ts/WoltLabSuite/Core/Date/Picker.ts | 36 ++++++------- ts/WoltLabSuite/Core/Date/Util.ts | 10 ++-- .../Element/woltlab-core-dialog-control.ts | 6 +-- .../Core/Element/woltlab-core-dialog.ts | 4 +- .../Form/Builder/Field/Controller/Label.ts | 6 +-- ts/WoltLabSuite/Core/Language/Chooser.ts | 6 +-- ts/WoltLabSuite/Core/Language/Input.ts | 6 +-- ts/WoltLabSuite/Core/Media/Editor.ts | 10 ++-- ts/WoltLabSuite/Core/Media/Manager/Base.ts | 16 +++--- ts/WoltLabSuite/Core/Media/Manager/Editor.ts | 16 +++--- ts/WoltLabSuite/Core/Media/Manager/Search.ts | 4 +- ts/WoltLabSuite/Core/Media/Manager/Select.ts | 8 +-- ts/WoltLabSuite/Core/Media/Replace.ts | 6 +-- ts/WoltLabSuite/Core/Media/Upload.ts | 12 ++--- ts/WoltLabSuite/Core/Ui/Acl/Simple.ts | 8 +-- ts/WoltLabSuite/Core/Ui/Alignment.ts | 4 +- ts/WoltLabSuite/Core/Ui/Article/Search.ts | 12 ++--- ts/WoltLabSuite/Core/Ui/Color/Picker.ts | 24 ++++----- ts/WoltLabSuite/Core/Ui/Confirmation.ts | 8 +-- ts/WoltLabSuite/Core/Ui/Dialog.ts | 6 +-- ts/WoltLabSuite/Core/Ui/Feed/Dialog.ts | 16 +++--- ts/WoltLabSuite/Core/Ui/File/Delete.ts | 6 +-- ts/WoltLabSuite/Core/Ui/File/Upload.ts | 6 +-- ts/WoltLabSuite/Core/Ui/ItemList.ts | 4 +- ts/WoltLabSuite/Core/Ui/ItemList/Filter.ts | 12 ++--- .../Ui/ItemList/LineBreakSeparatedText.ts | 18 +++---- ts/WoltLabSuite/Core/Ui/ItemList/Static.ts | 4 +- .../Core/Ui/Message/InlineEditor.ts | 4 +- ts/WoltLabSuite/Core/Ui/Message/Manager.ts | 4 +- ts/WoltLabSuite/Core/Ui/Message/Reply.ts | 12 ++--- ts/WoltLabSuite/Core/Ui/Mobile.ts | 4 +- ts/WoltLabSuite/Core/Ui/Object/Action.ts | 4 +- .../Core/Ui/Object/Action/Toggle.ts | 6 +-- ts/WoltLabSuite/Core/Ui/Page/Action.ts | 4 +- ts/WoltLabSuite/Core/Ui/Page/Header/Menu.ts | 6 +-- ts/WoltLabSuite/Core/Ui/Page/JumpTo.ts | 10 ++-- ts/WoltLabSuite/Core/Ui/Page/Menu/Main.ts | 6 +-- ts/WoltLabSuite/Core/Ui/Page/Menu/User.ts | 4 +- ts/WoltLabSuite/Core/Ui/Page/Search.ts | 12 ++--- .../Core/Ui/Page/Search/Handler.ts | 12 ++--- ts/WoltLabSuite/Core/Ui/Password.ts | 8 +-- ts/WoltLabSuite/Core/Ui/Poll/Editor.ts | 12 ++--- .../Core/Ui/User/Activity/Recent.ts | 8 +-- ts/WoltLabSuite/Core/Ui/User/Editor.ts | 28 +++++----- ts/WoltLabSuite/Core/Ui/User/Ignore/List.ts | 4 +- .../Core/Ui/User/Menu/Data/Notification.ts | 6 +-- ts/WoltLabSuite/Core/Ui/User/Menu/View.ts | 6 +-- .../Core/Ui/User/Multifactor/Totp/Qr.ts | 4 +- ts/WoltLabSuite/Core/Ui/User/ObjectWatch.ts | 6 +-- .../Core/Ui/User/PasswordStrength.ts | 6 +-- .../Core/Ui/User/Profile/Menu/Item/Follow.ts | 4 +- .../Core/Ui/User/Profile/Menu/Item/Ignore.ts | 6 +-- .../Core/Ui/User/Session/Delete.ts | 4 +- ts/WoltLabSuite/Core/Upload.ts | 4 +- .../Devtools/Project/AbstractPackageList.js | 19 ++++--- .../Devtools/Project/ExcludedPackages.js | 7 ++- .../Field/Devtools/Project/Instructions.js | 51 +++++++++---------- .../Devtools/Project/OptionalPackages.js | 5 +- .../Devtools/Project/RequiredPackages.js | 5 +- .../WoltLabSuite/Core/Acp/Ui/Article/Add.js | 5 +- .../js/WoltLabSuite/Core/Acp/Ui/Box/Add.js | 5 +- .../js/WoltLabSuite/Core/Acp/Ui/Box/Copy.js | 5 +- .../WoltLabSuite/Core/Acp/Ui/Box/Handler.js | 9 ++-- .../Core/Acp/Ui/DataImport/Manager.js | 11 ++-- .../Ui/Devtools/Missing/Language/Item/List.js | 9 ++-- .../Core/Acp/Ui/Devtools/Notification/Test.js | 5 +- .../Project/Installation/Confirmation.js | 5 +- .../Acp/Ui/Devtools/Project/Pip/Entry/List.js | 9 ++-- .../Acp/Ui/Devtools/Project/QuickSetup.js | 7 ++- .../Core/Acp/Ui/Devtools/Project/Sync.js | 11 ++-- .../Core/Acp/Ui/Maintenance/RebuildData.js | 5 +- .../Core/Acp/Ui/Option/EmailSmtpTest.js | 17 +++---- .../Core/Acp/Ui/Option/RewriteGenerator.js | 9 ++-- .../Core/Acp/Ui/Option/RewriteTest.js | 7 ++- .../Acp/Ui/Package/PrepareInstallation.js | 9 ++-- .../Core/Acp/Ui/Package/QuickInstallation.js | 11 ++-- .../Core/Acp/Ui/Package/Update/Manager.js | 13 +++-- .../js/WoltLabSuite/Core/Acp/Ui/Page/Add.js | 5 +- .../WoltLabSuite/Core/Acp/Ui/Page/BoxOrder.js | 7 ++- .../js/WoltLabSuite/Core/Acp/Ui/Page/Copy.js | 5 +- .../WoltLabSuite/Core/Acp/Ui/Trophy/Upload.js | 5 +- .../Acp/Ui/User/Action/Handler/Ban/Dialog.js | 17 +++---- .../Ui/User/Action/Handler/SendNewPassword.js | 7 ++- .../Acp/Ui/User/Content/Remove/Clipboard.js | 7 ++- .../Acp/Ui/User/Content/Remove/Handler.js | 7 ++- .../WoltLabSuite/Core/Acp/Ui/User/Editor.js | 7 ++- .../js/WoltLabSuite/Core/Acp/Ui/Worker.js | 5 +- .../files/js/WoltLabSuite/Core/Ajax/Error.js | 9 ++-- .../js/WoltLabSuite/Core/Ajax/Request.js | 7 ++- .../Core/Component/Confirmation/Custom.js | 9 ++-- .../Core/Component/Dialog/Controls.js | 9 ++-- .../WoltLabSuite/Core/Controller/Clipboard.js | 5 +- .../Core/Controller/Map/Route/Planner.js | 21 ++++---- .../Controller/User/Notification/Settings.js | 7 ++- .../files/js/WoltLabSuite/Core/Date/Picker.js | 37 +++++++------- .../files/js/WoltLabSuite/Core/Date/Util.js | 11 ++-- .../Element/woltlab-core-dialog-control.js | 7 ++- .../Core/Element/woltlab-core-dialog.js | 5 +- .../Form/Builder/Field/Controller/Label.js | 7 ++- .../js/WoltLabSuite/Core/Language/Chooser.js | 7 ++- .../js/WoltLabSuite/Core/Language/Input.js | 7 ++- .../js/WoltLabSuite/Core/Media/Editor.js | 11 ++-- .../WoltLabSuite/Core/Media/Manager/Base.js | 17 +++---- .../WoltLabSuite/Core/Media/Manager/Editor.js | 17 +++---- .../WoltLabSuite/Core/Media/Manager/Search.js | 5 +- .../WoltLabSuite/Core/Media/Manager/Select.js | 9 ++-- .../js/WoltLabSuite/Core/Media/Replace.js | 7 ++- .../js/WoltLabSuite/Core/Media/Upload.js | 13 +++-- .../js/WoltLabSuite/Core/Ui/Acl/Simple.js | 9 ++-- .../js/WoltLabSuite/Core/Ui/Alignment.js | 5 +- .../js/WoltLabSuite/Core/Ui/Article/Search.js | 13 +++-- .../js/WoltLabSuite/Core/Ui/Color/Picker.js | 25 +++++---- .../js/WoltLabSuite/Core/Ui/Confirmation.js | 9 ++-- .../files/js/WoltLabSuite/Core/Ui/Dialog.js | 7 ++- .../js/WoltLabSuite/Core/Ui/Feed/Dialog.js | 17 +++---- .../js/WoltLabSuite/Core/Ui/File/Delete.js | 7 ++- .../js/WoltLabSuite/Core/Ui/File/Upload.js | 7 ++- .../files/js/WoltLabSuite/Core/Ui/ItemList.js | 5 +- .../WoltLabSuite/Core/Ui/ItemList/Filter.js | 13 +++-- .../Ui/ItemList/LineBreakSeparatedText.js | 19 ++++--- .../WoltLabSuite/Core/Ui/ItemList/Static.js | 5 +- .../Core/Ui/Message/InlineEditor.js | 5 +- .../WoltLabSuite/Core/Ui/Message/Manager.js | 5 +- .../js/WoltLabSuite/Core/Ui/Message/Reply.js | 13 +++-- .../files/js/WoltLabSuite/Core/Ui/Mobile.js | 5 +- .../js/WoltLabSuite/Core/Ui/Object/Action.js | 5 +- .../Core/Ui/Object/Action/Toggle.js | 7 ++- .../js/WoltLabSuite/Core/Ui/Page/Action.js | 5 +- .../WoltLabSuite/Core/Ui/Page/Header/Menu.js | 7 ++- .../js/WoltLabSuite/Core/Ui/Page/JumpTo.js | 11 ++-- .../js/WoltLabSuite/Core/Ui/Page/Menu/Main.js | 7 ++- .../js/WoltLabSuite/Core/Ui/Page/Menu/User.js | 5 +- .../js/WoltLabSuite/Core/Ui/Page/Search.js | 13 +++-- .../Core/Ui/Page/Search/Handler.js | 13 +++-- .../files/js/WoltLabSuite/Core/Ui/Password.js | 9 ++-- .../js/WoltLabSuite/Core/Ui/Poll/Editor.js | 13 +++-- .../Core/Ui/User/Activity/Recent.js | 9 ++-- .../js/WoltLabSuite/Core/Ui/User/Editor.js | 29 +++++------ .../WoltLabSuite/Core/Ui/User/Ignore/List.js | 5 +- .../Core/Ui/User/Menu/Data/Notification.js | 7 ++- .../js/WoltLabSuite/Core/Ui/User/Menu/View.js | 7 ++- .../Core/Ui/User/Multifactor/Totp/Qr.js | 5 +- .../WoltLabSuite/Core/Ui/User/ObjectWatch.js | 7 ++- .../Core/Ui/User/PasswordStrength.js | 7 ++- .../Core/Ui/User/Profile/Menu/Item/Follow.js | 5 +- .../Core/Ui/User/Profile/Menu/Item/Ignore.js | 7 ++- .../Core/Ui/User/Session/Delete.js | 5 +- .../files/js/WoltLabSuite/Core/Upload.js | 5 +- 188 files changed, 806 insertions(+), 900 deletions(-) diff --git a/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/AbstractPackageList.ts b/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/AbstractPackageList.ts index d013d2e3f6c..23e2b22ef16 100644 --- a/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/AbstractPackageList.ts +++ b/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/AbstractPackageList.ts @@ -7,7 +7,7 @@ * @since 5.2 */ -import * as Language from "../../../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as DomTraverse from "../../../../../../Dom/Traverse"; import DomChangeListener from "../../../../../../Dom/Change/Listener"; import DomUtil from "../../../../../../Dom/Util"; @@ -91,7 +91,7 @@ abstract class AbstractPackageList this.removePackage(ev)); listItem.insertAdjacentElement("afterbegin", deleteButton); @@ -178,7 +178,7 @@ abstract class AbstractPackageList 191) { DomUtil.innerError( this.packageIdentifier, - Language.get("wcf.acp.devtools.project.packageIdentifier.error.maximumLength"), + getPhrase("wcf.acp.devtools.project.packageIdentifier.error.maximumLength"), ); return false; @@ -202,7 +202,7 @@ abstract class AbstractPackageList 255) { - DomUtil.innerError(versionElement, Language.get("wcf.acp.devtools.project.packageVersion.error.maximumLength")); + DomUtil.innerError(versionElement, getPhrase("wcf.acp.devtools.project.packageVersion.error.maximumLength")); return false; } if (!AbstractPackageList.versionRegExp.test(version)) { - DomUtil.innerError(versionElement, Language.get("wcf.acp.devtools.project.packageVersion.error.format")); + DomUtil.innerError(versionElement, getPhrase("wcf.acp.devtools.project.packageVersion.error.format")); return false; } diff --git a/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/ExcludedPackages.ts b/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/ExcludedPackages.ts index 73de19b9fc6..1dac18ba50f 100644 --- a/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/ExcludedPackages.ts +++ b/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/ExcludedPackages.ts @@ -10,7 +10,7 @@ import AbstractPackageList from "./AbstractPackageList"; import * as Core from "../../../../../../Core"; -import * as Language from "../../../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import { ExcludedPackageData } from "./Data"; import DomUtil from "../../../../../../Dom/Util"; @@ -56,7 +56,7 @@ class ExcludedPackages< listItem.dataset.version = packageData.version; - listItem.innerHTML = ` ${Language.get("wcf.acp.devtools.project.excludedPackage.excludedPackage", { + listItem.innerHTML = ` ${getPhrase("wcf.acp.devtools.project.excludedPackage.excludedPackage", { packageIdentifier: packageData.packageIdentifier, version: packageData.version, })}`; @@ -70,7 +70,7 @@ class ExcludedPackages< const version = versionElement.value; if (version === "") { - DomUtil.innerError(versionElement, Language.get("wcf.global.form.error.empty")); + DomUtil.innerError(versionElement, getPhrase("wcf.global.form.error.empty")); return false; } else if (version !== "*") { diff --git a/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/Instructions.ts b/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/Instructions.ts index 5dfabfcbaa8..fa50923af9c 100644 --- a/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/Instructions.ts +++ b/ts/WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/Instructions.ts @@ -9,7 +9,7 @@ import * as Core from "../../../../../../Core"; import Template from "../../../../../../Template"; -import * as Language from "../../../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as DomTraverse from "../../../../../../Dom/Traverse"; import DomChangeListener from "../../../../../../Dom/Change/Listener"; import DomUtil from "../../../../../../Dom/Util"; @@ -167,7 +167,7 @@ class Instructions { runStandaloneField.checked = false; applicationField.value = ""; document.getElementById(`${this.formFieldId}_instructions${instructionsId}_valueDescription`)!.innerHTML = - Language.get("wcf.acp.devtools.project.instruction.value.description"); + getPhrase("wcf.acp.devtools.project.instruction.value.description"); this.toggleApplicationFormField(instructionsId); DomChangeListener.trigger(); @@ -195,7 +195,7 @@ class Instructions { let content = `
- ${Language.get("wcf.acp.devtools.project.instruction.instruction", instructionData)} + ${getPhrase("wcf.acp.devtools.project.instruction.instruction", instructionData)} `; if (instructionData.errors) { @@ -209,12 +209,12 @@ class Instructions { `; @@ -114,7 +114,7 @@ export class AcpUiDataImportManager implements AjaxCallbackObject { id: DomUtil.getUniqueId(), options: { closable: false, - title: Language.get("wcf.acp.dataImport"), + title: getPhrase("wcf.acp.dataImport"), }, source: null, }; diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Missing/Language/Item/List.ts b/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Missing/Language/Item/List.ts index 06cacf9749e..8a8a770eaa5 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Missing/Language/Item/List.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Missing/Language/Item/List.ts @@ -8,7 +8,7 @@ import { AjaxCallbackObject, AjaxCallbackSetup } from "../../../../../../Ajax/Data"; import * as UiConfirmation from "../../../../../../Ui/Confirmation"; import * as Ajax from "../../../../../../Ajax"; -import * as Language from "../../../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import { dialogFactory } from "../../../../../../Component/Dialog"; export class List implements AjaxCallbackObject { @@ -46,7 +46,7 @@ export class List implements AjaxCallbackObject { actionName: "clearLog", }); }, - message: Language.get("wcf.acp.devtools.missingLanguageItem.clearLog.confirmMessage"), + message: getPhrase("wcf.acp.devtools.missingLanguageItem.clearLog.confirmMessage"), }); } @@ -57,7 +57,7 @@ export class List implements AjaxCallbackObject { actionName: "clearExistingLog", }); }, - message: Language.get("wcf.acp.devtools.missingLanguageItem.clearExistingLog.confirmMessage"), + message: getPhrase("wcf.acp.devtools.missingLanguageItem.clearExistingLog.confirmMessage"), }); } @@ -65,7 +65,7 @@ export class List implements AjaxCallbackObject { const target = event.currentTarget as HTMLElement; const dialog = dialogFactory().fromHtml(target.dataset.stackTrace!).withoutControls(); - dialog.show(Language.get("wcf.acp.devtools.missingLanguageItem.stackTrace")); + dialog.show(getPhrase("wcf.acp.devtools.missingLanguageItem.stackTrace")); } } diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Notification/Test.ts b/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Notification/Test.ts index 2c0f8eaaa28..7e27786839a 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Notification/Test.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Notification/Test.ts @@ -7,7 +7,7 @@ */ import * as Ajax from "../../../../Ajax"; -import * as Language from "../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiDialog from "../../../../Ui/Dialog"; import { AjaxCallbackObject, AjaxCallbackSetup } from "../../../../Ajax/Data"; import { DialogCallbackObject, DialogCallbackSetup } from "../../../../Ui/Dialog/Data"; @@ -79,7 +79,7 @@ class AcpUiDevtoolsNotificationTest implements AjaxCallbackObject, DialogCallbac // restore buttons this.buttons.forEach((button) => { - button.innerHTML = Language.get("wcf.acp.devtools.notificationTest.button.test"); + button.innerHTML = getPhrase("wcf.acp.devtools.notificationTest.button.test"); button.disabled = false; }); } diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Installation/Confirmation.ts b/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Installation/Confirmation.ts index 187da0f8997..068fde41503 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Installation/Confirmation.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Installation/Confirmation.ts @@ -7,7 +7,7 @@ */ import * as Ajax from "../../../../../Ajax"; -import * as Language from "../../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as UiConfirmation from "../../../../../Ui/Confirmation"; let _projectId: number; @@ -45,7 +45,7 @@ function showConfirmation(event: Event): void { UiConfirmation.show({ confirm: () => installPackage(), - message: Language.get("wcf.acp.devtools.project.installPackage.confirmMessage", { + message: getPhrase("wcf.acp.devtools.project.installPackage.confirmMessage", { packageIdentifier: _projectName, }), messageIsHtml: true, diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Pip/Entry/List.ts b/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Pip/Entry/List.ts index a7332ade954..abb62c0bbfe 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Pip/Entry/List.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Pip/Entry/List.ts @@ -7,7 +7,7 @@ */ import * as Ajax from "../../../../../../Ajax"; -import * as Language from "../../../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import { ConfirmationCallbackParameters, show as showConfirmation } from "../../../../../../Ui/Confirmation"; import { AjaxCallbackSetup } from "../../../../../../Ajax/Data"; import { showDefaultSuccessSnackbar } from "WoltLabSuite/Core/Component/Snackbar"; @@ -93,18 +93,18 @@ class DevtoolsProjectPipEntryList {
- ${Language.get("wcf.acp.devtools.project.pip.entry.delete.addDeleteInstruction.description")} + ${getPhrase("wcf.acp.devtools.project.pip.entry.delete.addDeleteInstruction.description")}
`; } showConfirmation({ confirm: (parameters, content) => this.deletePipEntry(parameters, content), - message: Language.get("wcf.acp.devtools.project.pip.entry.delete.confirmMessage"), + message: getPhrase("wcf.acp.devtools.project.pip.entry.delete.confirmMessage"), template, parameters: { pipEntry: pipEntry, diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/QuickSetup.ts b/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/QuickSetup.ts index 663675f5b75..c7d116b3d49 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/QuickSetup.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/QuickSetup.ts @@ -8,7 +8,7 @@ import * as Ajax from "../../../../Ajax"; import DomUtil from "../../../../Dom/Util"; -import * as Language from "../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiDialog from "../../../../Ui/Dialog"; import { AjaxCallbackObject, AjaxCallbackSetup } from "../../../../Ajax/Data"; import { DialogCallbackObject, DialogCallbackSetup } from "../../../../Ui/Dialog/Data"; @@ -79,7 +79,7 @@ class AcpUiDevtoolsProjectQuickSetup implements AjaxCallbackObject, DialogCallba id: "projectQuickSetup", options: { onShow: () => this.onDialogShow(), - title: Language.get("wcf.acp.devtools.project.quickSetup"), + title: getPhrase("wcf.acp.devtools.project.quickSetup"), }, }; } @@ -122,7 +122,7 @@ class AcpUiDevtoolsProjectQuickSetup implements AjaxCallbackObject, DialogCallba // check if path is empty if (this.pathInput.value === "") { - DomUtil.innerError(this.pathInput, Language.get("wcf.global.form.error.empty")); + DomUtil.innerError(this.pathInput, getPhrase("wcf.global.form.error.empty")); return; } diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Sync.ts b/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Sync.ts index 36bdc3cfd39..6ed57e4544d 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Sync.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Sync.ts @@ -1,5 +1,5 @@ import * as Ajax from "../../../../Ajax"; -import * as Language from "../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import { AjaxCallbackSetup, AjaxResponseException } from "../../../../Ajax/Data"; import { DialogCallbackSetup } from "../../../../Ui/Dialog/Data"; import { dialogFactory } from "../../../../Component/Dialog"; @@ -232,7 +232,7 @@ class AcpUiDevtoolsProjectSync { this.buttons.get(identifier)!.disabled = false; const buttonStatus = this.buttonStatus.get(identifier)!; - buttonStatus.innerHTML = '' + Language.get("wcf.acp.devtools.sync.status.failure") + ""; + buttonStatus.innerHTML = '' + getPhrase("wcf.acp.devtools.sync.status.failure") + ""; buttonStatus.children[0].addEventListener("click", (event) => { event.preventDefault(); @@ -241,11 +241,11 @@ class AcpUiDevtoolsProjectSync { const dialog = dialogFactory() .fromHtml(`
${html.outerHTML}
`) .asAlert(); - dialog.show(Language.get("wcf.global.error.title")); + dialog.show(getPhrase("wcf.global.error.title")); dialog.querySelector("dialog")!.classList.add("dialog--iframe"); } else if (html) { const dialog = dialogFactory().fromHtml(html).asAlert(); - dialog.show(Language.get("wcf.global.error.title")); + dialog.show(getPhrase("wcf.global.error.title")); } }); @@ -270,7 +270,7 @@ class AcpUiDevtoolsProjectSync { return { id: "devtoolsProjectSyncPipError", options: { - title: Language.get("wcf.global.error.title"), + title: getPhrase("wcf.global.error.title"), }, source: null, }; diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Maintenance/RebuildData.ts b/ts/WoltLabSuite/Core/Acp/Ui/Maintenance/RebuildData.ts index 1dda10b60c5..a72bd2f057c 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Maintenance/RebuildData.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Maintenance/RebuildData.ts @@ -7,7 +7,7 @@ */ import Worker from "../Worker"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; const workers = new Map(); @@ -59,7 +59,7 @@ async function runWorker( } span = document.createElement("span"); - span.innerHTML = ` ${Language.get("wcf.acp.worker.success")}`; + span.innerHTML = ` ${getPhrase("wcf.acp.worker.success")}`; button.parentNode!.insertBefore(span, button.nextElementSibling); resolve(); }, diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Option/EmailSmtpTest.ts b/ts/WoltLabSuite/Core/Acp/Ui/Option/EmailSmtpTest.ts index 4a2d61843d5..b7131c11974 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Option/EmailSmtpTest.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Option/EmailSmtpTest.ts @@ -9,7 +9,7 @@ import * as Ajax from "../../../Ajax"; import { AjaxCallbackObject, AjaxCallbackSetup } from "../../../Ajax/Data"; import DomUtil from "../../../Dom/Util"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; interface AjaxResponse { returnValues: { @@ -39,10 +39,10 @@ class EmailSmtpTest implements AjaxCallbackObject { } this.container = document.createElement("dl"); - this.container.innerHTML = `
${Language.get("wcf.acp.email.smtp.test")}
+ this.container.innerHTML = `
${getPhrase("wcf.acp.email.smtp.test")}
- ${Language.get("wcf.acp.email.smtp.test.run")} - ${Language.get("wcf.acp.email.smtp.test.description")} + ${getPhrase("wcf.acp.email.smtp.test.run")} + ${getPhrase("wcf.acp.email.smtp.test.description")}
`; this.buttonRunTest = this.container.querySelector("a")!; @@ -74,7 +74,7 @@ class EmailSmtpTest implements AjaxCallbackObject { event.preventDefault(); this.buttonRunTest.classList.add("disabled"); - this.buttonRunTest.innerHTML = ` ${Language.get("wcf.global.loading")}`; + this.buttonRunTest.innerHTML = ` ${getPhrase("wcf.global.loading")}`; DomUtil.innerError(this.buttonRunTest, false); @@ -110,7 +110,7 @@ class EmailSmtpTest implements AjaxCallbackObject { _ajaxFailure(data: AjaxResponse): boolean { let result = ""; if (data && data.returnValues && data.returnValues.fieldName) { - result = Language.get(`wcf.acp.email.smtp.test.error.empty.${data.returnValues.fieldName}`); + result = getPhrase(`wcf.acp.email.smtp.test.error.empty.${data.returnValues.fieldName}`); } this.resetButton(false, result); @@ -122,11 +122,11 @@ class EmailSmtpTest implements AjaxCallbackObject { this.buttonRunTest.classList.remove("disabled"); if (success) { - this.buttonRunTest.innerHTML = ` ${Language.get( + this.buttonRunTest.innerHTML = ` ${getPhrase( "wcf.acp.email.smtp.test.run.success", )}`; } else { - this.buttonRunTest.innerHTML = Language.get("wcf.acp.email.smtp.test.run"); + this.buttonRunTest.innerHTML = getPhrase("wcf.acp.email.smtp.test.run"); } if (errorMessage) { diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Option/RewriteGenerator.ts b/ts/WoltLabSuite/Core/Acp/Ui/Option/RewriteGenerator.ts index 80a50f67301..229a4840349 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Option/RewriteGenerator.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Option/RewriteGenerator.ts @@ -9,7 +9,7 @@ import * as Ajax from "../../../Ajax"; import { AjaxCallbackObject, AjaxCallbackSetup, ResponseData } from "../../../Ajax/Data"; import { DialogCallbackObject, DialogCallbackSetup } from "../../../Ui/Dialog/Data"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiDialog from "../../../Ui/Dialog"; class RewriteGenerator implements AjaxCallbackObject, DialogCallbackObject { @@ -35,12 +35,12 @@ class RewriteGenerator implements AjaxCallbackObject, DialogCallbackObject { this.buttonGenerate = document.createElement("a"); this.buttonGenerate.className = "button"; this.buttonGenerate.href = "#"; - this.buttonGenerate.textContent = Language.get("wcf.acp.rewrite.generate"); + this.buttonGenerate.textContent = getPhrase("wcf.acp.rewrite.generate"); this.buttonGenerate.addEventListener("click", (ev) => this._onClick(ev)); dd.appendChild(this.buttonGenerate); const description = document.createElement("small"); - description.textContent = Language.get("wcf.acp.rewrite.description"); + description.textContent = getPhrase("wcf.acp.rewrite.description"); dd.appendChild(description); this.container.appendChild(dt); @@ -64,7 +64,7 @@ class RewriteGenerator implements AjaxCallbackObject, DialogCallbackObject { id: "dialogRewriteRules", source: null, options: { - title: Language.get("wcf.acp.rewrite"), + title: getPhrase("wcf.acp.rewrite"), }, }; } diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Option/RewriteTest.ts b/ts/WoltLabSuite/Core/Acp/Ui/Option/RewriteTest.ts index 65dbe00deea..508c214c42f 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Option/RewriteTest.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Option/RewriteTest.ts @@ -6,7 +6,7 @@ * @license GNU Lesser General Public License */ -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiDialog from "../../../Ui/Dialog"; import { DialogCallbackSetup } from "../../../Ui/Dialog/Data"; import DomUtil from "../../../Dom/Util"; @@ -119,7 +119,7 @@ class RewriteTest { const testFailureResults = document.getElementById("dialogRewriteTestFailureResults")!; testFailureResults.innerHTML = results .map((result) => { - return `
  • ${Language.get( + return `
  • ${getPhrase( "wcf.acp.option.url_omit_index_php.test.status." + (result.pass ? "success" : "failure"), )} ${result.app}
    • `; }) @@ -167,7 +167,7 @@ class RewriteTest { }); }, onShow: () => this.runTest(), - title: Language.get("wcf.acp.option.url_omit_index_php"), + title: getPhrase("wcf.acp.option.url_omit_index_php"), }, }; } diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Package/PrepareInstallation.ts b/ts/WoltLabSuite/Core/Acp/Ui/Package/PrepareInstallation.ts index 6c3ea631c1f..ff858586870 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Package/PrepareInstallation.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Package/PrepareInstallation.ts @@ -10,7 +10,7 @@ import * as Ajax from "../../../Ajax"; import { AjaxCallbackSetup } from "../../../Ajax/Data"; import { DialogCallbackSetup } from "../../../Ui/Dialog/Data"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiDialog from "../../../Ui/Dialog"; import DomUtil from "../../../Dom/Util"; @@ -66,11 +66,11 @@ class AcpUiPackagePrepareInstallation { const username = usernameInput.value.trim(); if (username === "") { - DomUtil.innerError(usernameInput, Language.get("wcf.global.form.error.empty")); + DomUtil.innerError(usernameInput, getPhrase("wcf.global.form.error.empty")); } else { const password = passwordInput.value.trim(); if (password === "") { - DomUtil.innerError(passwordInput, Language.get("wcf.global.form.error.empty")); + DomUtil.innerError(passwordInput, getPhrase("wcf.global.form.error.empty")); } else { const saveCredentials = document.getElementById("packageUpdateServerSaveCredentials") as HTMLInputElement; @@ -124,7 +124,7 @@ class AcpUiPackagePrepareInstallation { this.submit(packageUpdateServerId); }); }, - title: Language.get("wcf.acp.package.update.unauthorized"), + title: getPhrase("wcf.acp.package.update.unauthorized"), }, source: null, }; diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Package/QuickInstallation.ts b/ts/WoltLabSuite/Core/Acp/Ui/Package/QuickInstallation.ts index 6416a4e7415..e284da03b79 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Package/QuickInstallation.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Package/QuickInstallation.ts @@ -10,7 +10,7 @@ import { dboAction } from "../../../Ajax"; import * as AjaxStatus from "../../../Ajax/Status"; import { isPlainObject } from "../../../Core"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import { innerError } from "../../../Dom/Util"; import UiDialog from "../../../Ui/Dialog"; import { StatusNotOk } from "WoltLabSuite/Core/Ajax/Error"; @@ -64,7 +64,7 @@ function detectCode(versionNumber: string): void { if (isValid) { innerError(codeInput, false); } else { - innerError(codeInput, Language.get("wcf.acp.package.quickInstallation.code.error.invalid")); + innerError(codeInput, getPhrase("wcf.acp.package.quickInstallation.code.error.invalid")); } } @@ -110,7 +110,7 @@ async function prepareInstallation(data: InstallationCode, versionNumber: string codeInput.value = ""; innerError( codeInput, - Language.getPhrase("wcf.acp.package.error.incompatibleStoreProduct", { versionNumber }), + getPhrase("wcf.acp.package.error.incompatibleStoreProduct", { versionNumber }), ); return; @@ -127,7 +127,7 @@ async function prepareInstallation(data: InstallationCode, versionNumber: string if (response.queueID === null) { codeInput.value = ""; - innerError(codeInput, Language.get("wcf.acp.package.error.uniqueAlreadyInstalled")); + innerError(codeInput, getPhrase("wcf.acp.package.error.uniqueAlreadyInstalled")); } else { const installation = new window.WCF.ACP.Package.Installation(response.queueID, undefined, false); installation.prepareInstallation(); @@ -139,7 +139,7 @@ async function prepareInstallation(data: InstallationCode, versionNumber: string return { id: "quickInstallationError", options: { - title: Language.get("wcf.global.error.title"), + title: getPhrase("wcf.global.error.title"), }, source: null, }; diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Package/Update/Manager.ts b/ts/WoltLabSuite/Core/Acp/Ui/Package/Update/Manager.ts index 242ca47722d..51665720b03 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Package/Update/Manager.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Package/Update/Manager.ts @@ -9,7 +9,7 @@ import { dboAction } from "../../../../Ajax"; import { DialogCallbackObject, DialogCallbackSetup } from "../../../../Ui/Dialog/Data"; -import * as Language from "../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as UiDialog from "../../../../Ui/Dialog"; import DomUtil from "../../../../Dom/Util"; @@ -137,12 +137,12 @@ class AcpUiPackageUpdateManager implements DialogCallbackObject { private promptCredentials(template: string): void { UiDialog.open(this, template); - UiDialog.setTitle(this, Language.get("wcf.acp.package.update.unauthorized")); + UiDialog.setTitle(this, getPhrase("wcf.acp.package.update.unauthorized")); } private showConflict(template: string): void { UiDialog.open(this, template); - UiDialog.setTitle(this, Language.get("wcf.acp.package.update.excludedPackages")); + UiDialog.setTitle(this, getPhrase("wcf.acp.package.update.excludedPackages")); } private startInstallation(queueId: number): void { @@ -158,7 +158,7 @@ class AcpUiPackageUpdateManager implements DialogCallbackObject { return { id: "acpUiPackageUpdateManager", options: { - title: Language.get("wcf.acp.package.update.title"), + title: getPhrase("wcf.acp.package.update.title"), }, source: null, }; @@ -170,7 +170,7 @@ class AcpUiPackageUpdateManager implements DialogCallbackObject { const usernameField = document.getElementById("packageUpdateServerUsername") as HTMLInputElement; const username = usernameField.value.trim(); if (username === "") { - DomUtil.innerError(usernameField, Language.get("wcf.global.form.error.empty")); + DomUtil.innerError(usernameField, getPhrase("wcf.global.form.error.empty")); isValid = false; } else { DomUtil.innerError(usernameField, false); @@ -179,7 +179,7 @@ class AcpUiPackageUpdateManager implements DialogCallbackObject { const passwordField = document.getElementById("packageUpdateServerPassword") as HTMLInputElement; const password = passwordField.value.trim(); if (password === "") { - DomUtil.innerError(passwordField, Language.get("wcf.global.form.error.empty")); + DomUtil.innerError(passwordField, getPhrase("wcf.global.form.error.empty")); isValid = false; } else { DomUtil.innerError(passwordField, false); diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Page/Add.ts b/ts/WoltLabSuite/Core/Acp/Ui/Page/Add.ts index f5481c17558..921b0da387b 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Page/Add.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Page/Add.ts @@ -6,7 +6,7 @@ * @license GNU Lesser General Public License */ -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import WoltlabCoreDialogElement from "../../../Element/woltlab-core-dialog"; import { dialogFactory } from "../../../Component/Dialog"; @@ -32,7 +32,7 @@ export class AcpUiPageAdd { this.#dialog = this.#createDialog(); } - this.#dialog.show(Language.get("wcf.acp.page.add")); + this.#dialog.show(getPhrase("wcf.acp.page.add")); } #createDialog(): WoltlabCoreDialogElement { diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Page/BoxOrder.ts b/ts/WoltLabSuite/Core/Acp/Ui/Page/BoxOrder.ts index 536895f9cec..042771df972 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Page/BoxOrder.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Page/BoxOrder.ts @@ -8,7 +8,7 @@ import * as Ajax from "../../../Ajax"; import DomChangeListener from "../../../Dom/Change/Listener"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as UiConfirmation from "../../../Ui/Confirmation"; import { AjaxCallbackSetup } from "../../../Ajax/Data"; import { showDefaultSuccessSnackbar } from "WoltLabSuite/Core/Component/Snackbar"; @@ -42,7 +42,7 @@ class AcpUiPageBoxOrder { let icon = ""; if (box.isDisabled) { - icon = ` + icon = ` `; } @@ -114,7 +114,7 @@ class AcpUiPageBoxOrder { actionName: "resetPosition", }); }, - message: Language.get("wcf.acp.page.boxOrder.discard.confirmMessage"), + message: getPhrase("wcf.acp.page.boxOrder.discard.confirmMessage"), }); } diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Page/Copy.ts b/ts/WoltLabSuite/Core/Acp/Ui/Page/Copy.ts index 7e256119c7a..bbb2f17bbcb 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Page/Copy.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Page/Copy.ts @@ -1,5 +1,5 @@ import { DialogCallbackObject, DialogCallbackSetup } from "../../../Ui/Dialog/Data"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiDialog from "../../../Ui/Dialog"; class AcpUiPageCopy implements DialogCallbackObject { @@ -19,7 +19,7 @@ class AcpUiPageCopy implements DialogCallbackObject { return { id: "acpPageCopyDialog", options: { - title: Language.get("wcf.acp.page.copy"), + title: getPhrase("wcf.acp.page.copy"), }, }; } diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Trophy/Upload.ts b/ts/WoltLabSuite/Core/Acp/Ui/Trophy/Upload.ts index f1918aaac7f..2d33ef798a0 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Trophy/Upload.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Trophy/Upload.ts @@ -9,7 +9,7 @@ import { showDefaultSuccessSnackbar } from "WoltLabSuite/Core/Component/Snackbar"; import * as Core from "../../../Core"; import DomUtil from "../../../Dom/Util"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import Upload from "../../../Upload"; import { UploadOptions } from "../../../Upload/Data"; @@ -61,7 +61,7 @@ class TrophyUpload extends Upload { } protected _failure(uploadId: number, data: AjaxResponseError): boolean { - DomUtil.innerError(this._button, Language.get(`wcf.acp.trophy.imageUpload.error.${data.returnValues.errorType}`)); + DomUtil.innerError(this._button, getPhrase(`wcf.acp.trophy.imageUpload.error.${data.returnValues.errorType}`)); // remove previous images this._target.innerHTML = ""; diff --git a/ts/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Ban/Dialog.ts b/ts/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Ban/Dialog.ts index d31ef6b3770..10946cdc918 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Ban/Dialog.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Ban/Dialog.ts @@ -9,7 +9,7 @@ import UiDialog from "../../../../../../Ui/Dialog"; import { DialogCallbackSetup } from "../../../../../../Ui/Dialog/Data"; -import * as Language from "../../../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as Ajax from "../../../../../../Ajax"; import DatePicker from "../../../../../../Date/Picker"; @@ -101,15 +101,15 @@ export class BanDialog { } }); }, - title: Language.get("wcf.acp.user.ban.sure"), + title: getPhrase("wcf.acp.user.ban.sure"), }, source: `
    -
    +
    - ${Language.get("wcf.acp.user.banReason.description")} + ${getPhrase("wcf.acp.user.banReason.description")}
    @@ -117,13 +117,13 @@ export class BanDialog {
    -
    `, diff --git a/ts/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/SendNewPassword.ts b/ts/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/SendNewPassword.ts index 5e12314c017..b288c77dc55 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/SendNewPassword.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/SendNewPassword.ts @@ -7,7 +7,7 @@ * @since 5.5 */ -import * as Language from "../../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as UiConfirmation from "../../../../../Ui/Confirmation"; import AcpUiWorker from "../../../Worker"; @@ -35,7 +35,7 @@ export class SendNewPassword { confirm: () => { new AcpUiWorker({ dialogId: "sendingNewPasswords", - dialogTitle: Language.get("wcf.acp.user.sendNewPassword.workerTitle"), + dialogTitle: getPhrase("wcf.acp.user.sendNewPassword.workerTitle"), className: "wcf\\system\\worker\\SendNewPasswordWorker", parameters: { userIDs: this.userIDs, @@ -43,7 +43,7 @@ export class SendNewPassword { callbackSuccess: this.successCallback, }); }, - message: Language.get("wcf.acp.user.action.sendNewPassword.confirmMessage"), + message: getPhrase("wcf.acp.user.action.sendNewPassword.confirmMessage"), }); } } diff --git a/ts/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Clipboard.ts b/ts/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Clipboard.ts index 5a09b829811..1f02d3969c1 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Clipboard.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Clipboard.ts @@ -9,7 +9,7 @@ import AcpUiWorker from "../../../Worker"; import * as Ajax from "../../../../../Ajax"; -import * as Language from "../../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiDialog from "../../../../../Ui/Dialog"; import { AjaxCallbackSetup } from "../../../../../Ajax/Data"; import { DialogCallbackSetup } from "../../../../../Ui/Dialog/Data"; @@ -58,7 +58,7 @@ export class AcpUserContentRemoveClipboard { new AcpUiWorker({ // dialog dialogId: "removeContentWorker", - dialogTitle: Language.get("wcf.acp.content.removeContent"), + dialogTitle: getPhrase("wcf.acp.content.removeContent"), // ajax className: "wcf\\system\\worker\\UserContentRemoveWorker", @@ -115,7 +115,7 @@ export class AcpUserContentRemoveClipboard { return { id: this.dialogId, options: { - title: Language.get("wcf.acp.content.removeContent"), + title: getPhrase("wcf.acp.content.removeContent"), }, source: null, }; diff --git a/ts/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Handler.ts b/ts/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Handler.ts index 34396d5556e..ebdc312936a 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Handler.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Handler.ts @@ -9,7 +9,7 @@ import AcpUiWorker from "../../../Worker"; import * as Ajax from "../../../../../Ajax"; -import * as Language from "../../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiDialog from "../../../../../Ui/Dialog"; import { AjaxCallbackSetup } from "../../../../../Ajax/Data"; import { DialogCallbackSetup } from "../../../../../Ui/Dialog/Data"; @@ -62,7 +62,7 @@ class AcpUserContentRemoveHandler { new AcpUiWorker({ // dialog dialogId: "removeContentWorker", - dialogTitle: Language.get("wcf.acp.content.removeContent"), + dialogTitle: getPhrase("wcf.acp.content.removeContent"), // ajax className: "\\wcf\\system\\worker\\UserContentRemoveWorker", @@ -120,7 +120,7 @@ class AcpUserContentRemoveHandler { return { id: this.dialogId, options: { - title: Language.get("wcf.acp.content.removeContent"), + title: getPhrase("wcf.acp.content.removeContent"), }, source: null, }; diff --git a/ts/WoltLabSuite/Core/Acp/Ui/User/Editor.ts b/ts/WoltLabSuite/Core/Acp/Ui/User/Editor.ts index b2d0b73cb09..b8626cbdf0f 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/User/Editor.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/User/Editor.ts @@ -9,7 +9,7 @@ import AcpUserContentRemoveHandler from "./Content/Remove/Handler"; import * as Core from "../../../Core"; import * as EventHandler from "../../../Event/Handler"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiDropdownSimple from "../../../Ui/Dropdown/Simple"; import DomUtil from "../../../Dom/Util"; import SendNewPasswordAction from "./Action/SendNewPasswordAction"; @@ -157,7 +157,7 @@ class AcpUiUserEditor { iconBanned = document.createElement("span"); iconBanned.innerHTML = ''; iconBanned.classList.add("jsUserStatusBanned", "jsTooltip"); - iconBanned.title = Language.get("wcf.user.status.banned"); + iconBanned.title = getPhrase("wcf.user.status.banned"); userStatusIcons.appendChild(iconBanned); } else if (!banned && iconBanned !== null) { @@ -170,7 +170,7 @@ class AcpUiUserEditor { iconIsDisabled = document.createElement("span"); iconIsDisabled.innerHTML = ''; iconIsDisabled.classList.add("jsUserStatusIsDisabled", "jsTooltip"); - iconIsDisabled.title = Language.get("wcf.user.status.isDisabled"); + iconIsDisabled.title = getPhrase("wcf.user.status.isDisabled"); userStatusIcons.appendChild(iconIsDisabled); } else if (!isDisabled && iconIsDisabled !== null) { iconIsDisabled.remove(); diff --git a/ts/WoltLabSuite/Core/Acp/Ui/Worker.ts b/ts/WoltLabSuite/Core/Acp/Ui/Worker.ts index a04f47a1920..db7c21c2012 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/Worker.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/Worker.ts @@ -8,7 +8,7 @@ import * as Ajax from "../../Ajax"; import * as Core from "../../Core"; -import * as Language from "../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiDialog from "../../Ui/Dialog"; import { AjaxCallbackObject, AjaxCallbackSetup } from "../../Ajax/Data"; import { DialogCallbackObject, DialogCallbackSetup } from "../../Ui/Dialog/Data"; @@ -113,7 +113,7 @@ class AcpUiWorker implements AjaxCallbackObject, DialogCallbackObject { const formSubmit = document.createElement("div"); formSubmit.className = "formSubmit"; formSubmit.innerHTML = - '"; + '"; content.appendChild(formSubmit); UiDialog.rebuild(this); diff --git a/ts/WoltLabSuite/Core/Ajax/Error.ts b/ts/WoltLabSuite/Core/Ajax/Error.ts index 54376d4bdab..ce187f0ba1f 100644 --- a/ts/WoltLabSuite/Core/Ajax/Error.ts +++ b/ts/WoltLabSuite/Core/Ajax/Error.ts @@ -9,7 +9,7 @@ import { dialogFactory } from "../Component/Dialog"; import * as Core from "../Core"; -import * as Language from "../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import { escapeHTML } from "../StringUtil"; type ErrorResponsePrevious = { @@ -34,11 +34,11 @@ async function genericError(error: ApiError): Promise { const html = await getErrorHtml(error); if (html instanceof HTMLIFrameElement) { const dialog = dialogFactory().fromHtml(`
    ${html.outerHTML}
    `).asAlert(); - dialog.show(Language.get("wcf.global.error.title")); + dialog.show(getPhrase("wcf.global.error.title")); dialog.querySelector("dialog")!.classList.add("dialog--iframe"); } else if (html !== "") { const dialog = dialogFactory().fromHtml(html).asAlert(); - dialog.show(Language.get("wcf.global.error.title")); + dialog.show(getPhrase("wcf.global.error.title")); } } @@ -49,7 +49,7 @@ async function getErrorHtml(error: ApiError): Promise${html.outerHTML}
    `) .asAlert(); - dialog.show(Language.get("wcf.global.error.title")); + dialog.show(getPhrase("wcf.global.error.title")); dialog.querySelector("dialog")!.classList.add("dialog--iframe"); } else if (html) { const dialog = dialogFactory().fromHtml(html).asAlert(); - dialog.show(Language.get("wcf.global.error.title")); + dialog.show(getPhrase("wcf.global.error.title")); } } diff --git a/ts/WoltLabSuite/Core/Component/Confirmation/Custom.ts b/ts/WoltLabSuite/Core/Component/Confirmation/Custom.ts index c789913195a..0e03b872af5 100644 --- a/ts/WoltLabSuite/Core/Component/Confirmation/Custom.ts +++ b/ts/WoltLabSuite/Core/Component/Confirmation/Custom.ts @@ -9,7 +9,7 @@ */ import { dialogFactory } from "../Dialog"; -import * as Language from "../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import WoltlabCoreDialogElement from "../../Element/woltlab-core-dialog"; type CallbackWithFormElements = (dialog: WoltlabCoreDialogElement) => void; @@ -35,7 +35,7 @@ export class ConfirmationCustom { const dialog = dialogFactory() .fromHtml(`

    ${message}

    `) .asConfirmation({ - primary: Language.get("wcf.dialog.button.primary.confirm"), + primary: getPhrase("wcf.dialog.button.primary.confirm"), }); dialog.show(this.#question); @@ -50,7 +50,7 @@ export class ConfirmationCustom { const dialog = dialogFactory() .withoutContent() .asConfirmation({ - primary: Language.get("wcf.dialog.button.primary.confirm"), + primary: getPhrase("wcf.dialog.button.primary.confirm"), }); callback(dialog); @@ -78,7 +78,7 @@ export class ConfirmationCustom { const dialog = dialogFactory() .withoutContent() .asConfirmation({ - primary: Language.get("wcf.dialog.button.primary.confirm"), + primary: getPhrase("wcf.dialog.button.primary.confirm"), }); dialog.show(this.#question); diff --git a/ts/WoltLabSuite/Core/Component/Dialog/Controls.ts b/ts/WoltLabSuite/Core/Component/Dialog/Controls.ts index a65a019cd7b..b70a13a99fc 100644 --- a/ts/WoltLabSuite/Core/Component/Dialog/Controls.ts +++ b/ts/WoltLabSuite/Core/Component/Dialog/Controls.ts @@ -9,7 +9,7 @@ */ import WoltlabCoreDialogElement, { WoltlabCoreDialogControlOptions } from "../../Element/woltlab-core-dialog"; -import * as Language from "../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; type AlertOptions = { primary: string; @@ -36,7 +36,7 @@ export class DialogControls { cancel: undefined, extra: undefined, isAlert: true, - primary: options?.primary || Language.get("wcf.dialog.button.primary"), + primary: options?.primary || getPhrase("wcf.dialog.button.primary"), }; this.#dialog.attachControls(formControlOptions); @@ -49,7 +49,7 @@ export class DialogControls { cancel: "", extra: undefined, isAlert: true, - primary: options?.primary || Language.get("wcf.dialog.button.primary.confirm"), + primary: options?.primary || getPhrase("wcf.dialog.button.primary.confirm"), }; this.#dialog.attachControls(formControlOptions); @@ -62,7 +62,7 @@ export class DialogControls { cancel: "", extra: options?.extra, isAlert: false, - primary: options?.primary || Language.get("wcf.dialog.button.primary.submit"), + primary: options?.primary || getPhrase("wcf.dialog.button.primary.submit"), }; this.#dialog.attachControls(formControlOptions); diff --git a/ts/WoltLabSuite/Core/Controller/Clipboard.ts b/ts/WoltLabSuite/Core/Controller/Clipboard.ts index f01d37f832d..e2c2d81b650 100644 --- a/ts/WoltLabSuite/Core/Controller/Clipboard.ts +++ b/ts/WoltLabSuite/Core/Controller/Clipboard.ts @@ -13,7 +13,7 @@ import * as Core from "../Core"; import DomChangeListener from "../Dom/Change/Listener"; import DomUtil from "../Dom/Util"; import * as EventHandler from "../Event/Handler"; -import * as Language from "../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as UiConfirmation from "../Ui/Confirmation"; import UiDropdownSimple from "../Ui/Dropdown/Simple"; import * as UiPageAction from "../Ui/Page/Action"; @@ -484,7 +484,7 @@ class ControllerClipboard { const unmarkAll = document.createElement("li"); unmarkAll.dataset.type = typeName; const label = document.createElement("span"); - label.textContent = Language.get("wcf.clipboard.item.unmarkAll"); + label.textContent = getPhrase("wcf.clipboard.item.unmarkAll"); unmarkAll.appendChild(label); unmarkAll.addEventListener("click", (ev) => this.unmarkAll(ev)); dropdown.appendChild(unmarkAll); diff --git a/ts/WoltLabSuite/Core/Controller/Map/Route/Planner.ts b/ts/WoltLabSuite/Core/Controller/Map/Route/Planner.ts index 9593ec9fa50..34b5f3c53cf 100644 --- a/ts/WoltLabSuite/Core/Controller/Map/Route/Planner.ts +++ b/ts/WoltLabSuite/Core/Controller/Map/Route/Planner.ts @@ -10,7 +10,7 @@ import * as AjaxStatus from "../../../Ajax/Status"; import DomUtil from "../../../Dom/Util"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiDialog from "../../../Ui/Dialog"; import { DialogCallbackObject, DialogCallbackSetup } from "../../../Ui/Dialog/Data"; @@ -165,7 +165,7 @@ class ControllerMapRoutePlanner implements DialogCallbackObject { status = google.maps.DirectionsStatus.NOT_FOUND; } - DomUtil.innerError(this.originInput!, Language.get(`wcf.map.route.error.${status.toLowerCase()}`)); + DomUtil.innerError(this.originInput!, getPhrase(`wcf.map.route.error.${status.toLowerCase()}`)); } } @@ -186,7 +186,7 @@ class ControllerMapRoutePlanner implements DialogCallbackObject { id: this.button.id + "Dialog", options: { onShow: this.initDialog.bind(this), - title: Language.get("wcf.map.route.planner"), + title: getPhrase("wcf.map.route.planner"), }, source: ` -
    -
    ${Language.get("wcf.map.route.origin")}
    +
    ${getPhrase("wcf.map.route.origin")}
    -
    ${Language.get("wcf.map.route.travelMode")}
    +
    ${getPhrase("wcf.map.route.travelMode")}
    `, diff --git a/ts/WoltLabSuite/Core/Controller/User/Notification/Settings.ts b/ts/WoltLabSuite/Core/Controller/User/Notification/Settings.ts index e7307c9cd3e..f3f1001d9b1 100644 --- a/ts/WoltLabSuite/Core/Controller/User/Notification/Settings.ts +++ b/ts/WoltLabSuite/Core/Controller/User/Notification/Settings.ts @@ -7,7 +7,7 @@ * @woltlabExcludeBundle tiny */ -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as UiDropdownReusable from "../../../Ui/Dropdown/Reusable"; let _dropDownMenu: HTMLUListElement; @@ -56,7 +56,7 @@ function createDropDown(): void { } else { const link = document.createElement("a"); link.href = "#"; - link.textContent = Language.get(`wcf.user.notification.mailNotificationType.${value}`); + link.textContent = getPhrase(`wcf.user.notification.mailNotificationType.${value}`); listItem.appendChild(link); listItem.dataset.value = value; listItem.addEventListener("click", (ev) => setEmailType(ev)); @@ -94,7 +94,7 @@ function setEmailType(event: Event): void { const button = document.querySelector( `.notificationSettingsEmailType[data-object-id="${_objectId}"]`, ) as HTMLLIElement; - button.title = Language.get(`wcf.user.notification.mailNotificationType.${value}`); + button.title = getPhrase(`wcf.user.notification.mailNotificationType.${value}`); const icon = button.querySelector(".jsIconNotificationSettingsEmailType fa-icon") as FaIcon; switch (value) { diff --git a/ts/WoltLabSuite/Core/Date/Picker.ts b/ts/WoltLabSuite/Core/Date/Picker.ts index 2bc14e37a2f..ef0647a4149 100644 --- a/ts/WoltLabSuite/Core/Date/Picker.ts +++ b/ts/WoltLabSuite/Core/Date/Picker.ts @@ -9,7 +9,7 @@ import * as Core from "../Core"; import * as DateUtil from "./Util"; import * as EventHandler from "../Event/Handler"; -import * as Language from "../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as UiAlignment from "../Ui/Alignment"; import UiCloseOverlay from "../Ui/CloseOverlay"; import DomUtil from "../Dom/Util"; @@ -58,8 +58,8 @@ function createPicker() { _dateMonthPrevious = document.createElement("button"); _dateMonthPrevious.type = "button"; _dateMonthPrevious.className = "previous jsTooltip"; - _dateMonthPrevious.title = Language.get("wcf.date.datePicker.previousMonth"); - _dateMonthPrevious.setAttribute("aria-label", Language.get("wcf.date.datePicker.previousMonth")); + _dateMonthPrevious.title = getPhrase("wcf.date.datePicker.previousMonth"); + _dateMonthPrevious.setAttribute("aria-label", getPhrase("wcf.date.datePicker.previousMonth")); _dateMonthPrevious.innerHTML = ''; _dateMonthPrevious.addEventListener("click", () => DatePicker.previousMonth()); header.appendChild(_dateMonthPrevious); @@ -69,8 +69,8 @@ function createPicker() { _dateMonth = document.createElement("select"); _dateMonth.className = "month jsTooltip"; - _dateMonth.title = Language.get("wcf.date.datePicker.month"); - _dateMonth.setAttribute("aria-label", Language.get("wcf.date.datePicker.month")); + _dateMonth.title = getPhrase("wcf.date.datePicker.month"); + _dateMonth.setAttribute("aria-label", getPhrase("wcf.date.datePicker.month")); _dateMonth.addEventListener("change", changeMonth); monthYearContainer.appendChild(_dateMonth); @@ -84,16 +84,16 @@ function createPicker() { _dateYear = document.createElement("select"); _dateYear.className = "year jsTooltip"; - _dateYear.title = Language.get("wcf.date.datePicker.year"); - _dateYear.setAttribute("aria-label", Language.get("wcf.date.datePicker.year")); + _dateYear.title = getPhrase("wcf.date.datePicker.year"); + _dateYear.setAttribute("aria-label", getPhrase("wcf.date.datePicker.year")); _dateYear.addEventListener("change", changeYear); monthYearContainer.appendChild(_dateYear); _dateMonthNext = document.createElement("button"); _dateMonthNext.type = "button"; _dateMonthNext.className = "next jsTooltip"; - _dateMonthNext.title = Language.get("wcf.date.datePicker.nextMonth"); - _dateMonthNext.setAttribute("aria-label", Language.get("wcf.date.datePicker.nextMonth")); + _dateMonthNext.title = getPhrase("wcf.date.datePicker.nextMonth"); + _dateMonthNext.setAttribute("aria-label", getPhrase("wcf.date.datePicker.nextMonth")); _dateMonthNext.innerHTML = ''; _dateMonthNext.addEventListener("click", () => DatePicker.nextMonth()); header.appendChild(_dateMonthNext); @@ -140,8 +140,8 @@ function createPicker() { _dateHour = document.createElement("select"); _dateHour.className = "hour"; - _dateHour.title = Language.get("wcf.date.datePicker.hour"); - _dateHour.setAttribute("aria-label", Language.get("wcf.date.datePicker.hour")); + _dateHour.title = getPhrase("wcf.date.datePicker.hour"); + _dateHour.setAttribute("aria-label", getPhrase("wcf.date.datePicker.hour")); _dateHour.addEventListener("change", formatValue); const date = new Date(2000, 0, 1); @@ -175,8 +175,8 @@ function createPicker() { _dateMinute = document.createElement("select"); _dateMinute.className = "minute"; - _dateMinute.title = Language.get("wcf.date.datePicker.minute"); - _dateMinute.setAttribute("aria-label", Language.get("wcf.date.datePicker.minute")); + _dateMinute.title = getPhrase("wcf.date.datePicker.minute"); + _dateMinute.setAttribute("aria-label", getPhrase("wcf.date.datePicker.minute")); _dateMinute.addEventListener("change", formatValue); tmp = ""; @@ -658,7 +658,7 @@ const DatePicker = { } _didInit = true; - _firstDayOfWeek = parseInt(Language.get("wcf.date.firstDayOfTheWeek"), 10); + _firstDayOfWeek = parseInt(getPhrase("wcf.date.firstDayOfTheWeek"), 10); wheneverSeen( `input[type="date"]:not(.inputDatePicker), input[type="datetime"]:not(.inputDatePicker)`, @@ -797,9 +797,9 @@ const DatePicker = { openButton.type = "button"; openButton.className = "inputSuffix button jsTooltip"; if (isTimeOnly) { - openButton.title = Language.getPhrase("wcf.date.datePicker.time"); + openButton.title = getPhrase("wcf.date.datePicker.time"); } else { - openButton.title = Language.getPhrase("wcf.date.datePicker"); + openButton.title = getPhrase("wcf.date.datePicker"); } openButton.setAttribute("aria-haspopup", "true"); openButton.setAttribute("aria-expanded", "false"); @@ -827,9 +827,9 @@ const DatePicker = { clearButton.type = "button"; clearButton.className = "inputSuffix button jsTooltip"; if (isTimeOnly) { - clearButton.title = Language.getPhrase("wcf.date.datePicker.time.clear"); + clearButton.title = getPhrase("wcf.date.datePicker.time.clear"); } else { - clearButton.title = Language.getPhrase("wcf.date.datePicker.clear"); + clearButton.title = getPhrase("wcf.date.datePicker.clear"); } clearButton.addEventListener("click", () => { if (!element.disabled) { diff --git a/ts/WoltLabSuite/Core/Date/Util.ts b/ts/WoltLabSuite/Core/Date/Util.ts index 4ed39a5d3c9..2dd06fac111 100644 --- a/ts/WoltLabSuite/Core/Date/Util.ts +++ b/ts/WoltLabSuite/Core/Date/Util.ts @@ -6,7 +6,7 @@ * @license GNU Lesser General Public License */ -import * as Language from "../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; const locale = document.documentElement.lang; const dateFormatter = new Intl.DateTimeFormat(locale, { dateStyle: "long" }); @@ -127,11 +127,11 @@ export function format(date: Date, format: string): string { break; case "l": // `Monday` through `Sunday` (localized) - char = (Language.get("__days") as any as string[])[date.getDay()]; + char = (getPhrase("__days") as any as string[])[date.getDay()]; break; case "D": // `Mon` through `Sun` (localized) - char = (Language.get("__daysShort") as any as string[])[date.getDay()]; + char = (getPhrase("__daysShort") as any as string[])[date.getDay()]; break; case "S": // ignore english ordinal suffix @@ -149,11 +149,11 @@ export function format(date: Date, format: string): string { break; case "F": // `January` through `December` (localized) - char = (Language.get("__months") as any as string[])[date.getMonth()]; + char = (getPhrase("__months") as any as string[])[date.getMonth()]; break; case "M": // `Jan` through `Dec` (localized) - char = (Language.get("__monthsShort") as any as string[])[date.getMonth()]; + char = (getPhrase("__monthsShort") as any as string[])[date.getMonth()]; break; // year diff --git a/ts/WoltLabSuite/Core/Element/woltlab-core-dialog-control.ts b/ts/WoltLabSuite/Core/Element/woltlab-core-dialog-control.ts index 092bfbf38b7..61940c38abf 100644 --- a/ts/WoltLabSuite/Core/Element/woltlab-core-dialog-control.ts +++ b/ts/WoltLabSuite/Core/Element/woltlab-core-dialog-control.ts @@ -11,7 +11,7 @@ * @since 6.0 */ -import * as Language from "../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; interface WoltlabCoreDialogControlEventMap { cancel: CustomEvent; @@ -40,7 +40,7 @@ export class WoltlabCoreDialogControlElement extends HTMLElement { get primary(): string { let label = this.getAttribute("primary")!; if (!label) { - label = Language.get("wcf.dialog.button.primary"); + label = getPhrase("wcf.dialog.button.primary"); } return label; @@ -61,7 +61,7 @@ export class WoltlabCoreDialogControlElement extends HTMLElement { } if (label === "") { - label = Language.get("wcf.global.confirmation.cancel"); + label = getPhrase("wcf.global.confirmation.cancel"); } return label; diff --git a/ts/WoltLabSuite/Core/Element/woltlab-core-dialog.ts b/ts/WoltLabSuite/Core/Element/woltlab-core-dialog.ts index 942d9e034d9..4af84dc1d4c 100644 --- a/ts/WoltLabSuite/Core/Element/woltlab-core-dialog.ts +++ b/ts/WoltLabSuite/Core/Element/woltlab-core-dialog.ts @@ -13,7 +13,7 @@ import { tabbable } from "tabbable"; import DomUtil from "../Dom/Util"; import { adoptPageOverlayContainer, releasePageOverlayContainer } from "../Helper/PageOverlay"; -import * as Language from "../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import { scrollDisable, scrollEnable } from "../Ui/Screen"; type ValidateCallback = Promise; @@ -265,7 +265,7 @@ export class WoltlabCoreDialogElement extends HTMLElement { closeButton.type = "button"; closeButton.innerHTML = ''; closeButton.classList.add("dialog__closeButton", "jsTooltip"); - closeButton.title = Language.get("wcf.dialog.button.close"); + closeButton.title = getPhrase("wcf.dialog.button.close"); closeButton.addEventListener("click", () => { if (this.#shouldClose()) { const evt = new CustomEvent("cancel", { cancelable: false }); diff --git a/ts/WoltLabSuite/Core/Form/Builder/Field/Controller/Label.ts b/ts/WoltLabSuite/Core/Form/Builder/Field/Controller/Label.ts index 17ae26ab315..6fd6646bcee 100644 --- a/ts/WoltLabSuite/Core/Form/Builder/Field/Controller/Label.ts +++ b/ts/WoltLabSuite/Core/Form/Builder/Field/Controller/Label.ts @@ -9,7 +9,7 @@ import * as Core from "../../../../Core"; import * as DomUtil from "../../../../Dom/Util"; -import * as Language from "../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiDropdownSimple from "../../../../Ui/Dropdown/Simple"; import { LabelFormFieldOptions } from "../../Data"; @@ -67,7 +67,7 @@ class Label { const label = document.createElement("span"); label.classList.add("badge", "label"); - label.innerHTML = Language.get("wcf.label.withoutSelection"); + label.innerHTML = getPhrase("wcf.label.withoutSelection"); span.appendChild(label); } @@ -82,7 +82,7 @@ class Label { const label = document.createElement("span"); label.classList.add("badge", "label"); - label.innerHTML = Language.get("wcf.label.none"); + label.innerHTML = getPhrase("wcf.label.none"); span.appendChild(label); } diff --git a/ts/WoltLabSuite/Core/Language/Chooser.ts b/ts/WoltLabSuite/Core/Language/Chooser.ts index 612b20cf9f1..bed9725b4da 100644 --- a/ts/WoltLabSuite/Core/Language/Chooser.ts +++ b/ts/WoltLabSuite/Core/Language/Chooser.ts @@ -7,7 +7,7 @@ */ import * as Core from "../Core"; -import * as Language from "../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import DomUtil from "../Dom/Util"; import UiDropdownSimple from "../Ui/Dropdown/Simple"; @@ -141,7 +141,7 @@ function initElement( dropdownMenu.appendChild(listItem); const link = document.createElement("a"); - link.textContent = Language.get("wcf.global.language.noSelection"); + link.textContent = getPhrase("wcf.global.language.noSelection"); listItem.appendChild(link); if (languageId === 0) { @@ -162,7 +162,7 @@ function initElement( div.appendChild(icon); const span = document.createElement("span"); - span.textContent = Language.get("wcf.global.language.noSelection"); + span.textContent = getPhrase("wcf.global.language.noSelection"); span.append(icon); div.appendChild(span); } diff --git a/ts/WoltLabSuite/Core/Language/Input.ts b/ts/WoltLabSuite/Core/Language/Input.ts index 0c73d3896cb..5685352dc66 100644 --- a/ts/WoltLabSuite/Core/Language/Input.ts +++ b/ts/WoltLabSuite/Core/Language/Input.ts @@ -7,7 +7,7 @@ */ import DomUtil from "../Dom/Util"; -import * as Language from "../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import { NotificationAction } from "../Ui/Dropdown/Data"; import UiDropdownSimple from "../Ui/Dropdown/Simple"; import * as StringUtil from "../StringUtil"; @@ -79,7 +79,7 @@ function initElement( button.className = "button dropdownToggle inputPrefix"; const buttonLabel = document.createElement("span"); - buttonLabel.textContent = Language.get("wcf.global.button.disabledI18n"); + buttonLabel.textContent = getPhrase("wcf.global.button.disabledI18n"); button.appendChild(buttonLabel); container.insertBefore(button, element); @@ -134,7 +134,7 @@ function initElement( listItem.addEventListener("click", callbackClick); const span = document.createElement("span"); - span.textContent = Language.get("wcf.global.button.disabledI18n"); + span.textContent = getPhrase("wcf.global.button.disabledI18n"); listItem.appendChild(span); dropdownMenu.appendChild(listItem); diff --git a/ts/WoltLabSuite/Core/Media/Editor.ts b/ts/WoltLabSuite/Core/Media/Editor.ts index 6918070fdc1..6bd9437c3c0 100644 --- a/ts/WoltLabSuite/Core/Media/Editor.ts +++ b/ts/WoltLabSuite/Core/Media/Editor.ts @@ -16,7 +16,7 @@ import * as LanguageInput from "../Language/Input"; import * as DomUtil from "../Dom/Util"; import * as DomTraverse from "../Dom/Traverse"; import DomChangeListener from "../Dom/Change/Listener"; -import * as Language from "../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as Ajax from "../Ajax"; import MediaReplace from "./Replace"; import { I18nValues } from "../Language/Input"; @@ -234,19 +234,19 @@ class MediaEditor implements AjaxCallbackObject { if (altText && !LanguageInput.validate(altText.id, true)) { hasError = true; if (!altTextError) { - DomUtil.innerError(altText, Language.get("wcf.global.form.error.multilingual")); + DomUtil.innerError(altText, getPhrase("wcf.global.form.error.multilingual")); } } if (caption && !LanguageInput.validate(caption.id, true)) { hasError = true; if (!captionError) { - DomUtil.innerError(caption, Language.get("wcf.global.form.error.multilingual")); + DomUtil.innerError(caption, getPhrase("wcf.global.form.error.multilingual")); } } if (!LanguageInput.validate(title.id, true)) { hasError = true; if (!titleError) { - DomUtil.innerError(title, Language.get("wcf.global.form.error.multilingual")); + DomUtil.innerError(title, getPhrase("wcf.global.form.error.multilingual")); } } @@ -379,7 +379,7 @@ class MediaEditor implements AjaxCallbackObject { options: { backdropCloseOnClick: false, onClose: () => this._close(), - title: Language.get("wcf.media.edit"), + title: getPhrase("wcf.media.edit"), }, source: { after: (content: HTMLElement, responseData: InitEditorData) => this._initEditor(content, responseData), diff --git a/ts/WoltLabSuite/Core/Media/Manager/Base.ts b/ts/WoltLabSuite/Core/Media/Manager/Base.ts index e78bb11a774..3ad95020853 100644 --- a/ts/WoltLabSuite/Core/Media/Manager/Base.ts +++ b/ts/WoltLabSuite/Core/Media/Manager/Base.ts @@ -9,7 +9,7 @@ import * as Core from "../../Core"; import { Media, MediaManagerOptions, MediaEditorCallbackObject, MediaUploadSuccessEventData } from "../Data"; -import * as Language from "../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as Permission from "../../Permission"; import * as DomChangeListener from "../../Dom/Change/Listener"; import * as EventHandler from "../../Event/Handler"; @@ -61,7 +61,7 @@ abstract class MediaManager) { this._options = Core.extend( { - dialogTitle: Language.get("wcf.media.manager"), + dialogTitle: getPhrase("wcf.media.manager"), imagesOnly: false, minSearchLength: 3, }, @@ -351,7 +351,7 @@ abstract class MediaManager + - + `; const deleteButton = document.createElement("li"); @@ -534,16 +534,16 @@ abstract class MediaManager + - + `; } } diff --git a/ts/WoltLabSuite/Core/Media/Manager/Editor.ts b/ts/WoltLabSuite/Core/Media/Manager/Editor.ts index 91b3f49c839..949b7b339b2 100644 --- a/ts/WoltLabSuite/Core/Media/Manager/Editor.ts +++ b/ts/WoltLabSuite/Core/Media/Manager/Editor.ts @@ -12,7 +12,7 @@ import * as Core from "../../Core"; import { Media, MediaInsertType, MediaManagerEditorOptions, MediaUploadSuccessEventData } from "../Data"; import * as EventHandler from "../../Event/Handler"; import * as DomTraverse from "../../Dom/Traverse"; -import * as Language from "../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as UiDialog from "../../Ui/Dialog"; import * as Clipboard from "../../Controller/Clipboard"; import DomUtil from "../../Dom/Util"; @@ -93,15 +93,15 @@ export class MediaManagerEditor extends MediaManager '"; }); - thumbnailOptions += '"; + thumbnailOptions += '"; const dialog = `
    -
    ${Language.get("wcf.media.insert.imageSize")}
    +
    ${getPhrase("wcf.media.insert.imageSize")}
    `; @@ -136,8 +136,8 @@ class UiAclSimple { const aclListContainerDt = document.getElementById(this.prefix + "aclListContainerDt"); const aclSearchInputLabel = document.getElementById(this.prefix + "aclSearchInputLabel"); - aclListContainerDt!.textContent = Language.get(invert ? "wcf.acl.access.denied" : "wcf.acl.access.granted"); - aclSearchInputLabel!.textContent = Language.get(invert ? "wcf.acl.access.deny" : "wcf.acl.access.grant"); + aclListContainerDt!.textContent = getPhrase(invert ? "wcf.acl.access.denied" : "wcf.acl.access.granted"); + aclSearchInputLabel!.textContent = getPhrase(invert ? "wcf.acl.access.deny" : "wcf.acl.access.grant"); } } diff --git a/ts/WoltLabSuite/Core/Ui/Alignment.ts b/ts/WoltLabSuite/Core/Ui/Alignment.ts index 8e52674a701..51edec0da50 100644 --- a/ts/WoltLabSuite/Core/Ui/Alignment.ts +++ b/ts/WoltLabSuite/Core/Ui/Alignment.ts @@ -9,7 +9,7 @@ import * as Core from "../Core"; import * as DomTraverse from "../Dom/Traverse"; import DomUtil from "../Dom/Util"; -import * as Language from "../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as Environment from "../Environment"; type HorizontalAlignment = "center" | "left" | "right"; @@ -233,7 +233,7 @@ export function set(element: HTMLElement, referenceElement: HTMLElement, options } // in rtl languages we simply swap the value for 'horizontal' - if (Language.get("wcf.global.pageDirection") === "rtl") { + if (getPhrase("wcf.global.pageDirection") === "rtl") { options.horizontal = options.horizontal === "left" ? "right" : "left"; } diff --git a/ts/WoltLabSuite/Core/Ui/Article/Search.ts b/ts/WoltLabSuite/Core/Ui/Article/Search.ts index bae7d9e9cc0..2eec96681d1 100644 --- a/ts/WoltLabSuite/Core/Ui/Article/Search.ts +++ b/ts/WoltLabSuite/Core/Ui/Article/Search.ts @@ -6,7 +6,7 @@ import * as Ajax from "../../Ajax"; import { AjaxCallbackObject, AjaxCallbackSetup, DatabaseObjectActionResponse } from "../../Ajax/Data"; import { DialogCallbackObject, DialogCallbackSetup } from "../Dialog/Data"; import DomUtil from "../../Dom/Util"; -import * as Language from "../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as StringUtil from "../../StringUtil"; import UiDialog from "../Dialog"; @@ -41,7 +41,7 @@ class UiArticleSearch implements AjaxCallbackObject, DialogCallbackObject { const value = this.searchInput!.value.trim(); if (value.length < 3) { - DomUtil.innerError(inputContainer, Language.get("wcf.article.search.error.tooShort")); + DomUtil.innerError(inputContainer, getPhrase("wcf.article.search.error.tooShort")); return; } else { DomUtil.innerError(inputContainer, false); @@ -89,7 +89,7 @@ class UiArticleSearch implements AjaxCallbackObject, DialogCallbackObject { }); } else { const parent = this.searchInput!.parentElement!; - DomUtil.innerError(parent, Language.get("wcf.article.search.error.noResults")); + DomUtil.innerError(parent, getPhrase("wcf.article.search.error.noResults")); } } @@ -123,12 +123,12 @@ class UiArticleSearch implements AjaxCallbackObject, DialogCallbackObject { onShow: () => { this.searchInput!.focus(); }, - title: Language.get("wcf.article.search"), + title: getPhrase("wcf.article.search"), }, source: `
    - +
    @@ -140,7 +140,7 @@ class UiArticleSearch implements AjaxCallbackObject, DialogCallbackObject {
    `, diff --git a/ts/WoltLabSuite/Core/Ui/Color/Picker.ts b/ts/WoltLabSuite/Core/Ui/Color/Picker.ts index 1e9d596f270..96991049a6b 100644 --- a/ts/WoltLabSuite/Core/Ui/Color/Picker.ts +++ b/ts/WoltLabSuite/Core/Ui/Color/Picker.ts @@ -12,7 +12,7 @@ import * as Core from "../../Core"; import UiDialog from "../Dialog"; import { DialogCallbackObject, DialogCallbackSetup } from "../Dialog/Data"; import DomUtil from "../../Dom/Util"; -import * as Language from "../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as ColorUtil from "../../ColorUtil"; type CallbackSubmit = (data: ColorUtil.RGBA) => void; @@ -88,19 +88,19 @@ class UiColorPicker implements DialogCallbackObject {
    -
    ${Language.get("wcf.style.colorPicker.hue")}
    +
    ${getPhrase("wcf.style.colorPicker.hue")}
    -
    ${Language.get("wcf.style.colorPicker.saturation")}
    +
    ${getPhrase("wcf.style.colorPicker.saturation")}
    -
    ${Language.get("wcf.style.colorPicker.lightness")}
    +
    ${getPhrase("wcf.style.colorPicker.lightness")}
    @@ -109,7 +109,7 @@ class UiColorPicker implements DialogCallbackObject {
    -
    ${Language.get("wcf.style.colorPicker.opacity")}
    +
    ${getPhrase("wcf.style.colorPicker.opacity")}
    @@ -118,7 +118,7 @@ class UiColorPicker implements DialogCallbackObject {
    -
    ${Language.get("wcf.style.colorPicker.color")}
    +
    ${getPhrase("wcf.style.colorPicker.color")}
    rgba( @@ -130,7 +130,7 @@ class UiColorPicker implements DialogCallbackObject {
    -
    ${Language.get("wcf.style.colorPicker.hexAlpha")}
    +
    ${getPhrase("wcf.style.colorPicker.hexAlpha")}
    # @@ -140,18 +140,18 @@ class UiColorPicker implements DialogCallbackObject {
    - ${Language.get("wcf.style.colorPicker.new")} + ${getPhrase("wcf.style.colorPicker.new")}
    - ${Language.get("wcf.style.colorPicker.current")} + ${getPhrase("wcf.style.colorPicker.current")}
    -
    @@ -204,7 +204,7 @@ class UiColorPicker implements DialogCallbackObject { this.colorTextInput!.focus(); this.colorTextInput!.select(); }, - title: Language.get("wcf.style.colorPicker"), + title: getPhrase("wcf.style.colorPicker"), }, }; } @@ -250,7 +250,7 @@ class UiColorPicker implements DialogCallbackObject { if (ColorUtil.isValidColor(`#${color}`)) { color = `#${color}`; } else { - DomUtil.innerError(colorTextInput, Language.get("wcf.style.colorPicker.error.invalidColor")); + DomUtil.innerError(colorTextInput, getPhrase("wcf.style.colorPicker.error.invalidColor")); return; } } diff --git a/ts/WoltLabSuite/Core/Ui/Confirmation.ts b/ts/WoltLabSuite/Core/Ui/Confirmation.ts index 6534a5594f3..b279e16fec4 100644 --- a/ts/WoltLabSuite/Core/Ui/Confirmation.ts +++ b/ts/WoltLabSuite/Core/Ui/Confirmation.ts @@ -8,7 +8,7 @@ */ import * as Core from "../Core"; -import * as Language from "../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiDialog from "./Dialog"; import { DialogCallbackObject, DialogCallbackSetup } from "./Dialog/Data"; @@ -44,13 +44,13 @@ class UiConfirmation implements DialogCallbackObject { this.confirmButton.type = "button"; this.confirmButton.dataset.type = "submit"; this.confirmButton.classList.add("button", "buttonPrimary"); - this.confirmButton.textContent = Language.get("wcf.global.confirmation.confirm"); + this.confirmButton.textContent = getPhrase("wcf.global.confirmation.confirm"); formSubmit.appendChild(this.confirmButton); const cancelButton = document.createElement("button"); cancelButton.type = "button"; cancelButton.classList.add("button"); - cancelButton.textContent = Language.get("wcf.global.confirmation.cancel"); + cancelButton.textContent = getPhrase("wcf.global.confirmation.cancel"); cancelButton.addEventListener("click", () => { UiDialog.close(this); }); @@ -136,7 +136,7 @@ class UiConfirmation implements DialogCallbackObject { options: { onClose: this._onClose.bind(this), onShow: this._onShow.bind(this), - title: Language.get("wcf.global.confirmation.title"), + title: getPhrase("wcf.global.confirmation.title"), }, }; } diff --git a/ts/WoltLabSuite/Core/Ui/Dialog.ts b/ts/WoltLabSuite/Core/Ui/Dialog.ts index 25149cc7eca..bfe94b19c9f 100644 --- a/ts/WoltLabSuite/Core/Ui/Dialog.ts +++ b/ts/WoltLabSuite/Core/Ui/Dialog.ts @@ -19,7 +19,7 @@ import { DialogHtml, AjaxInitialization, } from "./Dialog/Data"; -import * as Language from "../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as Environment from "../Environment"; import * as EventHandler from "../Event/Handler"; import { AjaxCallbackSetup } from "../Ajax/Data"; @@ -265,7 +265,7 @@ const UiDialog = { { backdropCloseOnClick: true, closable: true, - closeButtonLabel: Language.get("wcf.global.button.close"), + closeButtonLabel: getPhrase("wcf.global.button.close"), closeConfirmMessage: "", disableContentPadding: false, title: "", @@ -712,7 +712,7 @@ const UiDialog = { data!.inputFields.forEach((inputField) => { if (inputField.required) { if (inputField.value.trim() === "") { - DomUtil.innerError(inputField, Language.get("wcf.global.form.error.empty")); + DomUtil.innerError(inputField, getPhrase("wcf.global.form.error.empty")); inputField.closest("dl")?.classList.add("formError"); isValid = false; diff --git a/ts/WoltLabSuite/Core/Ui/Feed/Dialog.ts b/ts/WoltLabSuite/Core/Ui/Feed/Dialog.ts index 4fe858aad22..799abd4c4bc 100644 --- a/ts/WoltLabSuite/Core/Ui/Feed/Dialog.ts +++ b/ts/WoltLabSuite/Core/Ui/Feed/Dialog.ts @@ -8,7 +8,7 @@ import UiDialog from "../Dialog"; import * as StringUtil from "../../StringUtil"; -import * as Language from "../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as Clipboard from "../../Clipboard"; import { showSuccessSnackbar } from "WoltLabSuite/Core/Component/Snackbar"; @@ -23,7 +23,7 @@ async function copy(event: Event): Promise { await Clipboard.copyTextToClipboard(input.value); - showSuccessSnackbar(Language.get("wcf.global.rss.copy.success")); + showSuccessSnackbar(getPhrase("wcf.global.rss.copy.success")); } /** @@ -42,13 +42,13 @@ function openDialog(event: Event): void { let withoutAccessToken = ""; if (!window.FORCE_LOGIN) { withoutAccessToken = ` -${Language.get("wcf.global.rss.accessToken.info")} +${getPhrase("wcf.global.rss.accessToken.info")}
    -
    ${Language.get("wcf.global.rss.withoutAccessToken")}
    +
    ${getPhrase("wcf.global.rss.withoutAccessToken")}
    - `; diff --git a/ts/WoltLabSuite/Core/Ui/Object/Action.ts b/ts/WoltLabSuite/Core/Ui/Object/Action.ts index d930a56d5a0..2d9b97b1a0e 100644 --- a/ts/WoltLabSuite/Core/Ui/Object/Action.ts +++ b/ts/WoltLabSuite/Core/Ui/Object/Action.ts @@ -10,7 +10,7 @@ import * as Ajax from "../../Ajax"; import * as EventHandler from "../../Event/Handler"; import { DatabaseObjectActionResponse, ResponseData } from "../../Ajax/Data"; import * as UiConfirmation from "../Confirmation"; -import * as Language from "../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as StringUtil from "../../StringUtil"; import DomChangeListener from "../../Dom/Change/Listener"; @@ -75,7 +75,7 @@ function executeAction(event: Event): void { if (actionElement.dataset.confirmMessage) { UiConfirmation.show({ confirm: sendRequest, - message: Language.get(actionElement.dataset.confirmMessage), + message: getPhrase(actionElement.dataset.confirmMessage), messageIsHtml: true, }); } else { diff --git a/ts/WoltLabSuite/Core/Ui/Object/Action/Toggle.ts b/ts/WoltLabSuite/Core/Ui/Object/Action/Toggle.ts index d4446a7def4..2cf77286989 100644 --- a/ts/WoltLabSuite/Core/Ui/Object/Action/Toggle.ts +++ b/ts/WoltLabSuite/Core/Ui/Object/Action/Toggle.ts @@ -6,7 +6,7 @@ * @license GNU Lesser General Public License */ -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiObjectActionHandler from "./Handler"; import { ObjectActionData } from "../Data"; @@ -22,12 +22,12 @@ function toggleObject(data: ObjectActionData): void { if (icon.name === "square") { icon.setIcon("square-check"); - const newTitle = actionElement.dataset.disableTitle || Language.get("wcf.global.button.disable"); + const newTitle = actionElement.dataset.disableTitle || getPhrase("wcf.global.button.disable"); actionElement.title = newTitle; } else { icon.setIcon("square"); - const newTitle = actionElement.dataset.enableTitle || Language.get("wcf.global.button.enable"); + const newTitle = actionElement.dataset.enableTitle || getPhrase("wcf.global.button.enable"); actionElement.title = newTitle; } } diff --git a/ts/WoltLabSuite/Core/Ui/Page/Action.ts b/ts/WoltLabSuite/Core/Ui/Page/Action.ts index cf75907d5ef..f6d778c57db 100644 --- a/ts/WoltLabSuite/Core/Ui/Page/Action.ts +++ b/ts/WoltLabSuite/Core/Ui/Page/Action.ts @@ -7,7 +7,7 @@ */ import * as Core from "../../Core"; -import * as Language from "../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as UiScreen from "../../Ui/Screen"; const _buttons = new Map(); @@ -27,7 +27,7 @@ function buildToTopButton(): HTMLButtonElement { const button = document.createElement("button"); button.type = "button"; button.classList.add("button", "buttonPrimary", "pageActionButtonToTop", "initiallyHidden", "jsTooltip"); - button.title = Language.get("wcf.global.scrollUp"); + button.title = getPhrase("wcf.global.scrollUp"); button.setAttribute("aria-hidden", "true"); button.innerHTML = ''; diff --git a/ts/WoltLabSuite/Core/Ui/Page/Header/Menu.ts b/ts/WoltLabSuite/Core/Ui/Page/Header/Menu.ts index c990d64e06c..1afaeeeed34 100644 --- a/ts/WoltLabSuite/Core/Ui/Page/Header/Menu.ts +++ b/ts/WoltLabSuite/Core/Ui/Page/Header/Menu.ts @@ -7,7 +7,7 @@ */ import * as Environment from "../../../Environment"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as UiScreen from "../../Screen"; let _enabled = false; @@ -186,7 +186,7 @@ function setupA11y(): void { const showMenuButton = document.createElement("button"); showMenuButton.type = "button"; showMenuButton.className = "visuallyHidden"; - showMenuButton.setAttribute("aria-label", Language.get("wcf.global.button.showMenu")); + showMenuButton.setAttribute("aria-label", getPhrase("wcf.global.button.showMenu")); element.insertBefore(showMenuButton, link.nextSibling); let showMenu = false; @@ -195,7 +195,7 @@ function setupA11y(): void { link.setAttribute("aria-expanded", showMenu ? "true" : "false"); showMenuButton.setAttribute( "aria-label", - Language.get(showMenu ? "wcf.global.button.hideMenu" : "wcf.global.button.showMenu"), + getPhrase(showMenu ? "wcf.global.button.hideMenu" : "wcf.global.button.showMenu"), ); }); }); diff --git a/ts/WoltLabSuite/Core/Ui/Page/JumpTo.ts b/ts/WoltLabSuite/Core/Ui/Page/JumpTo.ts index 2a03d68d563..26a0817b36c 100644 --- a/ts/WoltLabSuite/Core/Ui/Page/JumpTo.ts +++ b/ts/WoltLabSuite/Core/Ui/Page/JumpTo.ts @@ -7,7 +7,7 @@ */ import { DialogCallbackObject, DialogCallbackSetup } from "../Dialog/Data"; -import * as Language from "../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiDialog from "../Dialog"; class UiPageJumpTo implements DialogCallbackObject { @@ -59,7 +59,7 @@ class UiPageJumpTo implements DialogCallbackObject { this.input.max = pages; this.input.select(); - this.description.textContent = Language.get("wcf.page.jumpTo.description").replace(/#pages#/, pages); + this.description.textContent = getPhrase("wcf.page.jumpTo.description").replace(/#pages#/, pages); } /** @@ -89,14 +89,14 @@ class UiPageJumpTo implements DialogCallbackObject { _dialogSetup(): ReturnType { const source = `
    -
    +
    - +
    `; return { @@ -111,7 +111,7 @@ class UiPageJumpTo implements DialogCallbackObject { this.submitButton = content.querySelector("button")!; this.submitButton.addEventListener("click", () => this.submit()); }, - title: Language.get("wcf.global.page.pagination"), + title: getPhrase("wcf.global.page.pagination"), }, source: source, }; diff --git a/ts/WoltLabSuite/Core/Ui/Page/Menu/Main.ts b/ts/WoltLabSuite/Core/Ui/Page/Menu/Main.ts index bde5cd24a15..3a38e7b181b 100644 --- a/ts/WoltLabSuite/Core/Ui/Page/Menu/Main.ts +++ b/ts/WoltLabSuite/Core/Ui/Page/Menu/Main.ts @@ -8,7 +8,7 @@ import PageMenuContainer from "./Container"; import { PageMenuProvider } from "./Provider"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import DomUtil from "../../../Dom/Util"; import { MenuItem, PageMenuMainProvider } from "./Main/Provider"; import * as DropDownSimple from "../../Dropdown/Simple"; @@ -189,7 +189,7 @@ export class PageMenuMain implements PageMenuProvider { counter: 0, depth: 0, identifier: "language", - title: Language.get("wcf.user.language"), + title: getPhrase("wcf.user.language"), icon, }, ]; @@ -341,7 +341,7 @@ export class PageMenuMain implements PageMenuProvider { let ariaLabel = menuItem.title; if (menuItem.link) { - ariaLabel = Language.get("wcf.menu.page.button.toggle", { title: menuItem.title }); + ariaLabel = getPhrase("wcf.menu.page.button.toggle", { title: menuItem.title }); } button.setAttribute("aria-label", ariaLabel); diff --git a/ts/WoltLabSuite/Core/Ui/Page/Menu/User.ts b/ts/WoltLabSuite/Core/Ui/Page/Menu/User.ts index e6428516032..2f64bb40e51 100644 --- a/ts/WoltLabSuite/Core/Ui/Page/Menu/User.ts +++ b/ts/WoltLabSuite/Core/Ui/Page/Menu/User.ts @@ -9,7 +9,7 @@ import PageMenuContainer from "./Container"; import { PageMenuProvider } from "./Provider"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import { getUserMenuProviders } from "../../User/Menu/Manager"; import { UserMenuProvider } from "../../User/Menu/Data/Provider"; import DomUtil from "../../../Dom/Util"; @@ -310,7 +310,7 @@ export class PageMenuUser implements PageMenuProvider { const tabList = document.createElement("div"); tabList.classList.add("pageMenuUserTabList"); tabList.setAttribute("role", "tablist"); - tabList.setAttribute("aria-label", Language.get("wcf.menu.user")); + tabList.setAttribute("aria-label", getPhrase("wcf.menu.user")); tabContainer.append(tabList); this.buildControlPanelTab(tabList, tabContainer); diff --git a/ts/WoltLabSuite/Core/Ui/Page/Search.ts b/ts/WoltLabSuite/Core/Ui/Page/Search.ts index 9f28a52b8c2..b3e38388694 100644 --- a/ts/WoltLabSuite/Core/Ui/Page/Search.ts +++ b/ts/WoltLabSuite/Core/Ui/Page/Search.ts @@ -6,7 +6,7 @@ import * as Ajax from "../../Ajax"; import { AjaxCallbackObject, AjaxCallbackSetup, DatabaseObjectActionResponse } from "../../Ajax/Data"; import { DialogCallbackObject, DialogCallbackSetup } from "../Dialog/Data"; import DomUtil from "../../Dom/Util"; -import * as Language from "../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as StringUtil from "../../StringUtil"; import UiDialog from "../Dialog"; @@ -41,7 +41,7 @@ class UiPageSearch implements AjaxCallbackObject, DialogCallbackObject { const value = this.searchInput!.value.trim(); if (value.length < 3) { - DomUtil.innerError(inputContainer, Language.get("wcf.page.search.error.tooShort")); + DomUtil.innerError(inputContainer, getPhrase("wcf.page.search.error.tooShort")); return; } else { DomUtil.innerError(inputContainer, false); @@ -89,7 +89,7 @@ class UiPageSearch implements AjaxCallbackObject, DialogCallbackObject { item.addEventListener("click", (ev) => this.click(ev)); }); } else { - DomUtil.innerError(this.searchInput!.parentElement!, Language.get("wcf.page.search.error.noResults")); + DomUtil.innerError(this.searchInput!.parentElement!, getPhrase("wcf.page.search.error.noResults")); } } @@ -122,11 +122,11 @@ class UiPageSearch implements AjaxCallbackObject, DialogCallbackObject { onShow: () => { this.searchInput!.focus(); }, - title: Language.get("wcf.page.search"), + title: getPhrase("wcf.page.search"), }, source: `
    -
    +
    @@ -137,7 +137,7 @@ class UiPageSearch implements AjaxCallbackObject, DialogCallbackObject {
    `, diff --git a/ts/WoltLabSuite/Core/Ui/Page/Search/Handler.ts b/ts/WoltLabSuite/Core/Ui/Page/Search/Handler.ts index 379447ed16c..6c0d467b22c 100644 --- a/ts/WoltLabSuite/Core/Ui/Page/Search/Handler.ts +++ b/ts/WoltLabSuite/Core/Ui/Page/Search/Handler.ts @@ -8,7 +8,7 @@ * @woltlabExcludeBundle all */ -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as StringUtil from "../../../StringUtil"; import DomUtil from "../../../Dom/Util"; import UiDialog from "../../Dialog"; @@ -47,7 +47,7 @@ class UiPageSearchHandler implements DialogCallbackObject { UiDialog.open(this); UiDialog.setTitle(this, title); - this.searchInputLabel!.textContent = Language.get(labelLanguageItem || "wcf.page.pageObjectID.search.terms"); + this.searchInputLabel!.textContent = getPhrase(labelLanguageItem || "wcf.page.pageObjectID.search.terms"); this._getSearchInputHandler().setPageId(pageId); } @@ -59,7 +59,7 @@ class UiPageSearchHandler implements DialogCallbackObject { this.resetList(); if (!Array.isArray(data.returnValues) || data.returnValues.length === 0) { - DomUtil.innerError(this.searchInput!, Language.get("wcf.page.pageObjectID.search.noResults")); + DomUtil.innerError(this.searchInput!, getPhrase("wcf.page.pageObjectID.search.noResults")); return; } @@ -69,7 +69,7 @@ class UiPageSearchHandler implements DialogCallbackObject { const [iconName, forceSolid] = image; image = ` - `; @@ -161,7 +161,7 @@ class UiPageSearchHandler implements DialogCallbackObject { source: `
    - +
    @@ -170,7 +170,7 @@ class UiPageSearchHandler implements DialogCallbackObject {
    -

    ${Language.get("wcf.page.pageObjectID.search.results")}

    +

    ${getPhrase("wcf.page.pageObjectID.search.results")}

      `, diff --git a/ts/WoltLabSuite/Core/Ui/Password.ts b/ts/WoltLabSuite/Core/Ui/Password.ts index 13096084394..bc62668c00b 100644 --- a/ts/WoltLabSuite/Core/Ui/Password.ts +++ b/ts/WoltLabSuite/Core/Ui/Password.ts @@ -7,7 +7,7 @@ */ import DomChangeListener from "../Dom/Change/Listener"; -import * as Language from "../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; const _knownElements = new WeakSet(); @@ -36,7 +36,7 @@ function initElement(input: HTMLInputElement): void { const button = document.createElement("button"); button.type = "button"; - button.title = Language.get("wcf.global.form.password.button.show"); + button.title = getPhrase("wcf.global.form.password.button.show"); button.classList.add("button", "inputSuffix", "jsTooltip"); inputAddon.appendChild(button); @@ -65,11 +65,11 @@ function initElement(input: HTMLInputElement): void { function toggle(input: HTMLInputElement, button: HTMLElement, icon: FaIcon): void { if (input.type === "password") { icon.setIcon("eye-slash"); - button.dataset.tooltip = Language.get("wcf.global.form.password.button.hide"); + button.dataset.tooltip = getPhrase("wcf.global.form.password.button.hide"); input.type = "text"; } else { icon.setIcon("eye"); - button.dataset.tooltip = Language.get("wcf.global.form.password.button.show"); + button.dataset.tooltip = getPhrase("wcf.global.form.password.button.show"); input.type = "password"; } } diff --git a/ts/WoltLabSuite/Core/Ui/Poll/Editor.ts b/ts/WoltLabSuite/Core/Ui/Poll/Editor.ts index 5f5ccadfaec..f47fd43a8b6 100644 --- a/ts/WoltLabSuite/Core/Ui/Poll/Editor.ts +++ b/ts/WoltLabSuite/Core/Ui/Poll/Editor.ts @@ -8,7 +8,7 @@ */ import * as Core from "../../Core"; -import * as Language from "../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import UiSortableList from "../Sortable/List"; import * as EventHandler from "../../Event/Handler"; import * as DatePicker from "../../Date/Picker"; @@ -187,7 +187,7 @@ class UiPollEditor { addButton.type = "button"; addButton.innerHTML = ''; addButton.classList.add("jsTooltip", "jsAddOption"); - addButton.title = Language.get("wcf.poll.button.addOption"); + addButton.title = getPhrase("wcf.poll.button.addOption"); addButton.addEventListener("click", () => this.createOption()); const deleteButton = document.createElement("button"); @@ -195,7 +195,7 @@ class UiPollEditor { deleteButton.type = "button"; deleteButton.innerHTML = ''; deleteButton.classList.add("jsTooltip", "jsDeleteOption"); - deleteButton.title = Language.get("wcf.poll.button.removeOption"); + deleteButton.title = getPhrase("wcf.poll.button.removeOption"); deleteButton.addEventListener("click", () => this.removeOption(deleteButton)); // input field @@ -245,7 +245,7 @@ class UiPollEditor { DomUtil.innerError( document.getElementById(this.wysiwygId + data.returnValues.fieldName)!, - Language.get("wcf.poll." + fieldName + ".error." + data.returnValues.errorType), + getPhrase("wcf.poll." + fieldName + ".error." + data.returnValues.errorType), true, ); data.cancel = true; @@ -382,13 +382,13 @@ class UiPollEditor { }); if (nonEmptyOptionCount === 0) { - data.api.throwError(this.container, Language.get("wcf.global.form.error.empty")); + data.api.throwError(this.container, getPhrase("wcf.global.form.error.empty")); data.valid = false; } else { const maxVotes = ~~this.maxVotesField.value; if (maxVotes && maxVotes > nonEmptyOptionCount) { - data.api.throwError(this.maxVotesField.parentElement!, Language.get("wcf.poll.maxVotes.error.invalid")); + data.api.throwError(this.maxVotesField.parentElement!, getPhrase("wcf.poll.maxVotes.error.invalid")); data.valid = false; } else { EventHandler.fire("com.woltlab.wcf.poll.editor", "validate", { diff --git a/ts/WoltLabSuite/Core/Ui/User/Activity/Recent.ts b/ts/WoltLabSuite/Core/Ui/User/Activity/Recent.ts index 58db2b51068..da32f6fbc5b 100644 --- a/ts/WoltLabSuite/Core/Ui/User/Activity/Recent.ts +++ b/ts/WoltLabSuite/Core/Ui/User/Activity/Recent.ts @@ -6,7 +6,7 @@ import * as Ajax from "../../../Ajax"; import { AjaxCallbackObject, AjaxCallbackSetup } from "../../../Ajax/Data"; import * as Core from "../../../Core"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import DomUtil from "../../../Dom/Util"; interface AjaxResponse { @@ -31,12 +31,12 @@ class UiUserActivityRecent implements AjaxCallbackObject { showMoreItem.className = "showMore"; if (this.list.childElementCount) { showMoreItem.innerHTML = - '"; + '"; const button = showMoreItem.children[0] as HTMLButtonElement; button.addEventListener("click", (ev) => this.showMore(ev)); } else { - showMoreItem.innerHTML = "" + Language.get("wcf.user.recentActivity.noMoreEntries") + ""; + showMoreItem.innerHTML = "" + getPhrase("wcf.user.recentActivity.noMoreEntries") + ""; } this.list.appendChild(showMoreItem); @@ -94,7 +94,7 @@ class UiUserActivityRecent implements AjaxCallbackObject { const button = this.showMoreItem.children[0] as HTMLButtonElement; button.disabled = false; } else { - this.showMoreItem.innerHTML = "" + Language.get("wcf.user.recentActivity.noMoreEntries") + ""; + this.showMoreItem.innerHTML = "" + getPhrase("wcf.user.recentActivity.noMoreEntries") + ""; } } diff --git a/ts/WoltLabSuite/Core/Ui/User/Editor.ts b/ts/WoltLabSuite/Core/Ui/User/Editor.ts index ef1644cd485..cf841172785 100644 --- a/ts/WoltLabSuite/Core/Ui/User/Editor.ts +++ b/ts/WoltLabSuite/Core/Ui/User/Editor.ts @@ -12,7 +12,7 @@ import { AjaxCallbackObject, AjaxCallbackSetup } from "../../Ajax/Data"; import * as Core from "../../Core"; import { DialogCallbackObject, DialogCallbackSetup } from "../Dialog/Data"; import DomUtil from "../../Dom/Util"; -import * as Language from "../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import * as StringUtil from "../../StringUtil"; import UiDialog from "../Dialog"; import { showDefaultSuccessSnackbar } from "WoltLabSuite/Core/Component/Snackbar"; @@ -102,7 +102,7 @@ class UserEditor implements AjaxCallbackObject, DialogCallbackObject { const expireValue = document.getElementById("wcfUiUserEditorExpiresDatePicker") as HTMLInputElement; expires = expireValue.value; if (expires === "") { - errorMessage = Language.get("wcf.global.form.error.empty"); + errorMessage = getPhrase("wcf.global.form.error.empty"); } } @@ -126,7 +126,7 @@ class UserEditor implements AjaxCallbackObject, DialogCallbackObject { case "unban": { this.header.dataset.banned = data.actionName === "ban" ? "true" : "false"; button = document.querySelector(".userProfileHeader__managementOptions .jsButtonUserBan") as HTMLElement; - button.textContent = Language.get("wcf.user." + (data.actionName === "ban" ? "unban" : "ban")); + button.textContent = getPhrase("wcf.user." + (data.actionName === "ban" ? "unban" : "ban")); const contentTitle = this.header.querySelector(".userProfileHeader__username") as HTMLElement; let banIcon = contentTitle.querySelector(".jsUserBanned") as HTMLElement; @@ -148,7 +148,7 @@ class UserEditor implements AjaxCallbackObject, DialogCallbackObject { button = document.querySelector( ".userProfileHeader__managementOptions .jsButtonUserDisableAvatar", ) as HTMLElement; - button.textContent = Language.get( + button.textContent = getPhrase( "wcf.user." + (data.actionName === "disableAvatar" ? "enable" : "disable") + "Avatar", ); break; @@ -159,7 +159,7 @@ class UserEditor implements AjaxCallbackObject, DialogCallbackObject { button = document.querySelector( ".userProfileHeader__managementOptions .jsButtonUserDisableCoverPhoto", ) as HTMLElement; - button.textContent = Language.get( + button.textContent = getPhrase( "wcf.user." + (data.actionName === "disableCoverPhoto" ? "enable" : "disable") + "CoverPhoto", ); break; @@ -170,7 +170,7 @@ class UserEditor implements AjaxCallbackObject, DialogCallbackObject { button = document.querySelector( ".userProfileHeader__managementOptions .jsButtonUserDisableSignature", ) as HTMLElement; - button.textContent = Language.get( + button.textContent = getPhrase( "wcf.user." + (data.actionName === "disableSignature" ? "enable" : "disable") + "Signature", ); break; @@ -179,7 +179,7 @@ class UserEditor implements AjaxCallbackObject, DialogCallbackObject { case "disable": this.header.dataset.isDisabled = data.actionName === "disable" ? "true" : "false"; button = document.querySelector(".userProfileHeader__managementOptions .jsButtonUserEnable") as HTMLElement; - button.textContent = Language.get("wcf.acp.user." + (data.actionName === "enable" ? "disable" : "enable")); + button.textContent = getPhrase("wcf.acp.user." + (data.actionName === "enable" ? "disable" : "enable")); break; } @@ -214,12 +214,12 @@ class UserEditor implements AjaxCallbackObject, DialogCallbackObject { submitButton.addEventListener("click", this._submit.bind(this)); }, onShow: (content) => { - UiDialog.setTitle("wcfUiUserEditor", Language.get("wcf.user." + this.actionName + ".confirmMessage")); + UiDialog.setTitle("wcfUiUserEditor", getPhrase("wcf.user." + this.actionName + ".confirmMessage")); const reason = document.getElementById("wcfUiUserEditorReason") as HTMLElement; let label = reason.nextElementSibling as HTMLElement; const phrase = "wcf.user." + this.actionName + ".reason.description"; - label.textContent = Language.get(phrase); + label.textContent = getPhrase(phrase); if (label.textContent === phrase) { DomUtil.hide(label); } else { @@ -227,18 +227,18 @@ class UserEditor implements AjaxCallbackObject, DialogCallbackObject { } label = document.getElementById("wcfUiUserEditorNeverExpires")!.nextElementSibling as HTMLElement; - label.textContent = Language.get("wcf.user." + this.actionName + ".neverExpires"); + label.textContent = getPhrase("wcf.user." + this.actionName + ".neverExpires"); label = content.querySelector('label[for="wcfUiUserEditorExpires"]') as HTMLElement; - label.textContent = Language.get("wcf.user." + this.actionName + ".expires"); + label.textContent = getPhrase("wcf.user." + this.actionName + ".expires"); label = document.getElementById("wcfUiUserEditorExpiresLabel") as HTMLElement; - label.textContent = Language.get("wcf.user." + this.actionName + ".expires.description"); + label.textContent = getPhrase("wcf.user." + this.actionName + ".expires.description"); }, }, source: `
      -
      +
      @@ -256,7 +256,7 @@ class UserEditor implements AjaxCallbackObject, DialogCallbackObject {
      - +
      `, }; } diff --git a/ts/WoltLabSuite/Core/Ui/User/Ignore/List.ts b/ts/WoltLabSuite/Core/Ui/User/Ignore/List.ts index f7fdf231d75..f925034d573 100644 --- a/ts/WoltLabSuite/Core/Ui/User/Ignore/List.ts +++ b/ts/WoltLabSuite/Core/Ui/User/Ignore/List.ts @@ -9,7 +9,7 @@ import { showDefaultSuccessSnackbar } from "WoltLabSuite/Core/Component/Snackbar"; import FormBuilderDialog from "../../../Form/Builder/Dialog"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; interface AjaxResponse { isIgnoredUser: 0 | 1; @@ -33,7 +33,7 @@ export class UiUserIgnoreList { userId, new FormBuilderDialog("ignoreDialog", "wcf\\data\\user\\ignore\\UserIgnoreAction", "getDialog", { dialog: { - title: Language.get("wcf.user.button.ignore"), + title: getPhrase("wcf.user.button.ignore"), }, actionParameters: { userID: userId, diff --git a/ts/WoltLabSuite/Core/Ui/User/Menu/Data/Notification.ts b/ts/WoltLabSuite/Core/Ui/User/Menu/Data/Notification.ts index d4dcd5119db..50357f7540d 100644 --- a/ts/WoltLabSuite/Core/Ui/User/Menu/Data/Notification.ts +++ b/ts/WoltLabSuite/Core/Ui/User/Menu/Data/Notification.ts @@ -11,7 +11,7 @@ import { dboAction } from "../../../../Ajax"; import UserMenuView from "../View"; import { EventUpdateCounter, UserMenuButton, UserMenuData, UserMenuFooter, UserMenuProvider } from "./Provider"; import { registerProvider } from "../Manager"; -import * as Language from "../../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import { enableNotifications } from "../../../../Notification/Handler"; import { registerServiceWorker, updateNotificationLastReadTime } from "../../../../Notification/ServiceWorker"; @@ -250,7 +250,7 @@ class UserMenuDataNotification implements DesktopNotifications, UserMenuProvider const element = document.createElement("div"); element.classList.add("userMenuNotifications"); - element.textContent = Language.get("wcf.user.notification.enableDesktopNotifications"); + element.textContent = getPhrase("wcf.user.notification.enableDesktopNotifications"); const buttonContainer = document.createElement("div"); buttonContainer.classList.add("userMenuNotificationsButtons"); @@ -259,7 +259,7 @@ class UserMenuDataNotification implements DesktopNotifications, UserMenuProvider const button = document.createElement("button"); button.type = "button"; button.classList.add("button", "small", "userMenuNotificationsButton"); - button.textContent = Language.get("wcf.user.notification.enableDesktopNotifications.button"); + button.textContent = getPhrase("wcf.user.notification.enableDesktopNotifications.button"); button.addEventListener("click", async (event) => { event.preventDefault(); diff --git a/ts/WoltLabSuite/Core/Ui/User/Menu/View.ts b/ts/WoltLabSuite/Core/Ui/User/Menu/View.ts index c7fcea36a82..70971feb138 100644 --- a/ts/WoltLabSuite/Core/Ui/User/Menu/View.ts +++ b/ts/WoltLabSuite/Core/Ui/User/Menu/View.ts @@ -11,7 +11,7 @@ import { UserMenuButton, UserMenuData, UserMenuFooter, UserMenuProvider } from " import { getTimeElement } from "../../../Date/Util"; import { escapeHTML } from "../../../StringUtil"; import * as DomChangeListener from "../../../Dom/Change/Listener"; -import * as Language from "../../../Language"; +import { getPhrase } from "WoltLabSuite/Core/Language"; import { createFocusTrap, FocusTrap } from "focus-trap"; import PerfectScrollbar from "perfect-scrollbar"; import * as UiScreen from "../../Screen"; @@ -35,7 +35,7 @@ export class UserMenuView { icon: '', link: "#", name: "markAllAsRead", - title: Language.get("wcf.global.button.markAllAsRead"), + title: getPhrase("wcf.global.button.markAllAsRead"), }); this.focusTrap = createFocusTrap(this.element, { @@ -167,7 +167,7 @@ export class UserMenuView {
      - - `; + formSubmit.innerHTML = ``; content.appendChild(formSubmit); Dialog_1.default.rebuild(this); const button = formSubmit.children[0]; @@ -90,7 +89,7 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Core", "../../ id: Util_1.default.getUniqueId(), options: { closable: false, - title: Language.get("wcf.acp.dataImport"), + title: (0, Language_1.getPhrase)("wcf.acp.dataImport"), }, source: null, }; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Missing/Language/Item/List.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Missing/Language/Item/List.js index 7e1e2dec7d3..fdb171d14af 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Missing/Language/Item/List.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Missing/Language/Item/List.js @@ -4,13 +4,12 @@ * @license GNU Lesser General Public License * @since 5.4 */ -define(["require", "exports", "tslib", "../../../../../../Ui/Confirmation", "../../../../../../Ajax", "../../../../../../Language", "../../../../../../Component/Dialog"], function (require, exports, tslib_1, UiConfirmation, Ajax, Language, Dialog_1) { +define(["require", "exports", "tslib", "../../../../../../Ui/Confirmation", "../../../../../../Ajax", "WoltLabSuite/Core/Language", "../../../../../../Component/Dialog"], function (require, exports, tslib_1, UiConfirmation, Ajax, Language_1, Dialog_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.List = void 0; UiConfirmation = tslib_1.__importStar(UiConfirmation); Ajax = tslib_1.__importStar(Ajax); - Language = tslib_1.__importStar(Language); class List { clearExistingLogButton; clearLogButton; @@ -40,7 +39,7 @@ define(["require", "exports", "tslib", "../../../../../../Ui/Confirmation", "../ actionName: "clearLog", }); }, - message: Language.get("wcf.acp.devtools.missingLanguageItem.clearLog.confirmMessage"), + message: (0, Language_1.getPhrase)("wcf.acp.devtools.missingLanguageItem.clearLog.confirmMessage"), }); } clearExistingLog() { @@ -50,13 +49,13 @@ define(["require", "exports", "tslib", "../../../../../../Ui/Confirmation", "../ actionName: "clearExistingLog", }); }, - message: Language.get("wcf.acp.devtools.missingLanguageItem.clearExistingLog.confirmMessage"), + message: (0, Language_1.getPhrase)("wcf.acp.devtools.missingLanguageItem.clearExistingLog.confirmMessage"), }); } showStackTrace(event) { const target = event.currentTarget; const dialog = (0, Dialog_1.dialogFactory)().fromHtml(target.dataset.stackTrace).withoutControls(); - dialog.show(Language.get("wcf.acp.devtools.missingLanguageItem.stackTrace")); + dialog.show((0, Language_1.getPhrase)("wcf.acp.devtools.missingLanguageItem.stackTrace")); } } exports.List = List; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Notification/Test.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Notification/Test.js index fe8a2a702ae..1577f8af312 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Notification/Test.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Notification/Test.js @@ -5,12 +5,11 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Language", "../../../../Ui/Dialog", "../../../../Dom/Util"], function (require, exports, tslib_1, Ajax, Language, Dialog_1, Util_1) { +define(["require", "exports", "tslib", "../../../../Ajax", "WoltLabSuite/Core/Language", "../../../../Ui/Dialog", "../../../../Dom/Util"], function (require, exports, tslib_1, Ajax, Language_1, Dialog_1, Util_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; Ajax = tslib_1.__importStar(Ajax); - Language = tslib_1.__importStar(Language); Dialog_1 = tslib_1.__importDefault(Dialog_1); Util_1 = tslib_1.__importDefault(Util_1); class AcpUiDevtoolsNotificationTest { @@ -61,7 +60,7 @@ define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Language document.getElementById("notificationTestDialog").parentElement.scrollTop = 0; // restore buttons this.buttons.forEach((button) => { - button.innerHTML = Language.get("wcf.acp.devtools.notificationTest.button.test"); + button.innerHTML = (0, Language_1.getPhrase)("wcf.acp.devtools.notificationTest.button.test"); button.disabled = false; }); } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Installation/Confirmation.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Installation/Confirmation.js index 4446bec5592..b96fd86d11c 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Installation/Confirmation.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Installation/Confirmation.js @@ -5,12 +5,11 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../../../../Ajax", "../../../../../Language", "../../../../../Ui/Confirmation"], function (require, exports, tslib_1, Ajax, Language, UiConfirmation) { +define(["require", "exports", "tslib", "../../../../../Ajax", "WoltLabSuite/Core/Language", "../../../../../Ui/Confirmation"], function (require, exports, tslib_1, Ajax, Language_1, UiConfirmation) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; Ajax = tslib_1.__importStar(Ajax); - Language = tslib_1.__importStar(Language); UiConfirmation = tslib_1.__importStar(UiConfirmation); let _projectId; let _projectName; @@ -37,7 +36,7 @@ define(["require", "exports", "tslib", "../../../../../Ajax", "../../../../../La event.preventDefault(); UiConfirmation.show({ confirm: () => installPackage(), - message: Language.get("wcf.acp.devtools.project.installPackage.confirmMessage", { + message: (0, Language_1.getPhrase)("wcf.acp.devtools.project.installPackage.confirmMessage", { packageIdentifier: _projectName, }), messageIsHtml: true, diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Pip/Entry/List.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Pip/Entry/List.js index 0e69a532d06..5ab76d5b3a5 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Pip/Entry/List.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Pip/Entry/List.js @@ -5,10 +5,9 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../../../../../Ajax", "../../../../../../Language", "../../../../../../Ui/Confirmation", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Ajax, Language, Confirmation_1, Snackbar_1) { +define(["require", "exports", "tslib", "../../../../../../Ajax", "WoltLabSuite/Core/Language", "../../../../../../Ui/Confirmation", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Ajax, Language_1, Confirmation_1, Snackbar_1) { "use strict"; Ajax = tslib_1.__importStar(Ajax); - Language = tslib_1.__importStar(Language); class DevtoolsProjectPipEntryList { entryType; pip; @@ -75,15 +74,15 @@ define(["require", "exports", "tslib", "../../../../../../Ajax", "../../../../..
      - ${Language.get("wcf.acp.devtools.project.pip.entry.delete.addDeleteInstruction.description")} + ${(0, Language_1.getPhrase)("wcf.acp.devtools.project.pip.entry.delete.addDeleteInstruction.description")}
      `; } (0, Confirmation_1.show)({ confirm: (parameters, content) => this.deletePipEntry(parameters, content), - message: Language.get("wcf.acp.devtools.project.pip.entry.delete.confirmMessage"), + message: (0, Language_1.getPhrase)("wcf.acp.devtools.project.pip.entry.delete.confirmMessage"), template, parameters: { pipEntry: pipEntry, diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/QuickSetup.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/QuickSetup.js index 47cc104bf13..10501ad8ae0 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/QuickSetup.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/QuickSetup.js @@ -5,13 +5,12 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Dom/Util", "../../../../Language", "../../../../Ui/Dialog", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Ajax, Util_1, Language, Dialog_1, Snackbar_1) { +define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Dom/Util", "WoltLabSuite/Core/Language", "../../../../Ui/Dialog", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Ajax, Util_1, Language_1, Dialog_1, Snackbar_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; Ajax = tslib_1.__importStar(Ajax); Util_1 = tslib_1.__importDefault(Util_1); - Language = tslib_1.__importStar(Language); Dialog_1 = tslib_1.__importDefault(Dialog_1); class AcpUiDevtoolsProjectQuickSetup { pathInput; @@ -61,7 +60,7 @@ define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Dom/Util id: "projectQuickSetup", options: { onShow: () => this.onDialogShow(), - title: Language.get("wcf.acp.devtools.project.quickSetup"), + title: (0, Language_1.getPhrase)("wcf.acp.devtools.project.quickSetup"), }, }; } @@ -97,7 +96,7 @@ define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Dom/Util event.preventDefault(); // check if path is empty if (this.pathInput.value === "") { - Util_1.default.innerError(this.pathInput, Language.get("wcf.global.form.error.empty")); + Util_1.default.innerError(this.pathInput, (0, Language_1.getPhrase)("wcf.global.form.error.empty")); return; } Ajax.api(this, { diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Sync.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Sync.js index b58b8d0a47c..db22fda4e2a 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Sync.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Sync.js @@ -1,9 +1,8 @@ -define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Language", "../../../../Component/Dialog", "WoltLabSuite/Core/Component/Snackbar", "WoltLabSuite/Core/Api/Devtools/Projects/SyncVersion"], function (require, exports, tslib_1, Ajax, Language, Dialog_1, Snackbar_1, SyncVersion_1) { +define(["require", "exports", "tslib", "../../../../Ajax", "WoltLabSuite/Core/Language", "../../../../Component/Dialog", "WoltLabSuite/Core/Component/Snackbar", "WoltLabSuite/Core/Api/Devtools/Projects/SyncVersion"], function (require, exports, tslib_1, Ajax, Language_1, Dialog_1, Snackbar_1, SyncVersion_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; Ajax = tslib_1.__importStar(Ajax); - Language = tslib_1.__importStar(Language); class AcpUiDevtoolsProjectSync { buttons = new Map(); buttonStatus = new Map(); @@ -162,7 +161,7 @@ define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Language const identifier = this.getButtonIdentifier(requestData.parameters.pluginName, requestData.parameters.target); this.buttons.get(identifier).disabled = false; const buttonStatus = this.buttonStatus.get(identifier); - buttonStatus.innerHTML = '' + Language.get("wcf.acp.devtools.sync.status.failure") + ""; + buttonStatus.innerHTML = '' + (0, Language_1.getPhrase)("wcf.acp.devtools.sync.status.failure") + ""; buttonStatus.children[0].addEventListener("click", (event) => { event.preventDefault(); const html = Ajax.getRequestObject(this).getErrorHtml(data, xhr); @@ -170,12 +169,12 @@ define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Language const dialog = (0, Dialog_1.dialogFactory)() .fromHtml(`
      ${html.outerHTML}
      `) .asAlert(); - dialog.show(Language.get("wcf.global.error.title")); + dialog.show((0, Language_1.getPhrase)("wcf.global.error.title")); dialog.querySelector("dialog").classList.add("dialog--iframe"); } else if (html) { const dialog = (0, Dialog_1.dialogFactory)().fromHtml(html).asAlert(); - dialog.show(Language.get("wcf.global.error.title")); + dialog.show((0, Language_1.getPhrase)("wcf.global.error.title")); } }); this.buttonSyncAll.classList.remove("disabled"); @@ -196,7 +195,7 @@ define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Language return { id: "devtoolsProjectSyncPipError", options: { - title: Language.get("wcf.global.error.title"), + title: (0, Language_1.getPhrase)("wcf.global.error.title"), }, source: null, }; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Maintenance/RebuildData.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Maintenance/RebuildData.js index 5d288173b86..7fa4b85458e 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Maintenance/RebuildData.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Maintenance/RebuildData.js @@ -5,13 +5,12 @@ * @copyright 2001-2021 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../Worker", "../../../Language"], function (require, exports, tslib_1, Worker_1, Language) { +define(["require", "exports", "tslib", "../Worker", "WoltLabSuite/Core/Language"], function (require, exports, tslib_1, Worker_1, Language_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.register = register; exports.runAllWorkers = runAllWorkers; Worker_1 = tslib_1.__importDefault(Worker_1); - Language = tslib_1.__importStar(Language); const workers = new Map(); function register(button) { if (!button.dataset.className) { @@ -50,7 +49,7 @@ define(["require", "exports", "tslib", "../Worker", "../../../Language"], functi span.remove(); } span = document.createElement("span"); - span.innerHTML = ` ${Language.get("wcf.acp.worker.success")}`; + span.innerHTML = ` ${(0, Language_1.getPhrase)("wcf.acp.worker.success")}`; button.parentNode.insertBefore(span, button.nextElementSibling); resolve(); }, diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Option/EmailSmtpTest.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Option/EmailSmtpTest.js index 5655e85e310..a3dc4cdd783 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Option/EmailSmtpTest.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Option/EmailSmtpTest.js @@ -5,13 +5,12 @@ * @copyright 2001-2018 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../../Ajax", "../../../Dom/Util", "../../../Language"], function (require, exports, tslib_1, Ajax, Util_1, Language) { +define(["require", "exports", "tslib", "../../../Ajax", "../../../Dom/Util", "WoltLabSuite/Core/Language"], function (require, exports, tslib_1, Ajax, Util_1, Language_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; Ajax = tslib_1.__importStar(Ajax); Util_1 = tslib_1.__importDefault(Util_1); - Language = tslib_1.__importStar(Language); class EmailSmtpTest { buttonRunTest; container; @@ -29,10 +28,10 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Dom/Util", ".. return; } this.container = document.createElement("dl"); - this.container.innerHTML = `
      ${Language.get("wcf.acp.email.smtp.test")}
      + this.container.innerHTML = `
      ${(0, Language_1.getPhrase)("wcf.acp.email.smtp.test")}
      - ${Language.get("wcf.acp.email.smtp.test.run")} - ${Language.get("wcf.acp.email.smtp.test.description")} + ${(0, Language_1.getPhrase)("wcf.acp.email.smtp.test.run")} + ${(0, Language_1.getPhrase)("wcf.acp.email.smtp.test.description")}
      `; this.buttonRunTest = this.container.querySelector("a"); this.buttonRunTest.addEventListener("click", (ev) => this.onClick(ev)); @@ -58,7 +57,7 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Dom/Util", ".. onClick(event) { event.preventDefault(); this.buttonRunTest.classList.add("disabled"); - this.buttonRunTest.innerHTML = ` ${Language.get("wcf.global.loading")}`; + this.buttonRunTest.innerHTML = ` ${(0, Language_1.getPhrase)("wcf.global.loading")}`; Util_1.default.innerError(this.buttonRunTest, false); window.setTimeout(() => { const startTls = document.querySelector('input[name="values[mail_smtp_starttls]"]:checked'); @@ -89,7 +88,7 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Dom/Util", ".. _ajaxFailure(data) { let result = ""; if (data && data.returnValues && data.returnValues.fieldName) { - result = Language.get(`wcf.acp.email.smtp.test.error.empty.${data.returnValues.fieldName}`); + result = (0, Language_1.getPhrase)(`wcf.acp.email.smtp.test.error.empty.${data.returnValues.fieldName}`); } this.resetButton(false, result); return result === ""; @@ -97,10 +96,10 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Dom/Util", ".. resetButton(success, errorMessage) { this.buttonRunTest.classList.remove("disabled"); if (success) { - this.buttonRunTest.innerHTML = ` ${Language.get("wcf.acp.email.smtp.test.run.success")}`; + this.buttonRunTest.innerHTML = ` ${(0, Language_1.getPhrase)("wcf.acp.email.smtp.test.run.success")}`; } else { - this.buttonRunTest.innerHTML = Language.get("wcf.acp.email.smtp.test.run"); + this.buttonRunTest.innerHTML = (0, Language_1.getPhrase)("wcf.acp.email.smtp.test.run"); } if (errorMessage) { Util_1.default.innerError(this.buttonRunTest, errorMessage); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Option/RewriteGenerator.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Option/RewriteGenerator.js index fc462132413..1000b8ef8e1 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Option/RewriteGenerator.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Option/RewriteGenerator.js @@ -5,12 +5,11 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../../Ajax", "../../../Language", "../../../Ui/Dialog"], function (require, exports, tslib_1, Ajax, Language, Dialog_1) { +define(["require", "exports", "tslib", "../../../Ajax", "WoltLabSuite/Core/Language", "../../../Ui/Dialog"], function (require, exports, tslib_1, Ajax, Language_1, Dialog_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; Ajax = tslib_1.__importStar(Ajax); - Language = tslib_1.__importStar(Language); Dialog_1 = tslib_1.__importDefault(Dialog_1); class RewriteGenerator { buttonGenerate; @@ -31,11 +30,11 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Language", ".. this.buttonGenerate = document.createElement("a"); this.buttonGenerate.className = "button"; this.buttonGenerate.href = "#"; - this.buttonGenerate.textContent = Language.get("wcf.acp.rewrite.generate"); + this.buttonGenerate.textContent = (0, Language_1.getPhrase)("wcf.acp.rewrite.generate"); this.buttonGenerate.addEventListener("click", (ev) => this._onClick(ev)); dd.appendChild(this.buttonGenerate); const description = document.createElement("small"); - description.textContent = Language.get("wcf.acp.rewrite.description"); + description.textContent = (0, Language_1.getPhrase)("wcf.acp.rewrite.description"); dd.appendChild(description); this.container.appendChild(dt); this.container.appendChild(dd); @@ -54,7 +53,7 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Language", ".. id: "dialogRewriteRules", source: null, options: { - title: Language.get("wcf.acp.rewrite"), + title: (0, Language_1.getPhrase)("wcf.acp.rewrite"), }, }; } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Option/RewriteTest.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Option/RewriteTest.js index f1207442692..b1bb462bca9 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Option/RewriteTest.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Option/RewriteTest.js @@ -5,11 +5,10 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../../Language", "../../../Ui/Dialog", "../../../Dom/Util", "WoltLabSuite/Core/Ajax/Backend"], function (require, exports, tslib_1, Language, Dialog_1, Util_1, Backend_1) { +define(["require", "exports", "tslib", "WoltLabSuite/Core/Language", "../../../Ui/Dialog", "../../../Dom/Util", "WoltLabSuite/Core/Ajax/Backend"], function (require, exports, tslib_1, Language_1, Dialog_1, Util_1, Backend_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; - Language = tslib_1.__importStar(Language); Dialog_1 = tslib_1.__importDefault(Dialog_1); Util_1 = tslib_1.__importDefault(Util_1); class RewriteTest { @@ -92,7 +91,7 @@ define(["require", "exports", "tslib", "../../../Language", "../../../Ui/Dialog" const testFailureResults = document.getElementById("dialogRewriteTestFailureResults"); testFailureResults.innerHTML = results .map((result) => { - return `
    • ${Language.get("wcf.acp.option.url_omit_index_php.test.status." + (result.pass ? "success" : "failure"))} ${result.app}
      • `; + return `
    • ${(0, Language_1.getPhrase)("wcf.acp.option.url_omit_index_php.test.status." + (result.pass ? "success" : "failure"))} ${result.app}
      • `; }) .join(""); this.setStatus("failure"); @@ -133,7 +132,7 @@ define(["require", "exports", "tslib", "../../../Language", "../../../Ui/Dialog" }); }, onShow: () => this.runTest(), - title: Language.get("wcf.acp.option.url_omit_index_php"), + title: (0, Language_1.getPhrase)("wcf.acp.option.url_omit_index_php"), }, }; } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/PrepareInstallation.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/PrepareInstallation.js index 96c7082313a..3b08b00ec74 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/PrepareInstallation.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/PrepareInstallation.js @@ -6,10 +6,9 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../../Ajax", "../../../Language", "../../../Ui/Dialog", "../../../Dom/Util"], function (require, exports, tslib_1, Ajax, Language, Dialog_1, Util_1) { +define(["require", "exports", "tslib", "../../../Ajax", "WoltLabSuite/Core/Language", "../../../Ui/Dialog", "../../../Dom/Util"], function (require, exports, tslib_1, Ajax, Language_1, Dialog_1, Util_1) { "use strict"; Ajax = tslib_1.__importStar(Ajax); - Language = tslib_1.__importStar(Language); Dialog_1 = tslib_1.__importDefault(Dialog_1); Util_1 = tslib_1.__importDefault(Util_1); class AcpUiPackagePrepareInstallation { @@ -46,12 +45,12 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Language", ".. Util_1.default.innerError(passwordInput, false); const username = usernameInput.value.trim(); if (username === "") { - Util_1.default.innerError(usernameInput, Language.get("wcf.global.form.error.empty")); + Util_1.default.innerError(usernameInput, (0, Language_1.getPhrase)("wcf.global.form.error.empty")); } else { const password = passwordInput.value.trim(); if (password === "") { - Util_1.default.innerError(passwordInput, Language.get("wcf.global.form.error.empty")); + Util_1.default.innerError(passwordInput, (0, Language_1.getPhrase)("wcf.global.form.error.empty")); } else { const saveCredentials = document.getElementById("packageUpdateServerSaveCredentials"); @@ -100,7 +99,7 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Language", ".. this.submit(packageUpdateServerId); }); }, - title: Language.get("wcf.acp.package.update.unauthorized"), + title: (0, Language_1.getPhrase)("wcf.acp.package.update.unauthorized"), }, source: null, }; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/QuickInstallation.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/QuickInstallation.js index 66783b809d1..bc34e7fcf1b 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/QuickInstallation.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/QuickInstallation.js @@ -6,12 +6,11 @@ * @copyright 2001-2022 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../../Ajax", "../../../Ajax/Status", "../../../Core", "../../../Language", "../../../Dom/Util", "../../../Ui/Dialog", "WoltLabSuite/Core/Ajax/Error"], function (require, exports, tslib_1, Ajax_1, AjaxStatus, Core_1, Language, Util_1, Dialog_1, Error_1) { +define(["require", "exports", "tslib", "../../../Ajax", "../../../Ajax/Status", "../../../Core", "WoltLabSuite/Core/Language", "../../../Dom/Util", "../../../Ui/Dialog", "WoltLabSuite/Core/Ajax/Error"], function (require, exports, tslib_1, Ajax_1, AjaxStatus, Core_1, Language_1, Util_1, Dialog_1, Error_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.setup = setup; AjaxStatus = tslib_1.__importStar(AjaxStatus); - Language = tslib_1.__importStar(Language); Dialog_1 = tslib_1.__importDefault(Dialog_1); let codeInput; function detectCode(versionNumber) { @@ -42,7 +41,7 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Ajax/Status", (0, Util_1.innerError)(codeInput, false); } else { - (0, Util_1.innerError)(codeInput, Language.get("wcf.acp.package.quickInstallation.code.error.invalid")); + (0, Util_1.innerError)(codeInput, (0, Language_1.getPhrase)("wcf.acp.package.quickInstallation.code.error.invalid")); } } let refreshedPackageDatabase = undefined; @@ -84,7 +83,7 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Ajax/Status", const json = await e.response.clone().json(); if (typeof json.message === "string" && json.message.startsWith("Cannot find the package '")) { codeInput.value = ""; - (0, Util_1.innerError)(codeInput, Language.getPhrase("wcf.acp.package.error.incompatibleStoreProduct", { versionNumber })); + (0, Util_1.innerError)(codeInput, (0, Language_1.getPhrase)("wcf.acp.package.error.incompatibleStoreProduct", { versionNumber })); return; } } @@ -97,7 +96,7 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Ajax/Status", if ("queueID" in response) { if (response.queueID === null) { codeInput.value = ""; - (0, Util_1.innerError)(codeInput, Language.get("wcf.acp.package.error.uniqueAlreadyInstalled")); + (0, Util_1.innerError)(codeInput, (0, Language_1.getPhrase)("wcf.acp.package.error.uniqueAlreadyInstalled")); } else { const installation = new window.WCF.ACP.Package.Installation(response.queueID, undefined, false); @@ -110,7 +109,7 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Ajax/Status", return { id: "quickInstallationError", options: { - title: Language.get("wcf.global.error.title"), + title: (0, Language_1.getPhrase)("wcf.global.error.title"), }, source: null, }; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/Update/Manager.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/Update/Manager.js index 9e896786d52..b1f44600101 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/Update/Manager.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Package/Update/Manager.js @@ -6,11 +6,10 @@ * @copyright 2001-2022 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Language", "../../../../Ui/Dialog", "../../../../Dom/Util"], function (require, exports, tslib_1, Ajax_1, Language, UiDialog, Util_1) { +define(["require", "exports", "tslib", "../../../../Ajax", "WoltLabSuite/Core/Language", "../../../../Ui/Dialog", "../../../../Dom/Util"], function (require, exports, tslib_1, Ajax_1, Language_1, UiDialog, Util_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.setup = setup; - Language = tslib_1.__importStar(Language); UiDialog = tslib_1.__importStar(UiDialog); Util_1 = tslib_1.__importDefault(Util_1); class AcpUiPackageUpdateManager { @@ -86,11 +85,11 @@ define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Language } promptCredentials(template) { UiDialog.open(this, template); - UiDialog.setTitle(this, Language.get("wcf.acp.package.update.unauthorized")); + UiDialog.setTitle(this, (0, Language_1.getPhrase)("wcf.acp.package.update.unauthorized")); } showConflict(template) { UiDialog.open(this, template); - UiDialog.setTitle(this, Language.get("wcf.acp.package.update.excludedPackages")); + UiDialog.setTitle(this, (0, Language_1.getPhrase)("wcf.acp.package.update.excludedPackages")); } startInstallation(queueId) { if (UiDialog.isOpen(this)) { @@ -103,7 +102,7 @@ define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Language return { id: "acpUiPackageUpdateManager", options: { - title: Language.get("wcf.acp.package.update.title"), + title: (0, Language_1.getPhrase)("wcf.acp.package.update.title"), }, source: null, }; @@ -113,7 +112,7 @@ define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Language const usernameField = document.getElementById("packageUpdateServerUsername"); const username = usernameField.value.trim(); if (username === "") { - Util_1.default.innerError(usernameField, Language.get("wcf.global.form.error.empty")); + Util_1.default.innerError(usernameField, (0, Language_1.getPhrase)("wcf.global.form.error.empty")); isValid = false; } else { @@ -122,7 +121,7 @@ define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Language const passwordField = document.getElementById("packageUpdateServerPassword"); const password = passwordField.value.trim(); if (password === "") { - Util_1.default.innerError(passwordField, Language.get("wcf.global.form.error.empty")); + Util_1.default.innerError(passwordField, (0, Language_1.getPhrase)("wcf.global.form.error.empty")); isValid = false; } else { diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Page/Add.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Page/Add.js index f88356b0af1..4ce3efc8779 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Page/Add.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Page/Add.js @@ -5,11 +5,10 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../../Language", "../../../Component/Dialog"], function (require, exports, tslib_1, Language, Dialog_1) { +define(["require", "exports", "WoltLabSuite/Core/Language", "../../../Component/Dialog"], function (require, exports, Language_1, Dialog_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.AcpUiPageAdd = void 0; - Language = tslib_1.__importStar(Language); class AcpUiPageAdd { #supportsI18n; #link; @@ -28,7 +27,7 @@ define(["require", "exports", "tslib", "../../../Language", "../../../Component/ if (!this.#dialog) { this.#dialog = this.#createDialog(); } - this.#dialog.show(Language.get("wcf.acp.page.add")); + this.#dialog.show((0, Language_1.getPhrase)("wcf.acp.page.add")); } #createDialog() { const dialog = (0, Dialog_1.dialogFactory)().fromId("pageAddDialog").asPrompt(); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Page/BoxOrder.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Page/BoxOrder.js index 5997bf850c8..4712396577a 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Page/BoxOrder.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Page/BoxOrder.js @@ -5,13 +5,12 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../../Ajax", "../../../Dom/Change/Listener", "../../../Language", "../../../Ui/Confirmation", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Ajax, Listener_1, Language, UiConfirmation, Snackbar_1) { +define(["require", "exports", "tslib", "../../../Ajax", "../../../Dom/Change/Listener", "WoltLabSuite/Core/Language", "../../../Ui/Confirmation", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Ajax, Listener_1, Language_1, UiConfirmation, Snackbar_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; Ajax = tslib_1.__importStar(Ajax); Listener_1 = tslib_1.__importDefault(Listener_1); - Language = tslib_1.__importStar(Language); UiConfirmation = tslib_1.__importStar(UiConfirmation); class AcpUiPageBoxOrder { pageId; @@ -29,7 +28,7 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Dom/Change/Lis item.dataset.boxId = box.boxId.toString(); let icon = ""; if (box.isDisabled) { - icon = ` + icon = ` `; } @@ -86,7 +85,7 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Dom/Change/Lis actionName: "resetPosition", }); }, - message: Language.get("wcf.acp.page.boxOrder.discard.confirmMessage"), + message: (0, Language_1.getPhrase)("wcf.acp.page.boxOrder.discard.confirmMessage"), }); } _ajaxSuccess(data) { diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Page/Copy.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Page/Copy.js index d1dd463c289..843fa50dc32 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Page/Copy.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Page/Copy.js @@ -1,8 +1,7 @@ -define(["require", "exports", "tslib", "../../../Language", "../../../Ui/Dialog"], function (require, exports, tslib_1, Language, Dialog_1) { +define(["require", "exports", "tslib", "WoltLabSuite/Core/Language", "../../../Ui/Dialog"], function (require, exports, tslib_1, Language_1, Dialog_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; - Language = tslib_1.__importStar(Language); Dialog_1 = tslib_1.__importDefault(Dialog_1); class AcpUiPageCopy { constructor() { @@ -18,7 +17,7 @@ define(["require", "exports", "tslib", "../../../Language", "../../../Ui/Dialog" return { id: "acpPageCopyDialog", options: { - title: Language.get("wcf.acp.page.copy"), + title: (0, Language_1.getPhrase)("wcf.acp.page.copy"), }, }; } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Trophy/Upload.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Trophy/Upload.js index 650c363982f..fafa5bffd67 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Trophy/Upload.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Trophy/Upload.js @@ -5,11 +5,10 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "WoltLabSuite/Core/Component/Snackbar", "../../../Core", "../../../Dom/Util", "../../../Language", "../../../Upload"], function (require, exports, tslib_1, Snackbar_1, Core, Util_1, Language, Upload_1) { +define(["require", "exports", "tslib", "WoltLabSuite/Core/Component/Snackbar", "../../../Core", "../../../Dom/Util", "WoltLabSuite/Core/Language", "../../../Upload"], function (require, exports, tslib_1, Snackbar_1, Core, Util_1, Language_1, Upload_1) { "use strict"; Core = tslib_1.__importStar(Core); Util_1 = tslib_1.__importDefault(Util_1); - Language = tslib_1.__importStar(Language); Upload_1 = tslib_1.__importDefault(Upload_1); class TrophyUpload extends Upload_1.default { trophyId; @@ -33,7 +32,7 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Component/Snackbar", " (0, Snackbar_1.showDefaultSuccessSnackbar)(); } _failure(uploadId, data) { - Util_1.default.innerError(this._button, Language.get(`wcf.acp.trophy.imageUpload.error.${data.returnValues.errorType}`)); + Util_1.default.innerError(this._button, (0, Language_1.getPhrase)(`wcf.acp.trophy.imageUpload.error.${data.returnValues.errorType}`)); // remove previous images this._target.innerHTML = ""; return false; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Ban/Dialog.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Ban/Dialog.js index 4bb5710734c..7a13451a766 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Ban/Dialog.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Ban/Dialog.js @@ -6,12 +6,11 @@ * @license GNU Lesser General Public License * @since 5.5 */ -define(["require", "exports", "tslib", "../../../../../../Ui/Dialog", "../../../../../../Language", "../../../../../../Ajax", "../../../../../../Date/Picker"], function (require, exports, tslib_1, Dialog_1, Language, Ajax, Picker_1) { +define(["require", "exports", "tslib", "../../../../../../Ui/Dialog", "WoltLabSuite/Core/Language", "../../../../../../Ajax", "../../../../../../Date/Picker"], function (require, exports, tslib_1, Dialog_1, Language_1, Ajax, Picker_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.BanDialog = void 0; Dialog_1 = tslib_1.__importDefault(Dialog_1); - Language = tslib_1.__importStar(Language); Ajax = tslib_1.__importStar(Ajax); Picker_1 = tslib_1.__importDefault(Picker_1); class BanDialog { @@ -87,15 +86,15 @@ define(["require", "exports", "tslib", "../../../../../../Ui/Dialog", "../../../ } }); }, - title: Language.get("wcf.acp.user.ban.sure"), + title: (0, Language_1.getPhrase)("wcf.acp.user.ban.sure"), }, source: `
      -
      +
      - ${Language.get("wcf.acp.user.banReason.description")} + ${(0, Language_1.getPhrase)("wcf.acp.user.banReason.description")}
      @@ -103,13 +102,13 @@ define(["require", "exports", "tslib", "../../../../../../Ui/Dialog", "../../../
      - +
      `, }; } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/SendNewPassword.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/SendNewPassword.js index e5cde4faab1..649d2c3d41a 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/SendNewPassword.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/SendNewPassword.js @@ -6,11 +6,10 @@ * @license GNU Lesser General Public License * @since 5.5 */ -define(["require", "exports", "tslib", "../../../../../Language", "../../../../../Ui/Confirmation", "../../../Worker"], function (require, exports, tslib_1, Language, UiConfirmation, Worker_1) { +define(["require", "exports", "tslib", "WoltLabSuite/Core/Language", "../../../../../Ui/Confirmation", "../../../Worker"], function (require, exports, tslib_1, Language_1, UiConfirmation, Worker_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.SendNewPassword = void 0; - Language = tslib_1.__importStar(Language); UiConfirmation = tslib_1.__importStar(UiConfirmation); Worker_1 = tslib_1.__importDefault(Worker_1); class SendNewPassword { @@ -25,7 +24,7 @@ define(["require", "exports", "tslib", "../../../../../Language", "../../../../. confirm: () => { new Worker_1.default({ dialogId: "sendingNewPasswords", - dialogTitle: Language.get("wcf.acp.user.sendNewPassword.workerTitle"), + dialogTitle: (0, Language_1.getPhrase)("wcf.acp.user.sendNewPassword.workerTitle"), className: "wcf\\system\\worker\\SendNewPasswordWorker", parameters: { userIDs: this.userIDs, @@ -33,7 +32,7 @@ define(["require", "exports", "tslib", "../../../../../Language", "../../../../. callbackSuccess: this.successCallback, }); }, - message: Language.get("wcf.acp.user.action.sendNewPassword.confirmMessage"), + message: (0, Language_1.getPhrase)("wcf.acp.user.action.sendNewPassword.confirmMessage"), }); } } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Clipboard.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Clipboard.js index 30c744cdec7..f587c37a971 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Clipboard.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Clipboard.js @@ -6,13 +6,12 @@ * @license GNU Lesser General Public License * @since 5.4 */ -define(["require", "exports", "tslib", "../../../Worker", "../../../../../Ajax", "../../../../../Language", "../../../../../Ui/Dialog", "../../../../../Event/Handler"], function (require, exports, tslib_1, Worker_1, Ajax, Language, Dialog_1, EventHandler) { +define(["require", "exports", "tslib", "../../../Worker", "../../../../../Ajax", "WoltLabSuite/Core/Language", "../../../../../Ui/Dialog", "../../../../../Event/Handler"], function (require, exports, tslib_1, Worker_1, Ajax, Language_1, Dialog_1, EventHandler) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.AcpUserContentRemoveClipboard = void 0; Worker_1 = tslib_1.__importDefault(Worker_1); Ajax = tslib_1.__importStar(Ajax); - Language = tslib_1.__importStar(Language); Dialog_1 = tslib_1.__importDefault(Dialog_1); EventHandler = tslib_1.__importStar(EventHandler); class AcpUserContentRemoveClipboard { @@ -36,7 +35,7 @@ define(["require", "exports", "tslib", "../../../Worker", "../../../../../Ajax", new Worker_1.default({ // dialog dialogId: "removeContentWorker", - dialogTitle: Language.get("wcf.acp.content.removeContent"), + dialogTitle: (0, Language_1.getPhrase)("wcf.acp.content.removeContent"), // ajax className: "wcf\\system\\worker\\UserContentRemoveWorker", parameters: { @@ -82,7 +81,7 @@ define(["require", "exports", "tslib", "../../../Worker", "../../../../../Ajax", return { id: this.dialogId, options: { - title: Language.get("wcf.acp.content.removeContent"), + title: (0, Language_1.getPhrase)("wcf.acp.content.removeContent"), }, source: null, }; 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 d489f81549d..faeadb96c4d 100644 --- 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 @@ -6,11 +6,10 @@ * @license GNU Lesser General Public License * @since 5.2 */ -define(["require", "exports", "tslib", "../../../Worker", "../../../../../Ajax", "../../../../../Language", "../../../../../Ui/Dialog"], function (require, exports, tslib_1, Worker_1, Ajax, Language, Dialog_1) { +define(["require", "exports", "tslib", "../../../Worker", "../../../../../Ajax", "WoltLabSuite/Core/Language", "../../../../../Ui/Dialog"], function (require, exports, tslib_1, Worker_1, Ajax, Language_1, Dialog_1) { "use strict"; Worker_1 = tslib_1.__importDefault(Worker_1); Ajax = tslib_1.__importStar(Ajax); - Language = tslib_1.__importStar(Language); Dialog_1 = tslib_1.__importDefault(Dialog_1); class AcpUserContentRemoveHandler { dialogId; @@ -39,7 +38,7 @@ define(["require", "exports", "tslib", "../../../Worker", "../../../../../Ajax", new Worker_1.default({ // dialog dialogId: "removeContentWorker", - dialogTitle: Language.get("wcf.acp.content.removeContent"), + dialogTitle: (0, Language_1.getPhrase)("wcf.acp.content.removeContent"), // ajax className: "\\wcf\\system\\worker\\UserContentRemoveWorker", parameters: { @@ -86,7 +85,7 @@ define(["require", "exports", "tslib", "../../../Worker", "../../../../../Ajax", return { id: this.dialogId, options: { - title: Language.get("wcf.acp.content.removeContent"), + title: (0, Language_1.getPhrase)("wcf.acp.content.removeContent"), }, source: null, }; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Editor.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Editor.js index 100bd47b93d..65d2bdf0097 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Editor.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Editor.js @@ -5,12 +5,11 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "./Content/Remove/Handler", "../../../Core", "../../../Event/Handler", "../../../Language", "../../../Ui/Dropdown/Simple", "../../../Dom/Util", "./Action/SendNewPasswordAction", "./Action/ToggleConfirmEmailAction", "./Action/DisableAction", "./Action/BanAction", "./Action/DeleteAction"], function (require, exports, tslib_1, Handler_1, Core, EventHandler, Language, Simple_1, Util_1, SendNewPasswordAction_1, ToggleConfirmEmailAction_1, DisableAction_1, BanAction_1, DeleteAction_1) { +define(["require", "exports", "tslib", "./Content/Remove/Handler", "../../../Core", "../../../Event/Handler", "WoltLabSuite/Core/Language", "../../../Ui/Dropdown/Simple", "../../../Dom/Util", "./Action/SendNewPasswordAction", "./Action/ToggleConfirmEmailAction", "./Action/DisableAction", "./Action/BanAction", "./Action/DeleteAction"], function (require, exports, tslib_1, Handler_1, Core, EventHandler, Language_1, Simple_1, Util_1, SendNewPasswordAction_1, ToggleConfirmEmailAction_1, DisableAction_1, BanAction_1, DeleteAction_1) { "use strict"; Handler_1 = tslib_1.__importDefault(Handler_1); Core = tslib_1.__importStar(Core); EventHandler = tslib_1.__importStar(EventHandler); - Language = tslib_1.__importStar(Language); Simple_1 = tslib_1.__importDefault(Simple_1); Util_1 = tslib_1.__importDefault(Util_1); SendNewPasswordAction_1 = tslib_1.__importDefault(SendNewPasswordAction_1); @@ -132,7 +131,7 @@ define(["require", "exports", "tslib", "./Content/Remove/Handler", "../../../Cor iconBanned = document.createElement("span"); iconBanned.innerHTML = ''; iconBanned.classList.add("jsUserStatusBanned", "jsTooltip"); - iconBanned.title = Language.get("wcf.user.status.banned"); + iconBanned.title = (0, Language_1.getPhrase)("wcf.user.status.banned"); userStatusIcons.appendChild(iconBanned); } else if (!banned && iconBanned !== null) { @@ -144,7 +143,7 @@ define(["require", "exports", "tslib", "./Content/Remove/Handler", "../../../Cor iconIsDisabled = document.createElement("span"); iconIsDisabled.innerHTML = ''; iconIsDisabled.classList.add("jsUserStatusIsDisabled", "jsTooltip"); - iconIsDisabled.title = Language.get("wcf.user.status.isDisabled"); + iconIsDisabled.title = (0, Language_1.getPhrase)("wcf.user.status.isDisabled"); userStatusIcons.appendChild(iconIsDisabled); } else if (!isDisabled && iconIsDisabled !== null) { diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Worker.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Worker.js index 1cfbf79f568..321e66379e4 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Worker.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Worker.js @@ -5,11 +5,10 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Language", "../../Ui/Dialog"], function (require, exports, tslib_1, Ajax, Core, Language, Dialog_1) { +define(["require", "exports", "tslib", "../../Ajax", "../../Core", "WoltLabSuite/Core/Language", "../../Ui/Dialog"], function (require, exports, tslib_1, Ajax, Core, Language_1, Dialog_1) { "use strict"; Ajax = tslib_1.__importStar(Ajax); Core = tslib_1.__importStar(Core); - Language = tslib_1.__importStar(Language); Dialog_1 = tslib_1.__importDefault(Dialog_1); class AcpUiWorker { aborted = false; @@ -69,7 +68,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Langua const formSubmit = document.createElement("div"); formSubmit.className = "formSubmit"; formSubmit.innerHTML = - '"; + '"; content.appendChild(formSubmit); Dialog_1.default.rebuild(this); const button = formSubmit.children[0]; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Error.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Error.js index 5c9a63c596b..3469d04b25b 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Error.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Error.js @@ -6,23 +6,22 @@ * @license GNU Lesser General Public License * @since 5.5 */ -define(["require", "exports", "tslib", "../Component/Dialog", "../Core", "../Language", "../StringUtil"], function (require, exports, tslib_1, Dialog_1, Core, Language, StringUtil_1) { +define(["require", "exports", "tslib", "../Component/Dialog", "../Core", "WoltLabSuite/Core/Language", "../StringUtil"], function (require, exports, tslib_1, Dialog_1, Core, Language_1, StringUtil_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.InvalidJson = exports.ExpectedJson = exports.StatusNotOk = exports.ConnectionError = exports.ApiError = void 0; exports.registerGlobalRejectionHandler = registerGlobalRejectionHandler; Core = tslib_1.__importStar(Core); - Language = tslib_1.__importStar(Language); async function genericError(error) { const html = await getErrorHtml(error); if (html instanceof HTMLIFrameElement) { const dialog = (0, Dialog_1.dialogFactory)().fromHtml(`
      ${html.outerHTML}
      `).asAlert(); - dialog.show(Language.get("wcf.global.error.title")); + dialog.show((0, Language_1.getPhrase)("wcf.global.error.title")); dialog.querySelector("dialog").classList.add("dialog--iframe"); } else if (html !== "") { const dialog = (0, Dialog_1.dialogFactory)().fromHtml(html).asAlert(); - dialog.show(Language.get("wcf.global.error.title")); + dialog.show((0, Language_1.getPhrase)("wcf.global.error.title")); } } async function getErrorHtml(error) { @@ -31,7 +30,7 @@ define(["require", "exports", "tslib", "../Component/Dialog", "../Core", "../Lan if (error instanceof ConnectionError) { // `fetch()` will yield a `TypeError` for network errors and CORS violations. if (error.originalError instanceof TypeError) { - message = Language.get("wcf.global.error.ajax.network", { message: error.message }); + message = (0, Language_1.getPhrase)("wcf.global.error.ajax.network", { message: error.message }); } else { message = error.message; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Request.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Request.js index ddf11463af8..171ed3920ff 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Request.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Request.js @@ -7,12 +7,11 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "./Status", "../Core", "../Dom/Change/Listener", "../Language", "../Component/Dialog", "../StringUtil"], function (require, exports, tslib_1, AjaxStatus, Core, Listener_1, Language, Dialog_1, StringUtil_1) { +define(["require", "exports", "tslib", "./Status", "../Core", "../Dom/Change/Listener", "WoltLabSuite/Core/Language", "../Component/Dialog", "../StringUtil"], function (require, exports, tslib_1, AjaxStatus, Core, Listener_1, Language_1, Dialog_1, StringUtil_1) { "use strict"; AjaxStatus = tslib_1.__importStar(AjaxStatus); Core = tslib_1.__importStar(Core); Listener_1 = tslib_1.__importDefault(Listener_1); - Language = tslib_1.__importStar(Language); let _didInit = false; let _ignoreAllErrors = false; /** @@ -250,12 +249,12 @@ define(["require", "exports", "tslib", "./Status", "../Core", "../Dom/Change/Lis const dialog = (0, Dialog_1.dialogFactory)() .fromHtml(`
      ${html.outerHTML}
      `) .asAlert(); - dialog.show(Language.get("wcf.global.error.title")); + dialog.show((0, Language_1.getPhrase)("wcf.global.error.title")); dialog.querySelector("dialog").classList.add("dialog--iframe"); } else if (html) { const dialog = (0, Dialog_1.dialogFactory)().fromHtml(html).asAlert(); - dialog.show(Language.get("wcf.global.error.title")); + dialog.show((0, Language_1.getPhrase)("wcf.global.error.title")); } } this._finalize(xhr, options); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Confirmation/Custom.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Confirmation/Custom.js index d03b6f19d85..3b0a829c4f5 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Confirmation/Custom.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Confirmation/Custom.js @@ -7,11 +7,10 @@ * @license GNU Lesser General Public License * @since 6.0 */ -define(["require", "exports", "tslib", "../Dialog", "../../Language"], function (require, exports, tslib_1, Dialog_1, Language) { +define(["require", "exports", "../Dialog", "WoltLabSuite/Core/Language"], function (require, exports, Dialog_1, Language_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.ConfirmationCustom = void 0; - Language = tslib_1.__importStar(Language); class ConfirmationCustom { #question; constructor(question) { @@ -24,7 +23,7 @@ define(["require", "exports", "tslib", "../Dialog", "../../Language"], function const dialog = (0, Dialog_1.dialogFactory)() .fromHtml(`

      ${message}

      `) .asConfirmation({ - primary: Language.get("wcf.dialog.button.primary.confirm"), + primary: (0, Language_1.getPhrase)("wcf.dialog.button.primary.confirm"), }); dialog.show(this.#question); return new Promise((resolve) => { @@ -36,7 +35,7 @@ define(["require", "exports", "tslib", "../Dialog", "../../Language"], function const dialog = (0, Dialog_1.dialogFactory)() .withoutContent() .asConfirmation({ - primary: Language.get("wcf.dialog.button.primary.confirm"), + primary: (0, Language_1.getPhrase)("wcf.dialog.button.primary.confirm"), }); callback(dialog); dialog.show(this.#question); @@ -59,7 +58,7 @@ define(["require", "exports", "tslib", "../Dialog", "../../Language"], function const dialog = (0, Dialog_1.dialogFactory)() .withoutContent() .asConfirmation({ - primary: Language.get("wcf.dialog.button.primary.confirm"), + primary: (0, Language_1.getPhrase)("wcf.dialog.button.primary.confirm"), }); dialog.show(this.#question); return new Promise((resolve) => { diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Dialog/Controls.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Dialog/Controls.js index 0d0d9c45c9c..c3e15ef674e 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Dialog/Controls.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Dialog/Controls.js @@ -7,11 +7,10 @@ * @license GNU Lesser General Public License * @since 6.0 */ -define(["require", "exports", "tslib", "../../Language"], function (require, exports, tslib_1, Language) { +define(["require", "exports", "WoltLabSuite/Core/Language"], function (require, exports, Language_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.DialogControls = void 0; - Language = tslib_1.__importStar(Language); class DialogControls { #dialog; constructor(dialog) { @@ -22,7 +21,7 @@ define(["require", "exports", "tslib", "../../Language"], function (require, exp cancel: undefined, extra: undefined, isAlert: true, - primary: options?.primary || Language.get("wcf.dialog.button.primary"), + primary: options?.primary || (0, Language_1.getPhrase)("wcf.dialog.button.primary"), }; this.#dialog.attachControls(formControlOptions); return this.#dialog; @@ -32,7 +31,7 @@ define(["require", "exports", "tslib", "../../Language"], function (require, exp cancel: "", extra: undefined, isAlert: true, - primary: options?.primary || Language.get("wcf.dialog.button.primary.confirm"), + primary: options?.primary || (0, Language_1.getPhrase)("wcf.dialog.button.primary.confirm"), }; this.#dialog.attachControls(formControlOptions); return this.#dialog; @@ -42,7 +41,7 @@ define(["require", "exports", "tslib", "../../Language"], function (require, exp cancel: "", extra: options?.extra, isAlert: false, - primary: options?.primary || Language.get("wcf.dialog.button.primary.submit"), + primary: options?.primary || (0, Language_1.getPhrase)("wcf.dialog.button.primary.submit"), }; this.#dialog.attachControls(formControlOptions); return this.#dialog; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/Clipboard.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/Clipboard.js index a3a56b34d26..3d9976407e1 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/Clipboard.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/Clipboard.js @@ -6,7 +6,7 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "../Ajax", "../Core", "../Dom/Change/Listener", "../Dom/Util", "../Event/Handler", "../Language", "../Ui/Confirmation", "../Ui/Dropdown/Simple", "../Ui/Page/Action", "../Ui/Screen"], function (require, exports, tslib_1, Ajax, Core, Listener_1, Util_1, EventHandler, Language, UiConfirmation, Simple_1, UiPageAction, UiScreen) { +define(["require", "exports", "tslib", "../Ajax", "../Core", "../Dom/Change/Listener", "../Dom/Util", "../Event/Handler", "WoltLabSuite/Core/Language", "../Ui/Confirmation", "../Ui/Dropdown/Simple", "../Ui/Page/Action", "../Ui/Screen"], function (require, exports, tslib_1, Ajax, Core, Listener_1, Util_1, EventHandler, Language_1, UiConfirmation, Simple_1, UiPageAction, UiScreen) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.setup = setup; @@ -19,7 +19,6 @@ define(["require", "exports", "tslib", "../Ajax", "../Core", "../Dom/Change/List Listener_1 = tslib_1.__importDefault(Listener_1); Util_1 = tslib_1.__importDefault(Util_1); EventHandler = tslib_1.__importStar(EventHandler); - Language = tslib_1.__importStar(Language); UiConfirmation = tslib_1.__importStar(UiConfirmation); Simple_1 = tslib_1.__importDefault(Simple_1); UiPageAction = tslib_1.__importStar(UiPageAction); @@ -404,7 +403,7 @@ define(["require", "exports", "tslib", "../Ajax", "../Core", "../Dom/Change/List const unmarkAll = document.createElement("li"); unmarkAll.dataset.type = typeName; const label = document.createElement("span"); - label.textContent = Language.get("wcf.clipboard.item.unmarkAll"); + label.textContent = (0, Language_1.getPhrase)("wcf.clipboard.item.unmarkAll"); unmarkAll.appendChild(label); unmarkAll.addEventListener("click", (ev) => this.unmarkAll(ev)); dropdown.appendChild(unmarkAll); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/Map/Route/Planner.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/Map/Route/Planner.js index ac42801f540..97c91d104fe 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/Map/Route/Planner.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/Map/Route/Planner.js @@ -7,11 +7,10 @@ * @woltlabExcludeBundle all * @deprecated 6.0 This feature is discontinued, opening Google Maps in a separate window already offers a route planer. */ -define(["require", "exports", "tslib", "../../../Ajax/Status", "../../../Dom/Util", "../../../Language", "../../../Ui/Dialog"], function (require, exports, tslib_1, AjaxStatus, Util_1, Language, Dialog_1) { +define(["require", "exports", "tslib", "../../../Ajax/Status", "../../../Dom/Util", "WoltLabSuite/Core/Language", "../../../Ui/Dialog"], function (require, exports, tslib_1, AjaxStatus, Util_1, Language_1, Dialog_1) { "use strict"; AjaxStatus = tslib_1.__importStar(AjaxStatus); Util_1 = tslib_1.__importDefault(Util_1); - Language = tslib_1.__importStar(Language); Dialog_1 = tslib_1.__importDefault(Dialog_1); class ControllerMapRoutePlanner { button; @@ -125,7 +124,7 @@ define(["require", "exports", "tslib", "../../../Ajax/Status", "../../../Dom/Uti status !== google.maps.DirectionsStatus.REQUEST_DENIED) { status = google.maps.DirectionsStatus.NOT_FOUND; } - Util_1.default.innerError(this.originInput, Language.get(`wcf.map.route.error.${status.toLowerCase()}`)); + Util_1.default.innerError(this.originInput, (0, Language_1.getPhrase)(`wcf.map.route.error.${status.toLowerCase()}`)); } } /** @@ -144,7 +143,7 @@ define(["require", "exports", "tslib", "../../../Ajax/Status", "../../../Dom/Uti id: this.button.id + "Dialog", options: { onShow: this.initDialog.bind(this), - title: Language.get("wcf.map.route.planner"), + title: (0, Language_1.getPhrase)("wcf.map.route.planner"), }, source: ` - +
      -
      ${Language.get("wcf.map.route.origin")}
      +
      ${(0, Language_1.getPhrase)("wcf.map.route.origin")}
      -
      ${Language.get("wcf.map.route.travelMode")}
      +
      ${(0, Language_1.getPhrase)("wcf.map.route.travelMode")}
      `, diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/User/Notification/Settings.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/User/Notification/Settings.js index 1ed59e5bb79..cb327ae99ee 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/User/Notification/Settings.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/User/Notification/Settings.js @@ -6,11 +6,10 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "../../../Language", "../../../Ui/Dropdown/Reusable"], function (require, exports, tslib_1, Language, UiDropdownReusable) { +define(["require", "exports", "tslib", "WoltLabSuite/Core/Language", "../../../Ui/Dropdown/Reusable"], function (require, exports, tslib_1, Language_1, UiDropdownReusable) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; - Language = tslib_1.__importStar(Language); UiDropdownReusable = tslib_1.__importStar(UiDropdownReusable); let _dropDownMenu; let _objectId = 0; @@ -50,7 +49,7 @@ define(["require", "exports", "tslib", "../../../Language", "../../../Ui/Dropdow else { const link = document.createElement("a"); link.href = "#"; - link.textContent = Language.get(`wcf.user.notification.mailNotificationType.${value}`); + link.textContent = (0, Language_1.getPhrase)(`wcf.user.notification.mailNotificationType.${value}`); listItem.appendChild(link); listItem.dataset.value = value; listItem.addEventListener("click", (ev) => setEmailType(ev)); @@ -79,7 +78,7 @@ define(["require", "exports", "tslib", "../../../Language", "../../../Ui/Dropdow const value = listItem.dataset.value; getCurrentEmailTypeInputElement().value = value; const button = document.querySelector(`.notificationSettingsEmailType[data-object-id="${_objectId}"]`); - button.title = Language.get(`wcf.user.notification.mailNotificationType.${value}`); + button.title = (0, Language_1.getPhrase)(`wcf.user.notification.mailNotificationType.${value}`); const icon = button.querySelector(".jsIconNotificationSettingsEmailType fa-icon"); switch (value) { case "daily": diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js index cf89a7ed805..5acf3a12b0e 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js @@ -5,12 +5,11 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../Core", "./Util", "../Event/Handler", "../Language", "../Ui/Alignment", "../Ui/CloseOverlay", "../Dom/Util", "../Helper/PageOverlay", "focus-trap", "../Helper/Selector"], function (require, exports, tslib_1, Core, DateUtil, EventHandler, Language, UiAlignment, CloseOverlay_1, Util_1, PageOverlay_1, focus_trap_1, Selector_1) { +define(["require", "exports", "tslib", "../Core", "./Util", "../Event/Handler", "WoltLabSuite/Core/Language", "../Ui/Alignment", "../Ui/CloseOverlay", "../Dom/Util", "../Helper/PageOverlay", "focus-trap", "../Helper/Selector"], function (require, exports, tslib_1, Core, DateUtil, EventHandler, Language_1, UiAlignment, CloseOverlay_1, Util_1, PageOverlay_1, focus_trap_1, Selector_1) { "use strict"; Core = tslib_1.__importStar(Core); DateUtil = tslib_1.__importStar(DateUtil); EventHandler = tslib_1.__importStar(EventHandler); - Language = tslib_1.__importStar(Language); UiAlignment = tslib_1.__importStar(UiAlignment); CloseOverlay_1 = tslib_1.__importDefault(CloseOverlay_1); Util_1 = tslib_1.__importDefault(Util_1); @@ -49,8 +48,8 @@ define(["require", "exports", "tslib", "../Core", "./Util", "../Event/Handler", _dateMonthPrevious = document.createElement("button"); _dateMonthPrevious.type = "button"; _dateMonthPrevious.className = "previous jsTooltip"; - _dateMonthPrevious.title = Language.get("wcf.date.datePicker.previousMonth"); - _dateMonthPrevious.setAttribute("aria-label", Language.get("wcf.date.datePicker.previousMonth")); + _dateMonthPrevious.title = (0, Language_1.getPhrase)("wcf.date.datePicker.previousMonth"); + _dateMonthPrevious.setAttribute("aria-label", (0, Language_1.getPhrase)("wcf.date.datePicker.previousMonth")); _dateMonthPrevious.innerHTML = ''; _dateMonthPrevious.addEventListener("click", () => DatePicker.previousMonth()); header.appendChild(_dateMonthPrevious); @@ -58,8 +57,8 @@ define(["require", "exports", "tslib", "../Core", "./Util", "../Event/Handler", header.appendChild(monthYearContainer); _dateMonth = document.createElement("select"); _dateMonth.className = "month jsTooltip"; - _dateMonth.title = Language.get("wcf.date.datePicker.month"); - _dateMonth.setAttribute("aria-label", Language.get("wcf.date.datePicker.month")); + _dateMonth.title = (0, Language_1.getPhrase)("wcf.date.datePicker.month"); + _dateMonth.setAttribute("aria-label", (0, Language_1.getPhrase)("wcf.date.datePicker.month")); _dateMonth.addEventListener("change", changeMonth); monthYearContainer.appendChild(_dateMonth); let months = ""; @@ -71,15 +70,15 @@ define(["require", "exports", "tslib", "../Core", "./Util", "../Event/Handler", _dateMonth.innerHTML = months; _dateYear = document.createElement("select"); _dateYear.className = "year jsTooltip"; - _dateYear.title = Language.get("wcf.date.datePicker.year"); - _dateYear.setAttribute("aria-label", Language.get("wcf.date.datePicker.year")); + _dateYear.title = (0, Language_1.getPhrase)("wcf.date.datePicker.year"); + _dateYear.setAttribute("aria-label", (0, Language_1.getPhrase)("wcf.date.datePicker.year")); _dateYear.addEventListener("change", changeYear); monthYearContainer.appendChild(_dateYear); _dateMonthNext = document.createElement("button"); _dateMonthNext.type = "button"; _dateMonthNext.className = "next jsTooltip"; - _dateMonthNext.title = Language.get("wcf.date.datePicker.nextMonth"); - _dateMonthNext.setAttribute("aria-label", Language.get("wcf.date.datePicker.nextMonth")); + _dateMonthNext.title = (0, Language_1.getPhrase)("wcf.date.datePicker.nextMonth"); + _dateMonthNext.setAttribute("aria-label", (0, Language_1.getPhrase)("wcf.date.datePicker.nextMonth")); _dateMonthNext.innerHTML = ''; _dateMonthNext.addEventListener("click", () => DatePicker.nextMonth()); header.appendChild(_dateMonthNext); @@ -117,8 +116,8 @@ define(["require", "exports", "tslib", "../Core", "./Util", "../Event/Handler", _datePicker.appendChild(_dateTime); _dateHour = document.createElement("select"); _dateHour.className = "hour"; - _dateHour.title = Language.get("wcf.date.datePicker.hour"); - _dateHour.setAttribute("aria-label", Language.get("wcf.date.datePicker.hour")); + _dateHour.title = (0, Language_1.getPhrase)("wcf.date.datePicker.hour"); + _dateHour.setAttribute("aria-label", (0, Language_1.getPhrase)("wcf.date.datePicker.hour")); _dateHour.addEventListener("change", formatValue); const date = new Date(2000, 0, 1); const timeFormatter = new Intl.DateTimeFormat(document.documentElement.lang, { hour: "numeric" }); @@ -145,8 +144,8 @@ define(["require", "exports", "tslib", "../Core", "./Util", "../Event/Handler", _dateTime.appendChild(document.createTextNode("\u00A0:\u00A0")); _dateMinute = document.createElement("select"); _dateMinute.className = "minute"; - _dateMinute.title = Language.get("wcf.date.datePicker.minute"); - _dateMinute.setAttribute("aria-label", Language.get("wcf.date.datePicker.minute")); + _dateMinute.title = (0, Language_1.getPhrase)("wcf.date.datePicker.minute"); + _dateMinute.setAttribute("aria-label", (0, Language_1.getPhrase)("wcf.date.datePicker.minute")); _dateMinute.addEventListener("change", formatValue); tmp = ""; for (let i = 0; i < 60; i++) { @@ -542,7 +541,7 @@ define(["require", "exports", "tslib", "../Core", "./Util", "../Event/Handler", return; } _didInit = true; - _firstDayOfWeek = parseInt(Language.get("wcf.date.firstDayOfTheWeek"), 10); + _firstDayOfWeek = parseInt((0, Language_1.getPhrase)("wcf.date.firstDayOfTheWeek"), 10); (0, Selector_1.wheneverSeen)(`input[type="date"]:not(.inputDatePicker), input[type="datetime"]:not(.inputDatePicker)`, (element) => { const now = new Date(); element.classList.add("inputDatePicker"); @@ -663,10 +662,10 @@ define(["require", "exports", "tslib", "../Core", "./Util", "../Event/Handler", openButton.type = "button"; openButton.className = "inputSuffix button jsTooltip"; if (isTimeOnly) { - openButton.title = Language.getPhrase("wcf.date.datePicker.time"); + openButton.title = (0, Language_1.getPhrase)("wcf.date.datePicker.time"); } else { - openButton.title = Language.getPhrase("wcf.date.datePicker"); + openButton.title = (0, Language_1.getPhrase)("wcf.date.datePicker"); } openButton.setAttribute("aria-haspopup", "true"); openButton.setAttribute("aria-expanded", "false"); @@ -692,10 +691,10 @@ define(["require", "exports", "tslib", "../Core", "./Util", "../Event/Handler", clearButton.type = "button"; clearButton.className = "inputSuffix button jsTooltip"; if (isTimeOnly) { - clearButton.title = Language.getPhrase("wcf.date.datePicker.time.clear"); + clearButton.title = (0, Language_1.getPhrase)("wcf.date.datePicker.time.clear"); } else { - clearButton.title = Language.getPhrase("wcf.date.datePicker.clear"); + clearButton.title = (0, Language_1.getPhrase)("wcf.date.datePicker.clear"); } clearButton.addEventListener("click", () => { if (!element.disabled) { diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Util.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Util.js index 62e8771e1a9..ecf07a67f32 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Util.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Util.js @@ -5,7 +5,7 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../Language"], function (require, exports, tslib_1, Language) { +define(["require", "exports", "WoltLabSuite/Core/Language"], function (require, exports, Language_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.formatDate = formatDate; @@ -15,7 +15,6 @@ define(["require", "exports", "tslib", "../Language"], function (require, export exports.gmdate = gmdate; exports.getTimeElement = getTimeElement; exports.getTimezoneDate = getTimezoneDate; - Language = tslib_1.__importStar(Language); const locale = document.documentElement.lang; const dateFormatter = new Intl.DateTimeFormat(locale, { dateStyle: "long" }); const timeFormatter = new Intl.DateTimeFormat(locale, { @@ -128,11 +127,11 @@ define(["require", "exports", "tslib", "../Language"], function (require, export break; case "l": // `Monday` through `Sunday` (localized) - char = Language.get("__days")[date.getDay()]; + char = (0, Language_1.getPhrase)("__days")[date.getDay()]; break; case "D": // `Mon` through `Sun` (localized) - char = Language.get("__daysShort")[date.getDay()]; + char = (0, Language_1.getPhrase)("__daysShort")[date.getDay()]; break; case "S": // ignore english ordinal suffix @@ -149,11 +148,11 @@ define(["require", "exports", "tslib", "../Language"], function (require, export break; case "F": // `January` through `December` (localized) - char = Language.get("__months")[date.getMonth()]; + char = (0, Language_1.getPhrase)("__months")[date.getMonth()]; break; case "M": // `Jan` through `Dec` (localized) - char = Language.get("__monthsShort")[date.getMonth()]; + char = (0, Language_1.getPhrase)("__monthsShort")[date.getMonth()]; break; // year case "y": diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Element/woltlab-core-dialog-control.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Element/woltlab-core-dialog-control.js index 75e0adb7d53..33bb51ab009 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Element/woltlab-core-dialog-control.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Element/woltlab-core-dialog-control.js @@ -10,11 +10,10 @@ * @license GNU Lesser General Public License * @since 6.0 */ -define(["require", "exports", "tslib", "../Language"], function (require, exports, tslib_1, Language) { +define(["require", "exports", "WoltLabSuite/Core/Language"], function (require, exports, Language_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.WoltlabCoreDialogControlElement = void 0; - Language = tslib_1.__importStar(Language); // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging class WoltlabCoreDialogControlElement extends HTMLElement { #cancelButton; @@ -33,7 +32,7 @@ define(["require", "exports", "tslib", "../Language"], function (require, export get primary() { let label = this.getAttribute("primary"); if (!label) { - label = Language.get("wcf.dialog.button.primary"); + label = (0, Language_1.getPhrase)("wcf.dialog.button.primary"); } return label; } @@ -51,7 +50,7 @@ define(["require", "exports", "tslib", "../Language"], function (require, export return undefined; } if (label === "") { - label = Language.get("wcf.global.confirmation.cancel"); + label = (0, Language_1.getPhrase)("wcf.global.confirmation.cancel"); } return label; } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Element/woltlab-core-dialog.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Element/woltlab-core-dialog.js index 1d9af41d1bd..032be3e559e 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Element/woltlab-core-dialog.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Element/woltlab-core-dialog.js @@ -9,12 +9,11 @@ * @license GNU Lesser General Public License * @since 6.0 */ -define(["require", "exports", "tslib", "tabbable", "../Dom/Util", "../Helper/PageOverlay", "../Language", "../Ui/Screen"], function (require, exports, tslib_1, tabbable_1, Util_1, PageOverlay_1, Language, Screen_1) { +define(["require", "exports", "tslib", "tabbable", "../Dom/Util", "../Helper/PageOverlay", "WoltLabSuite/Core/Language", "../Ui/Screen"], function (require, exports, tslib_1, tabbable_1, Util_1, PageOverlay_1, Language_1, Screen_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.WoltlabCoreDialogElement = void 0; Util_1 = tslib_1.__importDefault(Util_1); - Language = tslib_1.__importStar(Language); const dialogContainer = document.createElement("div"); // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging class WoltlabCoreDialogElement extends HTMLElement { @@ -202,7 +201,7 @@ define(["require", "exports", "tslib", "tabbable", "../Dom/Util", "../Helper/Pag closeButton.type = "button"; closeButton.innerHTML = ''; closeButton.classList.add("dialog__closeButton", "jsTooltip"); - closeButton.title = Language.get("wcf.dialog.button.close"); + closeButton.title = (0, Language_1.getPhrase)("wcf.dialog.button.close"); closeButton.addEventListener("click", () => { if (this.#shouldClose()) { const evt = new CustomEvent("cancel", { cancelable: false }); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Controller/Label.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Controller/Label.js index 747cb984126..1e80efa3df0 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Controller/Label.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Controller/Label.js @@ -6,11 +6,10 @@ * @license GNU Lesser General Public License * @since 5.2 */ -define(["require", "exports", "tslib", "../../../../Core", "../../../../Dom/Util", "../../../../Language", "../../../../Ui/Dropdown/Simple"], function (require, exports, tslib_1, Core, DomUtil, Language, Simple_1) { +define(["require", "exports", "tslib", "../../../../Core", "../../../../Dom/Util", "WoltLabSuite/Core/Language", "../../../../Ui/Dropdown/Simple"], function (require, exports, tslib_1, Core, DomUtil, Language_1, Simple_1) { "use strict"; Core = tslib_1.__importStar(Core); DomUtil = tslib_1.__importStar(DomUtil); - Language = tslib_1.__importStar(Language); Simple_1 = tslib_1.__importDefault(Simple_1); class Label { _formFieldContainer; @@ -54,7 +53,7 @@ define(["require", "exports", "tslib", "../../../../Core", "../../../../Dom/Util listItem.appendChild(span); const label = document.createElement("span"); label.classList.add("badge", "label"); - label.innerHTML = Language.get("wcf.label.withoutSelection"); + label.innerHTML = (0, Language_1.getPhrase)("wcf.label.withoutSelection"); span.appendChild(label); } if (!this._options.forceSelection) { @@ -66,7 +65,7 @@ define(["require", "exports", "tslib", "../../../../Core", "../../../../Dom/Util listItem.appendChild(span); const label = document.createElement("span"); label.classList.add("badge", "label"); - label.innerHTML = Language.get("wcf.label.none"); + label.innerHTML = (0, Language_1.getPhrase)("wcf.label.none"); span.appendChild(label); } dropdownMenu.querySelectorAll("li:not(.dropdownDivider)").forEach((listItem) => { diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Language/Chooser.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Language/Chooser.js index 593a007d82b..02f932711b6 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Language/Chooser.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Language/Chooser.js @@ -5,7 +5,7 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../Core", "../Language", "../Dom/Util", "../Ui/Dropdown/Simple"], function (require, exports, tslib_1, Core, Language, Util_1, Simple_1) { +define(["require", "exports", "tslib", "../Core", "WoltLabSuite/Core/Language", "../Dom/Util", "../Ui/Dropdown/Simple"], function (require, exports, tslib_1, Core, Language_1, Util_1, Simple_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; @@ -14,7 +14,6 @@ define(["require", "exports", "tslib", "../Core", "../Language", "../Dom/Util", exports.removeChooser = removeChooser; exports.setLanguageId = setLanguageId; Core = tslib_1.__importStar(Core); - Language = tslib_1.__importStar(Language); Util_1 = tslib_1.__importDefault(Util_1); Simple_1 = tslib_1.__importDefault(Simple_1); const _choosers = new Map(); @@ -101,7 +100,7 @@ define(["require", "exports", "tslib", "../Core", "../Language", "../Dom/Util", listItem.addEventListener("click", callbackClick); dropdownMenu.appendChild(listItem); const link = document.createElement("a"); - link.textContent = Language.get("wcf.global.language.noSelection"); + link.textContent = (0, Language_1.getPhrase)("wcf.global.language.noSelection"); listItem.appendChild(link); if (languageId === 0) { dropdownToggle.innerHTML = link.innerHTML; @@ -118,7 +117,7 @@ define(["require", "exports", "tslib", "../Core", "../Language", "../Dom/Util", icon.setIcon("question"); div.appendChild(icon); const span = document.createElement("span"); - span.textContent = Language.get("wcf.global.language.noSelection"); + span.textContent = (0, Language_1.getPhrase)("wcf.global.language.noSelection"); span.append(icon); div.appendChild(span); } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Language/Input.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Language/Input.js index 85ebc282209..ab377934a11 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Language/Input.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Language/Input.js @@ -5,7 +5,7 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../Dom/Util", "../Language", "../Ui/Dropdown/Simple", "../StringUtil"], function (require, exports, tslib_1, Util_1, Language, Simple_1, StringUtil) { +define(["require", "exports", "tslib", "../Dom/Util", "WoltLabSuite/Core/Language", "../Ui/Dropdown/Simple", "../StringUtil"], function (require, exports, tslib_1, Util_1, Language_1, Simple_1, StringUtil) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; @@ -18,7 +18,6 @@ define(["require", "exports", "tslib", "../Dom/Util", "../Language", "../Ui/Drop exports.isEnabled = isEnabled; exports.validate = validate; Util_1 = tslib_1.__importDefault(Util_1); - Language = tslib_1.__importStar(Language); Simple_1 = tslib_1.__importDefault(Simple_1); StringUtil = tslib_1.__importStar(StringUtil); const _elements = new Map(); @@ -48,7 +47,7 @@ define(["require", "exports", "tslib", "../Dom/Util", "../Language", "../Ui/Drop const button = document.createElement("span"); button.className = "button dropdownToggle inputPrefix"; const buttonLabel = document.createElement("span"); - buttonLabel.textContent = Language.get("wcf.global.button.disabledI18n"); + buttonLabel.textContent = (0, Language_1.getPhrase)("wcf.global.button.disabledI18n"); button.appendChild(buttonLabel); container.insertBefore(button, element); const dropdownMenu = document.createElement("ul"); @@ -91,7 +90,7 @@ define(["require", "exports", "tslib", "../Dom/Util", "../Language", "../Ui/Drop listItem.dataset.languageId = "0"; listItem.addEventListener("click", callbackClick); const span = document.createElement("span"); - span.textContent = Language.get("wcf.global.button.disabledI18n"); + span.textContent = (0, Language_1.getPhrase)("wcf.global.button.disabledI18n"); listItem.appendChild(span); dropdownMenu.appendChild(listItem); } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js index 4946f3d579f..39edae7a5ca 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js @@ -6,7 +6,7 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "../Ui/Dialog", "../Language/Chooser", "../Language/Input", "../Dom/Util", "../Dom/Traverse", "../Dom/Change/Listener", "../Language", "../Ajax", "./Replace", "../Component/Snackbar"], function (require, exports, tslib_1, UiDialog, LanguageChooser, LanguageInput, DomUtil, DomTraverse, Listener_1, Language, Ajax, Replace_1, Snackbar_1) { +define(["require", "exports", "tslib", "../Ui/Dialog", "../Language/Chooser", "../Language/Input", "../Dom/Util", "../Dom/Traverse", "../Dom/Change/Listener", "WoltLabSuite/Core/Language", "../Ajax", "./Replace", "../Component/Snackbar"], function (require, exports, tslib_1, UiDialog, LanguageChooser, LanguageInput, DomUtil, DomTraverse, Listener_1, Language_1, Ajax, Replace_1, Snackbar_1) { "use strict"; UiDialog = tslib_1.__importStar(UiDialog); LanguageChooser = tslib_1.__importStar(LanguageChooser); @@ -14,7 +14,6 @@ define(["require", "exports", "tslib", "../Ui/Dialog", "../Language/Chooser", ". DomUtil = tslib_1.__importStar(DomUtil); DomTraverse = tslib_1.__importStar(DomTraverse); Listener_1 = tslib_1.__importDefault(Listener_1); - Language = tslib_1.__importStar(Language); Ajax = tslib_1.__importStar(Ajax); Replace_1 = tslib_1.__importDefault(Replace_1); class MediaEditor { @@ -187,19 +186,19 @@ define(["require", "exports", "tslib", "../Ui/Dialog", "../Language/Chooser", ". if (altText && !LanguageInput.validate(altText.id, true)) { hasError = true; if (!altTextError) { - DomUtil.innerError(altText, Language.get("wcf.global.form.error.multilingual")); + DomUtil.innerError(altText, (0, Language_1.getPhrase)("wcf.global.form.error.multilingual")); } } if (caption && !LanguageInput.validate(caption.id, true)) { hasError = true; if (!captionError) { - DomUtil.innerError(caption, Language.get("wcf.global.form.error.multilingual")); + DomUtil.innerError(caption, (0, Language_1.getPhrase)("wcf.global.form.error.multilingual")); } } if (!LanguageInput.validate(title.id, true)) { hasError = true; if (!titleError) { - DomUtil.innerError(title, Language.get("wcf.global.form.error.multilingual")); + DomUtil.innerError(title, (0, Language_1.getPhrase)("wcf.global.form.error.multilingual")); } } this._media.altText = altText ? this.mapToI18nValues(LanguageInput.getValues(altText.id)) : ""; @@ -316,7 +315,7 @@ define(["require", "exports", "tslib", "../Ui/Dialog", "../Language/Chooser", ". options: { backdropCloseOnClick: false, onClose: () => this._close(), - title: Language.get("wcf.media.edit"), + title: (0, Language_1.getPhrase)("wcf.media.edit"), }, source: { after: (content, responseData) => this._initEditor(content, responseData), diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Base.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Base.js index ad0887f1602..e0e92ee6ad3 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Base.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Base.js @@ -6,10 +6,9 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "../../Core", "../../Language", "../../Permission", "../../Dom/Change/Listener", "../../Event/Handler", "../../Dom/Traverse", "../../Dom/Util", "../../Ui/Dialog", "../../Controller/Clipboard", "../../Ui/Pagination", "../../StringUtil", "./Search", "../Upload", "../Editor", "../Clipboard", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Core, Language, Permission, DomChangeListener, EventHandler, DomTraverse, DomUtil, UiDialog, Clipboard, Pagination_1, StringUtil, Search_1, Upload_1, Editor_1, MediaClipboard, Snackbar_1) { +define(["require", "exports", "tslib", "../../Core", "WoltLabSuite/Core/Language", "../../Permission", "../../Dom/Change/Listener", "../../Event/Handler", "../../Dom/Traverse", "../../Dom/Util", "../../Ui/Dialog", "../../Controller/Clipboard", "../../Ui/Pagination", "../../StringUtil", "./Search", "../Upload", "../Editor", "../Clipboard", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Core, Language_1, Permission, DomChangeListener, EventHandler, DomTraverse, DomUtil, UiDialog, Clipboard, Pagination_1, StringUtil, Search_1, Upload_1, Editor_1, MediaClipboard, Snackbar_1) { "use strict"; Core = tslib_1.__importStar(Core); - Language = tslib_1.__importStar(Language); Permission = tslib_1.__importStar(Permission); DomChangeListener = tslib_1.__importStar(DomChangeListener); EventHandler = tslib_1.__importStar(EventHandler); @@ -39,7 +38,7 @@ define(["require", "exports", "tslib", "../../Core", "../../Language", "../../Pe _options; constructor(options) { this._options = Core.extend({ - dialogTitle: Language.get("wcf.media.manager"), + dialogTitle: (0, Language_1.getPhrase)("wcf.media.manager"), imagesOnly: false, minSearchLength: 3, }, options); @@ -283,7 +282,7 @@ define(["require", "exports", "tslib", "../../Core", "../../Language", "../../Pe if (info === null) { info = document.createElement("p"); info.className = "info"; - info.textContent = Language.get("wcf.media.search.noResults"); + info.textContent = (0, Language_1.getPhrase)("wcf.media.search.noResults"); } DomUtil.show(info); DomUtil.insertAfter(info, this._mediaManagerMediaList); @@ -425,23 +424,23 @@ define(["require", "exports", "tslib", "../../Core", "../../Language", "../../Pe editButton.dataset.objectId = media.mediaID.toString(); buttons.appendChild(editButton); editButton.innerHTML = ` - + - + `; const deleteButton = document.createElement("li"); deleteButton.classList.add("jsObjectAction"); deleteButton.dataset.objectAction = "delete"; // use temporary title to not unescape html in filename const uuid = Core.getUuid(); - deleteButton.dataset.confirmMessage = StringUtil.unescapeHTML(Language.get("wcf.media.delete.confirmMessage", { + deleteButton.dataset.confirmMessage = StringUtil.unescapeHTML((0, Language_1.getPhrase)("wcf.media.delete.confirmMessage", { title: uuid, })).replace(uuid, StringUtil.escapeHTML(media.filename)); buttons.appendChild(deleteButton); deleteButton.innerHTML = ` - + - + `; } } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Editor.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Editor.js index 20b63472c2c..df4abc188a6 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Editor.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Editor.js @@ -6,7 +6,7 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "./Base", "../../Core", "../../Event/Handler", "../../Dom/Traverse", "../../Language", "../../Ui/Dialog", "../../Controller/Clipboard", "../../Dom/Util", "../../Component/Ckeditor/Event", "WoltLabSuite/Core/StringUtil"], function (require, exports, tslib_1, Base_1, Core, EventHandler, DomTraverse, Language, UiDialog, Clipboard, Util_1, Event_1, StringUtil_1) { +define(["require", "exports", "tslib", "./Base", "../../Core", "../../Event/Handler", "../../Dom/Traverse", "WoltLabSuite/Core/Language", "../../Ui/Dialog", "../../Controller/Clipboard", "../../Dom/Util", "../../Component/Ckeditor/Event", "WoltLabSuite/Core/StringUtil"], function (require, exports, tslib_1, Base_1, Core, EventHandler, DomTraverse, Language_1, UiDialog, Clipboard, Util_1, Event_1, StringUtil_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.MediaManagerEditor = void 0; @@ -14,7 +14,6 @@ define(["require", "exports", "tslib", "./Base", "../../Core", "../../Event/Hand Core = tslib_1.__importStar(Core); EventHandler = tslib_1.__importStar(EventHandler); DomTraverse = tslib_1.__importStar(DomTraverse); - Language = tslib_1.__importStar(Language); UiDialog = tslib_1.__importStar(UiDialog); Clipboard = tslib_1.__importStar(Clipboard); Util_1 = tslib_1.__importDefault(Util_1); @@ -77,14 +76,14 @@ define(["require", "exports", "tslib", "./Base", "../../Core", "../../Event/Hand '"; }); - thumbnailOptions += '"; + thumbnailOptions += '"; const dialog = `
      -
      ${Language.get("wcf.media.insert.imageSize")}
      +
      ${(0, Language_1.getPhrase)("wcf.media.insert.imageSize")}
      `; @@ -107,8 +106,8 @@ define(["require", "exports", "tslib", "../../Language", "../../StringUtil", ".. invertPermissions(invert) { const aclListContainerDt = document.getElementById(this.prefix + "aclListContainerDt"); const aclSearchInputLabel = document.getElementById(this.prefix + "aclSearchInputLabel"); - aclListContainerDt.textContent = Language.get(invert ? "wcf.acl.access.denied" : "wcf.acl.access.granted"); - aclSearchInputLabel.textContent = Language.get(invert ? "wcf.acl.access.deny" : "wcf.acl.access.grant"); + aclListContainerDt.textContent = (0, Language_1.getPhrase)(invert ? "wcf.acl.access.denied" : "wcf.acl.access.granted"); + aclSearchInputLabel.textContent = (0, Language_1.getPhrase)(invert ? "wcf.acl.access.deny" : "wcf.acl.access.grant"); } } return UiAclSimple; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Alignment.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Alignment.js index 00e9a526fa3..f3ba422ff5f 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Alignment.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Alignment.js @@ -5,14 +5,13 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../Core", "../Dom/Traverse", "../Dom/Util", "../Language", "../Environment"], function (require, exports, tslib_1, Core, DomTraverse, Util_1, Language, Environment) { +define(["require", "exports", "tslib", "../Core", "../Dom/Traverse", "../Dom/Util", "WoltLabSuite/Core/Language", "../Environment"], function (require, exports, tslib_1, Core, DomTraverse, Util_1, Language_1, Environment) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.set = set; Core = tslib_1.__importStar(Core); DomTraverse = tslib_1.__importStar(DomTraverse); Util_1 = tslib_1.__importDefault(Util_1); - Language = tslib_1.__importStar(Language); Environment = tslib_1.__importStar(Environment); /** * Calculates top/bottom position and verifies if the element would be still within the page's boundaries. @@ -172,7 +171,7 @@ define(["require", "exports", "tslib", "../Core", "../Dom/Traverse", "../Dom/Uti } } // in rtl languages we simply swap the value for 'horizontal' - if (Language.get("wcf.global.pageDirection") === "rtl") { + if ((0, Language_1.getPhrase)("wcf.global.pageDirection") === "rtl") { options.horizontal = options.horizontal === "left" ? "right" : "left"; } if (horizontal === null || !horizontal.result) { diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Article/Search.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Article/Search.js index e2f39974561..5ad83ea031d 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Article/Search.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Article/Search.js @@ -1,13 +1,12 @@ /** * @woltlabExcludeBundle all */ -define(["require", "exports", "tslib", "../../Ajax", "../../Dom/Util", "../../Language", "../../StringUtil", "../Dialog"], function (require, exports, tslib_1, Ajax, Util_1, Language, StringUtil, Dialog_1) { +define(["require", "exports", "tslib", "../../Ajax", "../../Dom/Util", "WoltLabSuite/Core/Language", "../../StringUtil", "../Dialog"], function (require, exports, tslib_1, Ajax, Util_1, Language_1, StringUtil, Dialog_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.open = open; Ajax = tslib_1.__importStar(Ajax); Util_1 = tslib_1.__importDefault(Util_1); - Language = tslib_1.__importStar(Language); StringUtil = tslib_1.__importStar(StringUtil); Dialog_1 = tslib_1.__importDefault(Dialog_1); class UiArticleSearch { @@ -24,7 +23,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Dom/Util", "../../La const inputContainer = this.searchInput.parentElement; const value = this.searchInput.value.trim(); if (value.length < 3) { - Util_1.default.innerError(inputContainer, Language.get("wcf.article.search.error.tooShort")); + Util_1.default.innerError(inputContainer, (0, Language_1.getPhrase)("wcf.article.search.error.tooShort")); return; } else { @@ -67,7 +66,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Dom/Util", "../../La } else { const parent = this.searchInput.parentElement; - Util_1.default.innerError(parent, Language.get("wcf.article.search.error.noResults")); + Util_1.default.innerError(parent, (0, Language_1.getPhrase)("wcf.article.search.error.noResults")); } } _ajaxSetup() { @@ -97,12 +96,12 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Dom/Util", "../../La onShow: () => { this.searchInput.focus(); }, - title: Language.get("wcf.article.search"), + title: (0, Language_1.getPhrase)("wcf.article.search"), }, source: `
      - +
      @@ -114,7 +113,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Dom/Util", "../../La
      `, diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Color/Picker.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Color/Picker.js index 7e4c8315c4d..4aac61b166a 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Color/Picker.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Color/Picker.js @@ -7,12 +7,11 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle all */ -define(["require", "exports", "tslib", "../../Core", "../Dialog", "../../Dom/Util", "../../Language", "../../ColorUtil"], function (require, exports, tslib_1, Core, Dialog_1, Util_1, Language, ColorUtil) { +define(["require", "exports", "tslib", "../../Core", "../Dialog", "../../Dom/Util", "WoltLabSuite/Core/Language", "../../ColorUtil"], function (require, exports, tslib_1, Core, Dialog_1, Util_1, Language_1, ColorUtil) { "use strict"; Core = tslib_1.__importStar(Core); Dialog_1 = tslib_1.__importDefault(Dialog_1); Util_1 = tslib_1.__importDefault(Util_1); - Language = tslib_1.__importStar(Language); ColorUtil = tslib_1.__importStar(ColorUtil); class UiColorPicker { channels = new Map(); @@ -50,19 +49,19 @@ define(["require", "exports", "tslib", "../../Core", "../Dialog", "../../Dom/Uti
      -
      ${Language.get("wcf.style.colorPicker.hue")}
      +
      ${(0, Language_1.getPhrase)("wcf.style.colorPicker.hue")}
      -
      ${Language.get("wcf.style.colorPicker.saturation")}
      +
      ${(0, Language_1.getPhrase)("wcf.style.colorPicker.saturation")}
      -
      ${Language.get("wcf.style.colorPicker.lightness")}
      +
      ${(0, Language_1.getPhrase)("wcf.style.colorPicker.lightness")}
      @@ -71,7 +70,7 @@ define(["require", "exports", "tslib", "../../Core", "../Dialog", "../../Dom/Uti
      -
      ${Language.get("wcf.style.colorPicker.opacity")}
      +
      ${(0, Language_1.getPhrase)("wcf.style.colorPicker.opacity")}
      @@ -80,7 +79,7 @@ define(["require", "exports", "tslib", "../../Core", "../Dialog", "../../Dom/Uti
      -
      ${Language.get("wcf.style.colorPicker.color")}
      +
      ${(0, Language_1.getPhrase)("wcf.style.colorPicker.color")}
      rgba( @@ -92,7 +91,7 @@ define(["require", "exports", "tslib", "../../Core", "../Dialog", "../../Dom/Uti
      -
      ${Language.get("wcf.style.colorPicker.hexAlpha")}
      +
      ${(0, Language_1.getPhrase)("wcf.style.colorPicker.hexAlpha")}
      # @@ -102,18 +101,18 @@ define(["require", "exports", "tslib", "../../Core", "../Dialog", "../../Dom/Uti
      - ${Language.get("wcf.style.colorPicker.new")} + ${(0, Language_1.getPhrase)("wcf.style.colorPicker.new")}
      - ${Language.get("wcf.style.colorPicker.current")} + ${(0, Language_1.getPhrase)("wcf.style.colorPicker.current")}
      - +
      `, options: { @@ -158,7 +157,7 @@ define(["require", "exports", "tslib", "../../Core", "../Dialog", "../../Dom/Uti this.colorTextInput.focus(); this.colorTextInput.select(); }, - title: Language.get("wcf.style.colorPicker"), + title: (0, Language_1.getPhrase)("wcf.style.colorPicker"), }, }; } @@ -199,7 +198,7 @@ define(["require", "exports", "tslib", "../../Core", "../Dialog", "../../Dom/Uti color = `#${color}`; } else { - Util_1.default.innerError(colorTextInput, Language.get("wcf.style.colorPicker.error.invalidColor")); + Util_1.default.innerError(colorTextInput, (0, Language_1.getPhrase)("wcf.style.colorPicker.error.invalidColor")); return; } } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Confirmation.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Confirmation.js index 3825ccf59ab..8a838c6b376 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Confirmation.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Confirmation.js @@ -6,13 +6,12 @@ * @license GNU Lesser General Public License * @deprecated 6.0 Use `confirmationFactory()` instead. */ -define(["require", "exports", "tslib", "../Core", "../Language", "./Dialog"], function (require, exports, tslib_1, Core, Language, Dialog_1) { +define(["require", "exports", "tslib", "../Core", "WoltLabSuite/Core/Language", "./Dialog"], function (require, exports, tslib_1, Core, Language_1, Dialog_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.show = show; exports.getContentElement = getContentElement; Core = tslib_1.__importStar(Core); - Language = tslib_1.__importStar(Language); Dialog_1 = tslib_1.__importDefault(Dialog_1); class UiConfirmation { _active = false; @@ -39,12 +38,12 @@ define(["require", "exports", "tslib", "../Core", "../Language", "./Dialog"], fu this.confirmButton.type = "button"; this.confirmButton.dataset.type = "submit"; this.confirmButton.classList.add("button", "buttonPrimary"); - this.confirmButton.textContent = Language.get("wcf.global.confirmation.confirm"); + this.confirmButton.textContent = (0, Language_1.getPhrase)("wcf.global.confirmation.confirm"); formSubmit.appendChild(this.confirmButton); const cancelButton = document.createElement("button"); cancelButton.type = "button"; cancelButton.classList.add("button"); - cancelButton.textContent = Language.get("wcf.global.confirmation.cancel"); + cancelButton.textContent = (0, Language_1.getPhrase)("wcf.global.confirmation.cancel"); cancelButton.addEventListener("click", () => { Dialog_1.default.close(this); }); @@ -114,7 +113,7 @@ define(["require", "exports", "tslib", "../Core", "../Language", "./Dialog"], fu options: { onClose: this._onClose.bind(this), onShow: this._onShow.bind(this), - title: Language.get("wcf.global.confirmation.title"), + title: (0, Language_1.getPhrase)("wcf.global.confirmation.title"), }, }; } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js index bd0ec196d4b..e8e91753843 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js @@ -6,13 +6,12 @@ * @license GNU Lesser General Public License * @deprecated 6.0 Use `dialogFactory()` instead. */ -define(["require", "exports", "tslib", "../Core", "../Dom/Change/Listener", "./Screen", "../Dom/Util", "../Language", "../Environment", "../Event/Handler", "./CloseOverlay", "focus-trap", "../Helper/PageOverlay"], function (require, exports, tslib_1, Core, Listener_1, UiScreen, Util_1, Language, Environment, EventHandler, CloseOverlay_1, focus_trap_1, PageOverlay_1) { +define(["require", "exports", "tslib", "../Core", "../Dom/Change/Listener", "./Screen", "../Dom/Util", "WoltLabSuite/Core/Language", "../Environment", "../Event/Handler", "./CloseOverlay", "focus-trap", "../Helper/PageOverlay"], function (require, exports, tslib_1, Core, Listener_1, UiScreen, Util_1, Language_1, Environment, EventHandler, CloseOverlay_1, focus_trap_1, PageOverlay_1) { "use strict"; Core = tslib_1.__importStar(Core); Listener_1 = tslib_1.__importDefault(Listener_1); UiScreen = tslib_1.__importStar(UiScreen); Util_1 = tslib_1.__importDefault(Util_1); - Language = tslib_1.__importStar(Language); Environment = tslib_1.__importStar(Environment); EventHandler = tslib_1.__importStar(EventHandler); CloseOverlay_1 = tslib_1.__importDefault(CloseOverlay_1); @@ -219,7 +218,7 @@ define(["require", "exports", "tslib", "../Core", "../Dom/Change/Listener", "./S options = Core.extend({ backdropCloseOnClick: true, closable: true, - closeButtonLabel: Language.get("wcf.global.button.close"), + closeButtonLabel: (0, Language_1.getPhrase)("wcf.global.button.close"), closeConfirmMessage: "", disableContentPadding: false, title: "", @@ -585,7 +584,7 @@ define(["require", "exports", "tslib", "../Core", "../Dom/Change/Listener", "./S data.inputFields.forEach((inputField) => { if (inputField.required) { if (inputField.value.trim() === "") { - Util_1.default.innerError(inputField, Language.get("wcf.global.form.error.empty")); + Util_1.default.innerError(inputField, (0, Language_1.getPhrase)("wcf.global.form.error.empty")); inputField.closest("dl")?.classList.add("formError"); isValid = false; } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Feed/Dialog.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Feed/Dialog.js index cd445c7a952..68f7640de9f 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Feed/Dialog.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Feed/Dialog.js @@ -5,13 +5,12 @@ * @copyright 2001-2021 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../Dialog", "../../StringUtil", "../../Language", "../../Clipboard", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Dialog_1, StringUtil, Language, Clipboard, Snackbar_1) { +define(["require", "exports", "tslib", "../Dialog", "../../StringUtil", "WoltLabSuite/Core/Language", "../../Clipboard", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Dialog_1, StringUtil, Language_1, Clipboard, Snackbar_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.setup = setup; Dialog_1 = tslib_1.__importDefault(Dialog_1); StringUtil = tslib_1.__importStar(StringUtil); - Language = tslib_1.__importStar(Language); Clipboard = tslib_1.__importStar(Clipboard); /** * Copies one of links to the clipboard. @@ -21,7 +20,7 @@ define(["require", "exports", "tslib", "../Dialog", "../../StringUtil", "../../L const target = event.currentTarget; const input = target.parentNode.querySelector('input[type="text"]'); await Clipboard.copyTextToClipboard(input.value); - (0, Snackbar_1.showSuccessSnackbar)(Language.get("wcf.global.rss.copy.success")); + (0, Snackbar_1.showSuccessSnackbar)((0, Language_1.getPhrase)("wcf.global.rss.copy.success")); } /** * Opens the dialog with an anonymous and personalized link after clicking on the RSS feed link. @@ -36,13 +35,13 @@ define(["require", "exports", "tslib", "../Dialog", "../../StringUtil", "../../L let withoutAccessToken = ""; if (!window.FORCE_LOGIN) { withoutAccessToken = ` -${Language.get("wcf.global.rss.accessToken.info")} +${(0, Language_1.getPhrase)("wcf.global.rss.accessToken.info")}
      -
      ${Language.get("wcf.global.rss.withoutAccessToken")}
      +
      ${(0, Language_1.getPhrase)("wcf.global.rss.withoutAccessToken")}
      -
      @@ -52,11 +51,11 @@ define(["require", "exports", "tslib", "../Dialog", "../../StringUtil", "../../L Dialog_1.default.openStatic("feedLinkDialog", ` ${withoutAccessToken}
      -
      ${Language.get("wcf.global.rss.withAccessToken")}
      +
      ${(0, Language_1.getPhrase)("wcf.global.rss.withAccessToken")}
      -
      @@ -68,7 +67,7 @@ ${withoutAccessToken} .querySelectorAll(".feedLinkDialogCopyButton") .forEach((el) => el.addEventListener("click", (ev) => copy(ev))); }, - title: alternative.title || Language.get("wcf.global.button.rss"), + title: alternative.title || (0, Language_1.getPhrase)("wcf.global.button.rss"), }); } function setup() { diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/File/Delete.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/File/Delete.js index 398ff38f765..0bb54809f71 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/File/Delete.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/File/Delete.js @@ -7,12 +7,11 @@ * @since 5.2 * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Change/Listener", "../../Language"], function (require, exports, tslib_1, Ajax, Core, Listener_1, Language) { +define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Change/Listener", "WoltLabSuite/Core/Language"], function (require, exports, tslib_1, Ajax, Core, Listener_1, Language_1) { "use strict"; Ajax = tslib_1.__importStar(Ajax); Core = tslib_1.__importStar(Core); Listener_1 = tslib_1.__importDefault(Listener_1); - Language = tslib_1.__importStar(Language); class UiFileDelete { buttonContainer; containers = new Map(); @@ -77,7 +76,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Ch const li = document.createElement("li"); const span = document.createElement("span"); span.className = "button jsDeleteButton small"; - span.textContent = Language.get("wcf.global.button.delete"); + span.textContent = (0, Language_1.getPhrase)("wcf.global.button.delete"); li.appendChild(span); buttonGroup.appendChild(li); li.addEventListener("click", this.deleteElement.bind(this, elementData.uniqueFileId)); @@ -111,7 +110,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Ch this.deleteButton = document.createElement("p"); this.deleteButton.className = "button deleteButton"; const span = document.createElement("span"); - span.textContent = Language.get("wcf.global.button.delete"); + span.textContent = (0, Language_1.getPhrase)("wcf.global.button.delete"); this.deleteButton.appendChild(span); this.buttonContainer.appendChild(this.deleteButton); this.deleteButton.addEventListener("click", this.deleteElement.bind(this, elementData.uniqueFileId)); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/File/Upload.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/File/Upload.js index cb8454ee345..2db73d7184b 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/File/Upload.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/File/Upload.js @@ -7,12 +7,11 @@ * @since 5.2 * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "../../Core", "./Delete", "../../Dom/Util", "../../Language", "../../Upload"], function (require, exports, tslib_1, Core, Delete_1, Util_1, Language, Upload_1) { +define(["require", "exports", "tslib", "../../Core", "./Delete", "../../Dom/Util", "WoltLabSuite/Core/Language", "../../Upload"], function (require, exports, tslib_1, Core, Delete_1, Util_1, Language_1, Upload_1) { "use strict"; Core = tslib_1.__importStar(Core); Delete_1 = tslib_1.__importDefault(Delete_1); Util_1 = tslib_1.__importDefault(Util_1); - Language = tslib_1.__importStar(Language); Upload_1 = tslib_1.__importDefault(Upload_1); class FileUpload extends Upload_1.default { _deleteHandler; @@ -72,7 +71,7 @@ define(["require", "exports", "tslib", "../../Core", "./Delete", "../../Dom/Util icon.setIcon("ban"); const innerError = document.createElement("span"); innerError.className = "innerError"; - innerError.textContent = Language.get("wcf.upload.error.uploadFailed"); + innerError.textContent = (0, Language_1.getPhrase)("wcf.upload.error.uploadFailed"); small.insertAdjacentElement("afterend", innerError); }); throw new Error(`Upload failed: ${data.message}`); @@ -172,7 +171,7 @@ define(["require", "exports", "tslib", "../../Core", "./Delete", "../../Dom/Util innerError.className = "innerError"; this._buttonContainer.insertAdjacentElement("afterend", innerError); } - innerError.textContent = Language.get("wcf.upload.error.reachedRemainingLimit", { + innerError.textContent = (0, Language_1.getPhrase)("wcf.upload.error.reachedRemainingLimit", { maxFiles: this._options.maxFiles - this.countFiles(), }); return false; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList.js index d3203c27bd6..55b27479b5d 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList.js @@ -5,7 +5,7 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../Core", "../Dom/Traverse", "../Language", "./Suggestion", "./Dropdown/Simple", "../Dom/Util"], function (require, exports, tslib_1, Core, DomTraverse, Language, Suggestion_1, Simple_1, Util_1) { +define(["require", "exports", "tslib", "../Core", "../Dom/Traverse", "WoltLabSuite/Core/Language", "./Suggestion", "./Dropdown/Simple", "../Dom/Util"], function (require, exports, tslib_1, Core, DomTraverse, Language_1, Suggestion_1, Simple_1, Util_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; @@ -13,7 +13,6 @@ define(["require", "exports", "tslib", "../Core", "../Dom/Traverse", "../Languag exports.setValues = setValues; Core = tslib_1.__importStar(Core); DomTraverse = tslib_1.__importStar(DomTraverse); - Language = tslib_1.__importStar(Language); Suggestion_1 = tslib_1.__importDefault(Suggestion_1); Simple_1 = tslib_1.__importDefault(Simple_1); Util_1 = tslib_1.__importDefault(Util_1); @@ -58,7 +57,7 @@ define(["require", "exports", "tslib", "../Core", "../Dom/Traverse", "../Languag } const limitReached = document.createElement("span"); limitReached.className = "inputItemListLimitReached"; - limitReached.textContent = Language.get("wcf.global.form.input.maxItems"); + limitReached.textContent = (0, Language_1.getPhrase)("wcf.global.form.input.maxItems"); Util_1.default.hide(limitReached); listItem.appendChild(limitReached); let shadow = null; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/Filter.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/Filter.js index 9a21f68d80f..18188e8b66c 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/Filter.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/Filter.js @@ -6,11 +6,10 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "../../Core", "../../Dom/Util", "../../Language", "../../StringUtil", "../Dropdown/Simple"], function (require, exports, tslib_1, Core, Util_1, Language, StringUtil, Simple_1) { +define(["require", "exports", "tslib", "../../Core", "../../Dom/Util", "WoltLabSuite/Core/Language", "../../StringUtil", "../Dropdown/Simple"], function (require, exports, tslib_1, Core, Util_1, Language_1, StringUtil, Simple_1) { "use strict"; Core = tslib_1.__importStar(Core); Util_1 = tslib_1.__importDefault(Util_1); - Language = tslib_1.__importStar(Language); StringUtil = tslib_1.__importStar(StringUtil); Simple_1 = tslib_1.__importDefault(Simple_1); class UiItemListFilter { @@ -60,7 +59,7 @@ define(["require", "exports", "tslib", "../../Core", "../../Dom/Util", "../../La const input = document.createElement("input"); input.className = "long"; input.type = "text"; - input.placeholder = Language.get("wcf.global.filter.placeholder"); + input.placeholder = (0, Language_1.getPhrase)("wcf.global.filter.placeholder"); input.addEventListener("keydown", (event) => { if (event.key === "Enter") { event.preventDefault(); @@ -70,7 +69,7 @@ define(["require", "exports", "tslib", "../../Core", "../../Dom/Util", "../../La this._clearButton = document.createElement("a"); this._clearButton.href = "#"; this._clearButton.className = "button inputSuffix disabled jsTooltip"; - this._clearButton.title = Language.get("wcf.global.filter.button.clear"); + this._clearButton.title = (0, Language_1.getPhrase)("wcf.global.filter.button.clear"); this._clearButton.innerHTML = ''; this._clearButton.addEventListener("click", (event) => { event.preventDefault(); @@ -82,7 +81,7 @@ define(["require", "exports", "tslib", "../../Core", "../../Dom/Util", "../../La const visibilityButton = document.createElement("a"); visibilityButton.href = "#"; visibilityButton.className = "button inputSuffix jsTooltip"; - visibilityButton.title = Language.get("wcf.global.filter.button.visibility"); + visibilityButton.title = (0, Language_1.getPhrase)("wcf.global.filter.button.visibility"); visibilityButton.innerHTML = ''; visibilityButton.addEventListener("click", (ev) => this._toggleVisibility(ev)); inputAddon.appendChild(visibilityButton); @@ -186,7 +185,7 @@ define(["require", "exports", "tslib", "../../Core", "../../Dom/Util", "../../La this._container.insertAdjacentElement("beforeend", this._element); } this._value = value; - Util_1.default.innerError(this._container, hasVisibleItems ? false : Language.get("wcf.global.filter.error.noMatches")); + Util_1.default.innerError(this._container, hasVisibleItems ? false : (0, Language_1.getPhrase)("wcf.global.filter.error.noMatches")); } /** * Toggles the visibility mode for marked items. @@ -202,7 +201,7 @@ define(["require", "exports", "tslib", "../../Core", "../../Dom/Util", "../../La const link = document.createElement("a"); link.dataset.type = type; link.href = "#"; - link.textContent = Language.get(`wcf.global.filter.visibility.${type}`); + link.textContent = (0, Language_1.getPhrase)(`wcf.global.filter.visibility.${type}`); link.addEventListener("click", (ev) => this._setVisibility(ev)); const li = document.createElement("li"); li.appendChild(link); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/LineBreakSeparatedText.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/LineBreakSeparatedText.js index df074cc7872..955f8509600 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/LineBreakSeparatedText.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/LineBreakSeparatedText.js @@ -8,12 +8,11 @@ * @since 5.4 * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "../Confirmation", "../../Language", "../../Dom/Util"], function (require, exports, tslib_1, UiConfirmation, Language, Util_1) { +define(["require", "exports", "tslib", "../Confirmation", "WoltLabSuite/Core/Language", "../../Dom/Util"], function (require, exports, tslib_1, UiConfirmation, Language_1, Util_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.UiItemListLineBreakSeparatedText = void 0; UiConfirmation = tslib_1.__importStar(UiConfirmation); - Language = tslib_1.__importStar(Language); Util_1 = tslib_1.__importDefault(Util_1); class UiItemListLineBreakSeparatedText { addButton = undefined; @@ -67,14 +66,14 @@ define(["require", "exports", "tslib", "../Confirmation", "../../Language", "../ const itemInput = this.itemInput; const item = itemInput.value.trim(); if (item === "") { - Util_1.default.innerError(itemInput.parentElement, Language.get("wcf.global.form.error.empty")); + Util_1.default.innerError(itemInput.parentElement, (0, Language_1.getPhrase)("wcf.global.form.error.empty")); } else if (!this.items.has(item)) { this.insertItem(item); this.resetInput(); } else { - Util_1.default.innerError(itemInput.parentElement, Language.get("wcf.acp.option.type.lineBreakSeparatedText.error.duplicate", { + Util_1.default.innerError(itemInput.parentElement, (0, Language_1.getPhrase)("wcf.acp.option.type.lineBreakSeparatedText.error.duplicate", { item, }), true); } @@ -94,7 +93,7 @@ define(["require", "exports", "tslib", "../Confirmation", "../../Language", "../ this.itemInput = document.createElement("input"); this.itemInput.classList.add("long"); this.itemInput.type = "text"; - this.itemInput.placeholder = Language.get("wcf.acp.option.type.lineBreakSeparatedText.placeholder"); + this.itemInput.placeholder = (0, Language_1.getPhrase)("wcf.acp.option.type.lineBreakSeparatedText.placeholder"); this.itemInput.addEventListener("keydown", (ev) => this.keydown(ev)); this.itemInput.addEventListener("paste", (ev) => this.paste(ev)); inputAddon.appendChild(this.itemInput); @@ -104,14 +103,14 @@ define(["require", "exports", "tslib", "../Confirmation", "../../Language", "../ this.addButton = document.createElement("a"); this.addButton.href = "#"; this.addButton.classList.add("button", "inputSuffix", "jsTooltip"); - this.addButton.title = Language.get("wcf.global.button.add"); + this.addButton.title = (0, Language_1.getPhrase)("wcf.global.button.add"); this.addButton.innerHTML = ''; this.addButton.addEventListener("click", (ev) => this.addItem(ev)); inputAddon.appendChild(this.addButton); this.clearButton = document.createElement("a"); this.clearButton.href = "#"; this.clearButton.classList.add("button", "inputSuffix", "jsTooltip"); - this.clearButton.title = Language.get("wcf.global.button.delete"); + this.clearButton.title = (0, Language_1.getPhrase)("wcf.global.button.delete"); this.clearButton.innerHTML = ''; this.clearButton.addEventListener("click", (ev) => this.clearList(ev)); inputAddon.appendChild(this.clearButton); @@ -133,7 +132,7 @@ define(["require", "exports", "tslib", "../Confirmation", "../../Language", "../ this.items.clear(); this.hideList(); }, - message: Language.get("wcf.acp.option.type.lineBreakSeparatedText.clearList.confirmMessage"), + message: (0, Language_1.getPhrase)("wcf.acp.option.type.lineBreakSeparatedText.clearList.confirmMessage"), messageIsHtml: true, }); } @@ -154,7 +153,7 @@ define(["require", "exports", "tslib", "../Confirmation", "../../Language", "../ } this.items.delete(item); }, - message: Language.get("wcf.button.delete.confirmMessage", { + message: (0, Language_1.getPhrase)("wcf.button.delete.confirmMessage", { objectTitle: item, }), messageIsHtml: true, @@ -204,7 +203,7 @@ define(["require", "exports", "tslib", "../Confirmation", "../../Language", "../ const deleteButton = document.createElement("span"); deleteButton.innerHTML = ''; deleteButton.classList.add("jsDeleteItem", "jsTooltip", "pointer"); - deleteButton.title = Language.get("wcf.global.button.delete"); + deleteButton.title = (0, Language_1.getPhrase)("wcf.global.button.delete"); deleteButton.addEventListener("click", (ev) => this.deleteItem(ev)); itemElement.append(deleteButton); itemElement.append(document.createTextNode(" ")); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/Static.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/Static.js index d980d324dca..8f1f3676303 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/Static.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/Static.js @@ -5,7 +5,7 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../Core", "../../Dom/Traverse", "../../Language", "../Dropdown/Simple"], function (require, exports, tslib_1, Core, DomTraverse, Language, Simple_1) { +define(["require", "exports", "tslib", "../../Core", "../../Dom/Traverse", "WoltLabSuite/Core/Language", "../Dropdown/Simple"], function (require, exports, tslib_1, Core, DomTraverse, Language_1, Simple_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; @@ -13,7 +13,6 @@ define(["require", "exports", "tslib", "../../Core", "../../Dom/Traverse", "../. exports.setValues = setValues; Core = tslib_1.__importStar(Core); DomTraverse = tslib_1.__importStar(DomTraverse); - Language = tslib_1.__importStar(Language); Simple_1 = tslib_1.__importDefault(Simple_1); const _data = new Map(); /** @@ -87,7 +86,7 @@ define(["require", "exports", "tslib", "../../Core", "../../Dom/Traverse", "../. } else if (!data.element.disabled) { data.element.disabled = true; - data.element.placeholder = Language.get("wcf.global.form.input.maxItems"); + data.element.placeholder = (0, Language_1.getPhrase)("wcf.global.form.input.maxItems"); } } /** diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/InlineEditor.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/InlineEditor.js index 5830a2bda6c..e9a49d0a23e 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/InlineEditor.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/InlineEditor.js @@ -5,14 +5,13 @@ * @copyright 2001-2021 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "WoltLabSuite/Core/Component/Ckeditor/Event", "../../Ajax", "../../Component/Ckeditor", "../../Core", "../../Dom/Change/Listener", "../../Dom/Util", "../../Event/Handler", "../../Language", "../Dropdown/Reusable", "../Notification", "../Screen", "../Scroll", "WoltLabSuite/Core/Component/Quote/Storage", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Event_1, Ajax, Ckeditor_1, Core, Listener_1, Util_1, EventHandler, Language, UiDropdownReusable, UiNotification, UiScreen, UiScroll, Storage_1, Snackbar_1) { +define(["require", "exports", "tslib", "WoltLabSuite/Core/Component/Ckeditor/Event", "../../Ajax", "../../Component/Ckeditor", "../../Core", "../../Dom/Change/Listener", "../../Dom/Util", "../../Event/Handler", "WoltLabSuite/Core/Language", "../Dropdown/Reusable", "../Notification", "../Screen", "../Scroll", "WoltLabSuite/Core/Component/Quote/Storage", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Event_1, Ajax, Ckeditor_1, Core, Listener_1, Util_1, EventHandler, Language_1, UiDropdownReusable, UiNotification, UiScreen, UiScroll, Storage_1, Snackbar_1) { "use strict"; Ajax = tslib_1.__importStar(Ajax); Core = tslib_1.__importStar(Core); Listener_1 = tslib_1.__importDefault(Listener_1); Util_1 = tslib_1.__importDefault(Util_1); EventHandler = tslib_1.__importStar(EventHandler); - Language = tslib_1.__importStar(Language); UiDropdownReusable = tslib_1.__importStar(UiDropdownReusable); UiNotification = tslib_1.__importStar(UiNotification); UiScreen = tslib_1.__importStar(UiScreen); @@ -165,7 +164,7 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Component/Ckeditor/Eve } else { const label = document.createElement("span"); - label.textContent = Language.get(item.label); + label.textContent = (0, Language_1.getPhrase)(item.label); listItem.appendChild(label); if (item.item === "editItem") { listItem.addEventListener("click", (ev) => this._click(null, ev)); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/Manager.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/Manager.js index 1364abfba1e..4c3c1c825e5 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/Manager.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/Manager.js @@ -5,12 +5,11 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Change/Listener", "../../Language", "../../StringUtil"], function (require, exports, tslib_1, Ajax, Core, Listener_1, Language, StringUtil) { +define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Change/Listener", "WoltLabSuite/Core/Language", "../../StringUtil"], function (require, exports, tslib_1, Ajax, Core, Listener_1, Language_1, StringUtil) { "use strict"; Ajax = tslib_1.__importStar(Ajax); Core = tslib_1.__importStar(Core); Listener_1 = tslib_1.__importDefault(Listener_1); - Language = tslib_1.__importStar(Language); StringUtil = tslib_1.__importStar(StringUtil); class UiMessageManager { _elements = new Map(); @@ -174,7 +173,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Ch } badge = document.createElement("span"); badge.className = `badge label ${badgeColor} ${className}`; - badge.textContent = Language.get(phrase); + badge.textContent = (0, Language_1.getPhrase)(phrase); const listItem = document.createElement("li"); listItem.appendChild(badge); messageStatus.appendChild(listItem); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/Reply.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/Reply.js index 322f16ae4ac..dd96ff0fe60 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/Reply.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/Reply.js @@ -6,12 +6,11 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Event/Handler", "../../Language", "../../Dom/Change/Listener", "../../Dom/Util", "../Dialog", "../../User", "../../Controller/Captcha", "../Scroll", "../../Component/Ckeditor", "WoltLabSuite/Core/Component/Ckeditor/Event", "WoltLabSuite/Core/Component/Quote/Storage", "WoltLabSuite/Core/Component/Quote/Message", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Ajax, Core, EventHandler, Language, Listener_1, Util_1, Dialog_1, User_1, Captcha_1, UiScroll, Ckeditor_1, Event_1, Storage_1, Message_1, Snackbar_1) { +define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Event/Handler", "WoltLabSuite/Core/Language", "../../Dom/Change/Listener", "../../Dom/Util", "../Dialog", "../../User", "../../Controller/Captcha", "../Scroll", "../../Component/Ckeditor", "WoltLabSuite/Core/Component/Ckeditor/Event", "WoltLabSuite/Core/Component/Quote/Storage", "WoltLabSuite/Core/Component/Quote/Message", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Ajax, Core, EventHandler, Language_1, Listener_1, Util_1, Dialog_1, User_1, Captcha_1, UiScroll, Ckeditor_1, Event_1, Storage_1, Message_1, Snackbar_1) { "use strict"; Ajax = tslib_1.__importStar(Ajax); Core = tslib_1.__importStar(Core); EventHandler = tslib_1.__importStar(EventHandler); - Language = tslib_1.__importStar(Language); Listener_1 = tslib_1.__importDefault(Listener_1); Util_1 = tslib_1.__importDefault(Util_1); Dialog_1 = tslib_1.__importDefault(Dialog_1); @@ -67,7 +66,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Event/ const dialogContent = target.closest(".dialogContent"); const usernameInput = dialogContent.querySelector("input[name=username]"); if (usernameInput.value === "") { - Util_1.default.innerError(usernameInput, Language.get("wcf.global.form.error.empty")); + Util_1.default.innerError(usernameInput, (0, Language_1.getPhrase)("wcf.global.form.error.empty")); usernameInput.closest("dl").classList.add("formError"); return; } @@ -161,7 +160,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Event/ // check if editor contains actual content const message = this._getCKEditor().getHtml(); if (message === "") { - this.throwError(this._getCKEditor().element, Language.get("wcf.global.form.error.empty")); + this.throwError(this._getCKEditor().element, (0, Language_1.getPhrase)("wcf.global.form.error.empty")); return false; } const data = { @@ -180,7 +179,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Event/ * @param {string} message error message */ throwError(element, message) { - Util_1.default.innerError(element, message === "empty" ? Language.get("wcf.global.form.error.empty") : message); + Util_1.default.innerError(element, message === "empty" ? (0, Language_1.getPhrase)("wcf.global.form.error.empty") : message); } /** * Displays a loading spinner while the request is processed by the server. @@ -271,7 +270,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Event/ window.history.replaceState(undefined, "", `#${elementId}`); UiScroll.element(document.getElementById(elementId)); } - (0, Snackbar_1.showSuccessSnackbar)(Language.get(this._options.successMessage)); + (0, Snackbar_1.showSuccessSnackbar)((0, Language_1.getPhrase)(this._options.successMessage)); if (this._options.quoteManager) { this._options.quoteManager.countQuotes(); } @@ -295,7 +294,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Event/ Captcha_1.default.delete(guestDialogId); } }, - title: Language.get("wcf.global.confirmation.title"), + title: (0, Language_1.getPhrase)("wcf.global.confirmation.title"), }); const dialog = Dialog_1.default.getDialog(guestDialogId); const submit = dialog.content.querySelector("input[type=submit]"); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Mobile.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Mobile.js index 5cae5ca4fec..2595baeb33b 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Mobile.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Mobile.js @@ -5,7 +5,7 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "focus-trap", "../Core", "../Dom/Change/Listener", "../Dom/Util", "../Environment", "./Alignment", "./CloseOverlay", "./Dropdown/Reusable", "./Page/Menu/Main", "./Page/Menu/User", "./Screen", "../Language"], function (require, exports, tslib_1, focus_trap_1, Core, Listener_1, Util_1, Environment, UiAlignment, CloseOverlay_1, UiDropdownReusable, Main_1, User_1, UiScreen, Language) { +define(["require", "exports", "tslib", "focus-trap", "../Core", "../Dom/Change/Listener", "../Dom/Util", "../Environment", "./Alignment", "./CloseOverlay", "./Dropdown/Reusable", "./Page/Menu/Main", "./Page/Menu/User", "./Screen", "WoltLabSuite/Core/Language"], function (require, exports, tslib_1, focus_trap_1, Core, Listener_1, Util_1, Environment, UiAlignment, CloseOverlay_1, UiDropdownReusable, Main_1, User_1, UiScreen, Language_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.setup = setup; @@ -23,7 +23,6 @@ define(["require", "exports", "tslib", "focus-trap", "../Core", "../Dom/Change/L CloseOverlay_1 = tslib_1.__importDefault(CloseOverlay_1); UiDropdownReusable = tslib_1.__importStar(UiDropdownReusable); UiScreen = tslib_1.__importStar(UiScreen); - Language = tslib_1.__importStar(Language); let _dropdownMenu = null; let _dropdownMenuMessage = null; let _enabled = false; @@ -101,7 +100,7 @@ define(["require", "exports", "tslib", "focus-trap", "../Core", "../Dom/Change/L if (buttonWrapper === null) { buttonWrapper = document.createElement("li"); buttonWrapper.innerHTML = ` - `; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Object/Action.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Object/Action.js index 315ee5042e0..f91ffb8927e 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Object/Action.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Object/Action.js @@ -5,14 +5,13 @@ * @copyright 2001-2021 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../Ajax", "../../Event/Handler", "../Confirmation", "../../Language", "../../StringUtil", "../../Dom/Change/Listener"], function (require, exports, tslib_1, Ajax, EventHandler, UiConfirmation, Language, StringUtil, Listener_1) { +define(["require", "exports", "tslib", "../../Ajax", "../../Event/Handler", "../Confirmation", "WoltLabSuite/Core/Language", "../../StringUtil", "../../Dom/Change/Listener"], function (require, exports, tslib_1, Ajax, EventHandler, UiConfirmation, Language_1, StringUtil, Listener_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.setup = setup; Ajax = tslib_1.__importStar(Ajax); EventHandler = tslib_1.__importStar(EventHandler); UiConfirmation = tslib_1.__importStar(UiConfirmation); - Language = tslib_1.__importStar(Language); StringUtil = tslib_1.__importStar(StringUtil); Listener_1 = tslib_1.__importDefault(Listener_1); const containerSelector = ".jsObjectActionContainer[data-object-action-class-name]"; @@ -67,7 +66,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Event/Handler", "../ if (actionElement.dataset.confirmMessage) { UiConfirmation.show({ confirm: sendRequest, - message: Language.get(actionElement.dataset.confirmMessage), + message: (0, Language_1.getPhrase)(actionElement.dataset.confirmMessage), messageIsHtml: true, }); } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Object/Action/Toggle.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Object/Action/Toggle.js index 10d10bfbc91..deadf123a10 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Object/Action/Toggle.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Object/Action/Toggle.js @@ -5,11 +5,10 @@ * @copyright 2001-2021 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../../Language", "./Handler"], function (require, exports, tslib_1, Language, Handler_1) { +define(["require", "exports", "tslib", "WoltLabSuite/Core/Language", "./Handler"], function (require, exports, tslib_1, Language_1, Handler_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.setup = setup; - Language = tslib_1.__importStar(Language); Handler_1 = tslib_1.__importDefault(Handler_1); function toggleObject(data) { const actionElement = data.objectElement.querySelector('.jsObjectAction[data-object-action="toggle"]'); @@ -20,12 +19,12 @@ define(["require", "exports", "tslib", "../../../Language", "./Handler"], functi if (icon) { if (icon.name === "square") { icon.setIcon("square-check"); - const newTitle = actionElement.dataset.disableTitle || Language.get("wcf.global.button.disable"); + const newTitle = actionElement.dataset.disableTitle || (0, Language_1.getPhrase)("wcf.global.button.disable"); actionElement.title = newTitle; } else { icon.setIcon("square"); - const newTitle = actionElement.dataset.enableTitle || Language.get("wcf.global.button.enable"); + const newTitle = actionElement.dataset.enableTitle || (0, Language_1.getPhrase)("wcf.global.button.enable"); actionElement.title = newTitle; } } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Action.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Action.js index cb7e6a7795f..f750c9cb89f 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Action.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Action.js @@ -5,7 +5,7 @@ * @copyright 2001-2020 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../Core", "../../Language", "../../Ui/Screen"], function (require, exports, tslib_1, Core, Language, UiScreen) { +define(["require", "exports", "tslib", "../../Core", "WoltLabSuite/Core/Language", "../../Ui/Screen"], function (require, exports, tslib_1, Core, Language_1, UiScreen) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.setup = setup; @@ -16,7 +16,6 @@ define(["require", "exports", "tslib", "../../Core", "../../Language", "../../Ui exports.hide = hide; exports.show = show; Core = tslib_1.__importStar(Core); - Language = tslib_1.__importStar(Language); UiScreen = tslib_1.__importStar(UiScreen); const _buttons = new Map(); let _container; @@ -32,7 +31,7 @@ define(["require", "exports", "tslib", "../../Core", "../../Language", "../../Ui const button = document.createElement("button"); button.type = "button"; button.classList.add("button", "buttonPrimary", "pageActionButtonToTop", "initiallyHidden", "jsTooltip"); - button.title = Language.get("wcf.global.scrollUp"); + button.title = (0, Language_1.getPhrase)("wcf.global.scrollUp"); button.setAttribute("aria-hidden", "true"); button.innerHTML = ''; button.addEventListener("click", scrollToTop); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Header/Menu.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Header/Menu.js index 03677ea949a..7925ee10cf9 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Header/Menu.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Header/Menu.js @@ -5,12 +5,11 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../../Environment", "../../../Language", "../../Screen"], function (require, exports, tslib_1, Environment, Language, UiScreen) { +define(["require", "exports", "tslib", "../../../Environment", "WoltLabSuite/Core/Language", "../../Screen"], function (require, exports, tslib_1, Environment, Language_1, UiScreen) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; Environment = tslib_1.__importStar(Environment); - Language = tslib_1.__importStar(Language); UiScreen = tslib_1.__importStar(UiScreen); let _enabled = false; let _buttonShowNext; @@ -160,13 +159,13 @@ define(["require", "exports", "tslib", "../../../Environment", "../../../Languag const showMenuButton = document.createElement("button"); showMenuButton.type = "button"; showMenuButton.className = "visuallyHidden"; - showMenuButton.setAttribute("aria-label", Language.get("wcf.global.button.showMenu")); + showMenuButton.setAttribute("aria-label", (0, Language_1.getPhrase)("wcf.global.button.showMenu")); element.insertBefore(showMenuButton, link.nextSibling); let showMenu = false; showMenuButton.addEventListener("click", () => { showMenu = !showMenu; link.setAttribute("aria-expanded", showMenu ? "true" : "false"); - showMenuButton.setAttribute("aria-label", Language.get(showMenu ? "wcf.global.button.hideMenu" : "wcf.global.button.showMenu")); + showMenuButton.setAttribute("aria-label", (0, Language_1.getPhrase)(showMenu ? "wcf.global.button.hideMenu" : "wcf.global.button.showMenu")); }); }); } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/JumpTo.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/JumpTo.js index b4050e8b720..6bf853a2083 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/JumpTo.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/JumpTo.js @@ -5,11 +5,10 @@ * @copyright 2001-2019 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../../Language", "../Dialog"], function (require, exports, tslib_1, Language, Dialog_1) { +define(["require", "exports", "tslib", "WoltLabSuite/Core/Language", "../Dialog"], function (require, exports, tslib_1, Language_1, Dialog_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; - Language = tslib_1.__importStar(Language); Dialog_1 = tslib_1.__importDefault(Dialog_1); class UiPageJumpTo { activeElement; @@ -55,7 +54,7 @@ define(["require", "exports", "tslib", "../../Language", "../Dialog"], function this.input.value = pages; this.input.max = pages; this.input.select(); - this.description.textContent = Language.get("wcf.page.jumpTo.description").replace(/#pages#/, pages); + this.description.textContent = (0, Language_1.getPhrase)("wcf.page.jumpTo.description").replace(/#pages#/, pages); } /** * Handles changes to the page number input field. @@ -80,14 +79,14 @@ define(["require", "exports", "tslib", "../../Language", "../Dialog"], function } _dialogSetup() { const source = `
      -
      +
      - +
      `; return { id: "paginationOverlay", @@ -99,7 +98,7 @@ define(["require", "exports", "tslib", "../../Language", "../Dialog"], function this.submitButton = content.querySelector("button"); this.submitButton.addEventListener("click", () => this.submit()); }, - title: Language.get("wcf.global.page.pagination"), + title: (0, Language_1.getPhrase)("wcf.global.page.pagination"), }, source: source, }; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/Main.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/Main.js index e363e5c10d2..58170a831fa 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/Main.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/Main.js @@ -5,12 +5,11 @@ * @copyright 2001-2022 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "./Container", "../../../Language", "../../../Dom/Util", "../../Dropdown/Simple"], function (require, exports, tslib_1, Container_1, Language, Util_1, DropDownSimple) { +define(["require", "exports", "tslib", "./Container", "WoltLabSuite/Core/Language", "../../../Dom/Util", "../../Dropdown/Simple"], function (require, exports, tslib_1, Container_1, Language_1, Util_1, DropDownSimple) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.PageMenuMain = void 0; Container_1 = tslib_1.__importDefault(Container_1); - Language = tslib_1.__importStar(Language); Util_1 = tslib_1.__importDefault(Util_1); DropDownSimple = tslib_1.__importStar(DropDownSimple); class PageMenuMain { @@ -151,7 +150,7 @@ define(["require", "exports", "tslib", "./Container", "../../../Language", "../. counter: 0, depth: 0, identifier: "language", - title: Language.get("wcf.user.language"), + title: (0, Language_1.getPhrase)("wcf.user.language"), icon, }, ]; @@ -274,7 +273,7 @@ define(["require", "exports", "tslib", "./Container", "../../../Language", "../. button.innerHTML = ''; let ariaLabel = menuItem.title; if (menuItem.link) { - ariaLabel = Language.get("wcf.menu.page.button.toggle", { title: menuItem.title }); + ariaLabel = (0, Language_1.getPhrase)("wcf.menu.page.button.toggle", { title: menuItem.title }); } button.setAttribute("aria-label", ariaLabel); const list = this.buildMenuItemList(menuItem.children, isLanguageSelection); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/User.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/User.js index 018200254e7..3a3a072a853 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/User.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/User.js @@ -6,13 +6,12 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "./Container", "../../../Language", "../../User/Menu/Manager", "../../../Dom/Util", "../../User/Menu/ControlPanel", "../../../Event/Handler", "../../Screen"], function (require, exports, tslib_1, Container_1, Language, Manager_1, Util_1, ControlPanel_1, EventHandler, Screen_1) { +define(["require", "exports", "tslib", "./Container", "WoltLabSuite/Core/Language", "../../User/Menu/Manager", "../../../Dom/Util", "../../User/Menu/ControlPanel", "../../../Event/Handler", "../../Screen"], function (require, exports, tslib_1, Container_1, Language_1, Manager_1, Util_1, ControlPanel_1, EventHandler, Screen_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.PageMenuUser = void 0; exports.hasValidUserMenu = hasValidUserMenu; Container_1 = tslib_1.__importDefault(Container_1); - Language = tslib_1.__importStar(Language); Util_1 = tslib_1.__importDefault(Util_1); EventHandler = tslib_1.__importStar(EventHandler); class PageMenuUser { @@ -243,7 +242,7 @@ define(["require", "exports", "tslib", "./Container", "../../../Language", "../. const tabList = document.createElement("div"); tabList.classList.add("pageMenuUserTabList"); tabList.setAttribute("role", "tablist"); - tabList.setAttribute("aria-label", Language.get("wcf.menu.user")); + tabList.setAttribute("aria-label", (0, Language_1.getPhrase)("wcf.menu.user")); tabContainer.append(tabList); this.buildControlPanelTab(tabList, tabContainer); (0, Manager_1.getUserMenuProviders)().forEach((provider) => { diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Search.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Search.js index 8e4137b9951..de6fcb30db5 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Search.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Search.js @@ -1,13 +1,12 @@ /** * @woltlabExcludeBundle all */ -define(["require", "exports", "tslib", "../../Ajax", "../../Dom/Util", "../../Language", "../../StringUtil", "../Dialog"], function (require, exports, tslib_1, Ajax, Util_1, Language, StringUtil, Dialog_1) { +define(["require", "exports", "tslib", "../../Ajax", "../../Dom/Util", "WoltLabSuite/Core/Language", "../../StringUtil", "../Dialog"], function (require, exports, tslib_1, Ajax, Util_1, Language_1, StringUtil, Dialog_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.open = open; Ajax = tslib_1.__importStar(Ajax); Util_1 = tslib_1.__importDefault(Util_1); - Language = tslib_1.__importStar(Language); StringUtil = tslib_1.__importStar(StringUtil); Dialog_1 = tslib_1.__importDefault(Dialog_1); class UiPageSearch { @@ -24,7 +23,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Dom/Util", "../../La const inputContainer = this.searchInput.parentNode; const value = this.searchInput.value.trim(); if (value.length < 3) { - Util_1.default.innerError(inputContainer, Language.get("wcf.page.search.error.tooShort")); + Util_1.default.innerError(inputContainer, (0, Language_1.getPhrase)("wcf.page.search.error.tooShort")); return; } else { @@ -64,7 +63,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Dom/Util", "../../La }); } else { - Util_1.default.innerError(this.searchInput.parentElement, Language.get("wcf.page.search.error.noResults")); + Util_1.default.innerError(this.searchInput.parentElement, (0, Language_1.getPhrase)("wcf.page.search.error.noResults")); } } _ajaxSetup() { @@ -93,11 +92,11 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Dom/Util", "../../La onShow: () => { this.searchInput.focus(); }, - title: Language.get("wcf.page.search"), + title: (0, Language_1.getPhrase)("wcf.page.search"), }, source: `
      -
      +
      @@ -108,7 +107,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Dom/Util", "../../La
      `, diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Search/Handler.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Search/Handler.js index 4c3aacdcc0c..de9ccae35d4 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Search/Handler.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Search/Handler.js @@ -7,11 +7,10 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle all */ -define(["require", "exports", "tslib", "../../../Language", "../../../StringUtil", "../../../Dom/Util", "../../Dialog", "./Input"], function (require, exports, tslib_1, Language, StringUtil, Util_1, Dialog_1, Input_1) { +define(["require", "exports", "tslib", "WoltLabSuite/Core/Language", "../../../StringUtil", "../../../Dom/Util", "../../Dialog", "./Input"], function (require, exports, tslib_1, Language_1, StringUtil, Util_1, Dialog_1, Input_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.open = open; - Language = tslib_1.__importStar(Language); StringUtil = tslib_1.__importStar(StringUtil); Util_1 = tslib_1.__importDefault(Util_1); Dialog_1 = tslib_1.__importDefault(Dialog_1); @@ -30,7 +29,7 @@ define(["require", "exports", "tslib", "../../../Language", "../../../StringUtil this.callbackSuccess = callback; Dialog_1.default.open(this); Dialog_1.default.setTitle(this, title); - this.searchInputLabel.textContent = Language.get(labelLanguageItem || "wcf.page.pageObjectID.search.terms"); + this.searchInputLabel.textContent = (0, Language_1.getPhrase)(labelLanguageItem || "wcf.page.pageObjectID.search.terms"); this._getSearchInputHandler().setPageId(pageId); } /** @@ -39,7 +38,7 @@ define(["require", "exports", "tslib", "../../../Language", "../../../StringUtil buildList(data) { this.resetList(); if (!Array.isArray(data.returnValues) || data.returnValues.length === 0) { - Util_1.default.innerError(this.searchInput, Language.get("wcf.page.pageObjectID.search.noResults")); + Util_1.default.innerError(this.searchInput, (0, Language_1.getPhrase)("wcf.page.pageObjectID.search.noResults")); return; } data.returnValues.forEach((item) => { @@ -47,7 +46,7 @@ define(["require", "exports", "tslib", "../../../Language", "../../../StringUtil if (Array.isArray(image)) { const [iconName, forceSolid] = image; image = ` - `; @@ -123,7 +122,7 @@ define(["require", "exports", "tslib", "../../../Language", "../../../StringUtil source: `
      - +
      @@ -132,7 +131,7 @@ define(["require", "exports", "tslib", "../../../Language", "../../../StringUtil
      -

      ${Language.get("wcf.page.pageObjectID.search.results")}

      +

      ${(0, Language_1.getPhrase)("wcf.page.pageObjectID.search.results")}

        `, diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Password.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Password.js index d4fe3779410..93ad9fd182e 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Password.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Password.js @@ -5,12 +5,11 @@ * @copyright 2001-2021 WoltLab GmbH * @license GNU Lesser General Public License */ -define(["require", "exports", "tslib", "../Dom/Change/Listener", "../Language"], function (require, exports, tslib_1, Listener_1, Language) { +define(["require", "exports", "tslib", "../Dom/Change/Listener", "WoltLabSuite/Core/Language"], function (require, exports, tslib_1, Listener_1, Language_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.setup = setup; Listener_1 = tslib_1.__importDefault(Listener_1); - Language = tslib_1.__importStar(Language); const _knownElements = new WeakSet(); function setup() { initElements(); @@ -32,7 +31,7 @@ define(["require", "exports", "tslib", "../Dom/Change/Listener", "../Language"], inputAddon.appendChild(input); const button = document.createElement("button"); button.type = "button"; - button.title = Language.get("wcf.global.form.password.button.show"); + button.title = (0, Language_1.getPhrase)("wcf.global.form.password.button.show"); button.classList.add("button", "inputSuffix", "jsTooltip"); inputAddon.appendChild(button); const icon = document.createElement("fa-icon"); @@ -56,12 +55,12 @@ define(["require", "exports", "tslib", "../Dom/Change/Listener", "../Language"], function toggle(input, button, icon) { if (input.type === "password") { icon.setIcon("eye-slash"); - button.dataset.tooltip = Language.get("wcf.global.form.password.button.hide"); + button.dataset.tooltip = (0, Language_1.getPhrase)("wcf.global.form.password.button.hide"); input.type = "text"; } else { icon.setIcon("eye"); - button.dataset.tooltip = Language.get("wcf.global.form.password.button.show"); + button.dataset.tooltip = (0, Language_1.getPhrase)("wcf.global.form.password.button.show"); input.type = "password"; } } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Editor.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Editor.js index cdda12fa6c9..8f288ce4081 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Editor.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Editor.js @@ -6,10 +6,9 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle all */ -define(["require", "exports", "tslib", "../../Core", "../../Language", "../Sortable/List", "../../Event/Handler", "../../Date/Picker", "../../Component/Ckeditor/Event", "WoltLabSuite/Core/Dom/Util"], function (require, exports, tslib_1, Core, Language, List_1, EventHandler, DatePicker, Event_1, Util_1) { +define(["require", "exports", "tslib", "../../Core", "WoltLabSuite/Core/Language", "../Sortable/List", "../../Event/Handler", "../../Date/Picker", "../../Component/Ckeditor/Event", "WoltLabSuite/Core/Dom/Util"], function (require, exports, tslib_1, Core, Language_1, List_1, EventHandler, DatePicker, Event_1, Util_1) { "use strict"; Core = tslib_1.__importStar(Core); - Language = tslib_1.__importStar(Language); List_1 = tslib_1.__importDefault(List_1); EventHandler = tslib_1.__importStar(EventHandler); DatePicker = tslib_1.__importStar(DatePicker); @@ -119,14 +118,14 @@ define(["require", "exports", "tslib", "../../Core", "../../Language", "../Sorta addButton.type = "button"; addButton.innerHTML = ''; addButton.classList.add("jsTooltip", "jsAddOption"); - addButton.title = Language.get("wcf.poll.button.addOption"); + addButton.title = (0, Language_1.getPhrase)("wcf.poll.button.addOption"); addButton.addEventListener("click", () => this.createOption()); const deleteButton = document.createElement("button"); deleteButton.classList.add("button", "small"); deleteButton.type = "button"; deleteButton.innerHTML = ''; deleteButton.classList.add("jsTooltip", "jsDeleteOption"); - deleteButton.title = Language.get("wcf.poll.button.removeOption"); + deleteButton.title = (0, Language_1.getPhrase)("wcf.poll.button.removeOption"); deleteButton.addEventListener("click", () => this.removeOption(deleteButton)); // input field const optionInput = document.createElement("input"); @@ -166,7 +165,7 @@ define(["require", "exports", "tslib", "../../Core", "../../Language", "../Sorta case "pollMaxVotes": { let fieldName = data.returnValues.fieldName.replace("poll", ""); fieldName = fieldName.charAt(0).toLowerCase() + fieldName.slice(1); - Util_1.default.innerError(document.getElementById(this.wysiwygId + data.returnValues.fieldName), Language.get("wcf.poll." + fieldName + ".error." + data.returnValues.errorType), true); + Util_1.default.innerError(document.getElementById(this.wysiwygId + data.returnValues.fieldName), (0, Language_1.getPhrase)("wcf.poll." + fieldName + ".error." + data.returnValues.errorType), true); data.cancel = true; break; } @@ -284,13 +283,13 @@ define(["require", "exports", "tslib", "../../Core", "../../Language", "../Sorta } }); if (nonEmptyOptionCount === 0) { - data.api.throwError(this.container, Language.get("wcf.global.form.error.empty")); + data.api.throwError(this.container, (0, Language_1.getPhrase)("wcf.global.form.error.empty")); data.valid = false; } else { const maxVotes = ~~this.maxVotesField.value; if (maxVotes && maxVotes > nonEmptyOptionCount) { - data.api.throwError(this.maxVotesField.parentElement, Language.get("wcf.poll.maxVotes.error.invalid")); + data.api.throwError(this.maxVotesField.parentElement, (0, Language_1.getPhrase)("wcf.poll.maxVotes.error.invalid")); data.valid = false; } else { diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Activity/Recent.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Activity/Recent.js index 7c5d0d71aed..1996097d216 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Activity/Recent.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Activity/Recent.js @@ -2,11 +2,10 @@ * @woltlabExcludeBundle all * @deprecated 6.1 use `WoltLabSuite/Core/Components/User/RecentActivity/Loader` instead */ -define(["require", "exports", "tslib", "../../../Ajax", "../../../Core", "../../../Language", "../../../Dom/Util"], function (require, exports, tslib_1, Ajax, Core, Language, Util_1) { +define(["require", "exports", "tslib", "../../../Ajax", "../../../Core", "WoltLabSuite/Core/Language", "../../../Dom/Util"], function (require, exports, tslib_1, Ajax, Core, Language_1, Util_1) { "use strict"; Ajax = tslib_1.__importStar(Ajax); Core = tslib_1.__importStar(Core); - Language = tslib_1.__importStar(Language); Util_1 = tslib_1.__importDefault(Util_1); class UiUserActivityRecent { containerId; @@ -20,12 +19,12 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Core", "../../ showMoreItem.className = "showMore"; if (this.list.childElementCount) { showMoreItem.innerHTML = - '"; + '"; const button = showMoreItem.children[0]; button.addEventListener("click", (ev) => this.showMore(ev)); } else { - showMoreItem.innerHTML = "" + Language.get("wcf.user.recentActivity.noMoreEntries") + ""; + showMoreItem.innerHTML = "" + (0, Language_1.getPhrase)("wcf.user.recentActivity.noMoreEntries") + ""; } this.list.appendChild(showMoreItem); this.showMoreItem = showMoreItem; @@ -70,7 +69,7 @@ define(["require", "exports", "tslib", "../../../Ajax", "../../../Core", "../../ button.disabled = false; } else { - this.showMoreItem.innerHTML = "" + Language.get("wcf.user.recentActivity.noMoreEntries") + ""; + this.showMoreItem.innerHTML = "" + (0, Language_1.getPhrase)("wcf.user.recentActivity.noMoreEntries") + ""; } } _ajaxSetup() { diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Editor.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Editor.js index f4574ce1566..52b378a77ed 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Editor.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Editor.js @@ -6,14 +6,13 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle all */ -define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Util", "../../Language", "../../StringUtil", "../Dialog", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Ajax, Core, Util_1, Language, StringUtil, Dialog_1, Snackbar_1) { +define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Util", "WoltLabSuite/Core/Language", "../../StringUtil", "../Dialog", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Ajax, Core, Util_1, Language_1, StringUtil, Dialog_1, Snackbar_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.init = init; Ajax = tslib_1.__importStar(Ajax); Core = tslib_1.__importStar(Core); Util_1 = tslib_1.__importDefault(Util_1); - Language = tslib_1.__importStar(Language); StringUtil = tslib_1.__importStar(StringUtil); Dialog_1 = tslib_1.__importDefault(Dialog_1); class UserEditor { @@ -86,7 +85,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Ut const expireValue = document.getElementById("wcfUiUserEditorExpiresDatePicker"); expires = expireValue.value; if (expires === "") { - errorMessage = Language.get("wcf.global.form.error.empty"); + errorMessage = (0, Language_1.getPhrase)("wcf.global.form.error.empty"); } } Util_1.default.innerError(label, errorMessage); @@ -106,7 +105,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Ut case "unban": { this.header.dataset.banned = data.actionName === "ban" ? "true" : "false"; button = document.querySelector(".userProfileHeader__managementOptions .jsButtonUserBan"); - button.textContent = Language.get("wcf.user." + (data.actionName === "ban" ? "unban" : "ban")); + button.textContent = (0, Language_1.getPhrase)("wcf.user." + (data.actionName === "ban" ? "unban" : "ban")); const contentTitle = this.header.querySelector(".userProfileHeader__username"); let banIcon = contentTitle.querySelector(".jsUserBanned"); if (data.actionName === "ban") { @@ -125,25 +124,25 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Ut case "enableAvatar": this.header.dataset.disableAvatar = data.actionName === "disableAvatar" ? "true" : "false"; button = document.querySelector(".userProfileHeader__managementOptions .jsButtonUserDisableAvatar"); - button.textContent = Language.get("wcf.user." + (data.actionName === "disableAvatar" ? "enable" : "disable") + "Avatar"); + button.textContent = (0, Language_1.getPhrase)("wcf.user." + (data.actionName === "disableAvatar" ? "enable" : "disable") + "Avatar"); break; case "disableCoverPhoto": case "enableCoverPhoto": this.header.dataset.disableCoverPhoto = data.actionName === "disableCoverPhoto" ? "true" : "false"; button = document.querySelector(".userProfileHeader__managementOptions .jsButtonUserDisableCoverPhoto"); - button.textContent = Language.get("wcf.user." + (data.actionName === "disableCoverPhoto" ? "enable" : "disable") + "CoverPhoto"); + button.textContent = (0, Language_1.getPhrase)("wcf.user." + (data.actionName === "disableCoverPhoto" ? "enable" : "disable") + "CoverPhoto"); break; case "disableSignature": case "enableSignature": this.header.dataset.disableSignature = data.actionName === "disableSignature" ? "true" : "false"; button = document.querySelector(".userProfileHeader__managementOptions .jsButtonUserDisableSignature"); - button.textContent = Language.get("wcf.user." + (data.actionName === "disableSignature" ? "enable" : "disable") + "Signature"); + button.textContent = (0, Language_1.getPhrase)("wcf.user." + (data.actionName === "disableSignature" ? "enable" : "disable") + "Signature"); break; case "enable": case "disable": this.header.dataset.isDisabled = data.actionName === "disable" ? "true" : "false"; button = document.querySelector(".userProfileHeader__managementOptions .jsButtonUserEnable"); - button.textContent = Language.get("wcf.acp.user." + (data.actionName === "enable" ? "disable" : "enable")); + button.textContent = (0, Language_1.getPhrase)("wcf.acp.user." + (data.actionName === "enable" ? "disable" : "enable")); break; } if (["ban", "disableAvatar", "disableCoverPhoto", "disableSignature"].indexOf(data.actionName) !== -1) { @@ -173,11 +172,11 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Ut submitButton.addEventListener("click", this._submit.bind(this)); }, onShow: (content) => { - Dialog_1.default.setTitle("wcfUiUserEditor", Language.get("wcf.user." + this.actionName + ".confirmMessage")); + Dialog_1.default.setTitle("wcfUiUserEditor", (0, Language_1.getPhrase)("wcf.user." + this.actionName + ".confirmMessage")); const reason = document.getElementById("wcfUiUserEditorReason"); let label = reason.nextElementSibling; const phrase = "wcf.user." + this.actionName + ".reason.description"; - label.textContent = Language.get(phrase); + label.textContent = (0, Language_1.getPhrase)(phrase); if (label.textContent === phrase) { Util_1.default.hide(label); } @@ -185,16 +184,16 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Ut Util_1.default.show(label); } label = document.getElementById("wcfUiUserEditorNeverExpires").nextElementSibling; - label.textContent = Language.get("wcf.user." + this.actionName + ".neverExpires"); + label.textContent = (0, Language_1.getPhrase)("wcf.user." + this.actionName + ".neverExpires"); label = content.querySelector('label[for="wcfUiUserEditorExpires"]'); - label.textContent = Language.get("wcf.user." + this.actionName + ".expires"); + label.textContent = (0, Language_1.getPhrase)("wcf.user." + this.actionName + ".expires"); label = document.getElementById("wcfUiUserEditorExpiresLabel"); - label.textContent = Language.get("wcf.user." + this.actionName + ".expires.description"); + label.textContent = (0, Language_1.getPhrase)("wcf.user." + this.actionName + ".expires.description"); }, }, source: `
        -
        +
        @@ -210,7 +209,7 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Core", "../../Dom/Ut
        - +
        `, }; } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Ignore/List.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Ignore/List.js index ac270787598..e3a5b5c690b 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Ignore/List.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Ignore/List.js @@ -6,12 +6,11 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle all */ -define(["require", "exports", "tslib", "WoltLabSuite/Core/Component/Snackbar", "../../../Form/Builder/Dialog", "../../../Language"], function (require, exports, tslib_1, Snackbar_1, Dialog_1, Language) { +define(["require", "exports", "tslib", "WoltLabSuite/Core/Component/Snackbar", "../../../Form/Builder/Dialog", "WoltLabSuite/Core/Language"], function (require, exports, tslib_1, Snackbar_1, Dialog_1, Language_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.UiUserIgnoreList = void 0; Dialog_1 = tslib_1.__importDefault(Dialog_1); - Language = tslib_1.__importStar(Language); class UiUserIgnoreList { dialogs = new Map(); constructor() { @@ -25,7 +24,7 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Component/Snackbar", " if (!this.dialogs.has(userId)) { this.dialogs.set(userId, new Dialog_1.default("ignoreDialog", "wcf\\data\\user\\ignore\\UserIgnoreAction", "getDialog", { dialog: { - title: Language.get("wcf.user.button.ignore"), + title: (0, Language_1.getPhrase)("wcf.user.button.ignore"), }, actionParameters: { userID: userId, diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Menu/Data/Notification.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Menu/Data/Notification.js index c077e3cc1c1..b38e413d632 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Menu/Data/Notification.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Menu/Data/Notification.js @@ -6,12 +6,11 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "../../../../Ajax", "../View", "../Manager", "../../../../Language", "../../../../Notification/Handler", "../../../../Notification/ServiceWorker"], function (require, exports, tslib_1, Ajax_1, View_1, Manager_1, Language, Handler_1, ServiceWorker_1) { +define(["require", "exports", "tslib", "../../../../Ajax", "../View", "../Manager", "WoltLabSuite/Core/Language", "../../../../Notification/Handler", "../../../../Notification/ServiceWorker"], function (require, exports, tslib_1, Ajax_1, View_1, Manager_1, Language_1, Handler_1, ServiceWorker_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.setup = setup; View_1 = tslib_1.__importDefault(View_1); - Language = tslib_1.__importStar(Language); let originalFavicon = ""; function setFaviconCounter(counter) { const favicon = document.querySelector('link[rel="icon"]'); @@ -185,14 +184,14 @@ define(["require", "exports", "tslib", "../../../../Ajax", "../View", "../Manage } const element = document.createElement("div"); element.classList.add("userMenuNotifications"); - element.textContent = Language.get("wcf.user.notification.enableDesktopNotifications"); + element.textContent = (0, Language_1.getPhrase)("wcf.user.notification.enableDesktopNotifications"); const buttonContainer = document.createElement("div"); buttonContainer.classList.add("userMenuNotificationsButtons"); element.append(buttonContainer); const button = document.createElement("button"); button.type = "button"; button.classList.add("button", "small", "userMenuNotificationsButton"); - button.textContent = Language.get("wcf.user.notification.enableDesktopNotifications.button"); + button.textContent = (0, Language_1.getPhrase)("wcf.user.notification.enableDesktopNotifications.button"); button.addEventListener("click", async (event) => { event.preventDefault(); const permission = await Notification.requestPermission(); 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 54e98c4a7c9..2d5017b5686 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Menu/View.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Menu/View.js @@ -6,12 +6,11 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "../../../Date/Util", "../../../StringUtil", "../../../Dom/Change/Listener", "../../../Language", "focus-trap", "perfect-scrollbar", "../../Screen"], function (require, exports, tslib_1, Util_1, StringUtil_1, DomChangeListener, Language, focus_trap_1, perfect_scrollbar_1, UiScreen) { +define(["require", "exports", "tslib", "../../../Date/Util", "../../../StringUtil", "../../../Dom/Change/Listener", "WoltLabSuite/Core/Language", "focus-trap", "perfect-scrollbar", "../../Screen"], function (require, exports, tslib_1, Util_1, StringUtil_1, DomChangeListener, Language_1, focus_trap_1, perfect_scrollbar_1, UiScreen) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.UserMenuView = void 0; DomChangeListener = tslib_1.__importStar(DomChangeListener); - Language = tslib_1.__importStar(Language); perfect_scrollbar_1 = tslib_1.__importDefault(perfect_scrollbar_1); UiScreen = tslib_1.__importStar(UiScreen); class UserMenuView { @@ -29,7 +28,7 @@ define(["require", "exports", "tslib", "../../../Date/Util", "../../../StringUti icon: '', link: "#", name: "markAllAsRead", - title: Language.get("wcf.global.button.markAllAsRead"), + title: (0, Language_1.getPhrase)("wcf.global.button.markAllAsRead"), }); this.focusTrap = (0, focus_trap_1.createFocusTrap)(this.element, { allowOutsideClick: true, @@ -138,7 +137,7 @@ define(["require", "exports", "tslib", "../../../Date/Util", "../../../StringUti
        -
        diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Multifactor/Totp/Qr.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Multifactor/Totp/Qr.js index 5a91cd94418..ad8ef6042e1 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Multifactor/Totp/Qr.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Multifactor/Totp/Qr.js @@ -6,13 +6,12 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle all */ -define(["require", "exports", "tslib", "qr-creator", "../../../../Language"], function (require, exports, tslib_1, qr_creator_1, Language) { +define(["require", "exports", "tslib", "qr-creator", "WoltLabSuite/Core/Language"], function (require, exports, tslib_1, qr_creator_1, Language_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.render = render; exports.renderAll = renderAll; qr_creator_1 = tslib_1.__importDefault(qr_creator_1); - Language = tslib_1.__importStar(Language); function render(container) { const secret = container.querySelector(".totpSecret"); if (!secret) { @@ -34,7 +33,7 @@ define(["require", "exports", "tslib", "qr-creator", "../../../../Language"], fu }, canvas); const a = document.createElement("a"); a.href = getUrl(window.location.hostname, label, secret.textContent); - a.ariaLabel = Language.get("wcf.user.security.multifactor.com.woltlab.wcf.multifactor.totp.link"); + a.ariaLabel = (0, Language_1.getPhrase)("wcf.user.security.multifactor.com.woltlab.wcf.multifactor.totp.link"); canvas.parentElement.insertAdjacentElement("afterbegin", a); a.appendChild(canvas); } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/ObjectWatch.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/ObjectWatch.js index 0cc2178966a..5b932da1734 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/ObjectWatch.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/ObjectWatch.js @@ -6,12 +6,11 @@ * @license GNU Lesser General Public License * @since 6.0 */ -define(["require", "exports", "tslib", "../../Ajax", "../../Language", "../../Event/Handler", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Ajax, Language, EventHandler, Snackbar_1) { +define(["require", "exports", "tslib", "../../Ajax", "WoltLabSuite/Core/Language", "../../Event/Handler", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Ajax, Language_1, EventHandler, Snackbar_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.setup = setup; Ajax = tslib_1.__importStar(Ajax); - Language = tslib_1.__importStar(Language); EventHandler = tslib_1.__importStar(EventHandler); const dropdowns = new Map(); async function click(element) { @@ -47,12 +46,12 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Language", "../../Ev if (subscribe) { element.classList.add("active"); icon.setIcon("bookmark", true); - label.textContent = Language.get(`wcf.user.objectWatch.button.subscribed`); + label.textContent = (0, Language_1.getPhrase)(`wcf.user.objectWatch.button.subscribed`); } else { element.classList.remove("active"); icon.setIcon("bookmark"); - label.textContent = Language.get("wcf.user.objectWatch.button.subscribe"); + label.textContent = (0, Language_1.getPhrase)("wcf.user.objectWatch.button.subscribe"); } element.dataset.isSubscribed = subscribe.toString(); }); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/PasswordStrength.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/PasswordStrength.js index c3c9bc46e11..9d2ed95a4e0 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/PasswordStrength.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/PasswordStrength.js @@ -7,9 +7,8 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "../../Language", "../../Dom/Util"], function (require, exports, tslib_1, Language, Util_1) { +define(["require", "exports", "tslib", "WoltLabSuite/Core/Language", "../../Dom/Util"], function (require, exports, tslib_1, Language_1, Util_1) { "use strict"; - Language = tslib_1.__importStar(Language); Util_1 = tslib_1.__importDefault(Util_1); const STATIC_DICTIONARY = []; const siteName = document.querySelector('meta[property="og:site_name"]')?.getAttribute("content"); @@ -30,7 +29,7 @@ define(["require", "exports", "tslib", "../../Language", "../../Dom/Util"], func localizedPhrases[type] = {}; Object.entries(phrases).forEach(([identifier, phrase]) => { const languageItem = `wcf.user.password.zxcvbn.${type}.${identifier}`; - const localizedValue = Language.get(languageItem); + const localizedValue = (0, Language_1.getPhrase)(languageItem); localizedPhrases[type][identifier] = localizedValue !== languageItem ? localizedValue : phrase; }); }); @@ -65,7 +64,7 @@ define(["require", "exports", "tslib", "../../Language", "../../Dom/Util"], func const rating = document.createElement("div"); rating.className = "passwordStrengthRating"; const ratingLabel = document.createElement("small"); - ratingLabel.textContent = Language.get("wcf.user.password.strength"); + ratingLabel.textContent = (0, Language_1.getPhrase)("wcf.user.password.strength"); rating.appendChild(ratingLabel); this.score.className = "passwordStrengthScore"; this.score.dataset.score = "-1"; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Follow.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Follow.js index 465143afd4b..656dd11195c 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Follow.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Follow.js @@ -1,9 +1,8 @@ /** * @woltlabExcludeBundle all */ -define(["require", "exports", "tslib", "../../../../../Language", "./Abstract", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Language, Abstract_1, Snackbar_1) { +define(["require", "exports", "tslib", "WoltLabSuite/Core/Language", "./Abstract", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Language_1, Abstract_1, Snackbar_1) { "use strict"; - Language = tslib_1.__importStar(Language); Abstract_1 = tslib_1.__importDefault(Abstract_1); /** * @deprecated 6.2 Use `WoltLabSuite/Core/Component/User/Follow` instead. @@ -13,7 +12,7 @@ define(["require", "exports", "tslib", "../../../../../Language", "./Abstract", super(userId, isActive); } _getLabel() { - return Language.get("wcf.user.button." + (this._isActive ? "un" : "") + "follow"); + return (0, Language_1.getPhrase)("wcf.user.button." + (this._isActive ? "un" : "") + "follow"); } _getAjaxActionName() { return this._isActive ? "unfollow" : "follow"; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Ignore.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Ignore.js index ee719ecbced..d5a5daa8faf 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Ignore.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Ignore.js @@ -1,9 +1,8 @@ /** * @woltlabExcludeBundle all */ -define(["require", "exports", "tslib", "../../../../../Language", "./Abstract", "../../../../../Form/Builder/Dialog", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Language, Abstract_1, Dialog_1, Snackbar_1) { +define(["require", "exports", "tslib", "WoltLabSuite/Core/Language", "./Abstract", "../../../../../Form/Builder/Dialog", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, Language_1, Abstract_1, Dialog_1, Snackbar_1) { "use strict"; - Language = tslib_1.__importStar(Language); Abstract_1 = tslib_1.__importDefault(Abstract_1); Dialog_1 = tslib_1.__importDefault(Dialog_1); /** @@ -15,7 +14,7 @@ define(["require", "exports", "tslib", "../../../../../Language", "./Abstract", super(userId, isActive); this.dialog = new Dialog_1.default("ignoreDialog", "wcf\\data\\user\\ignore\\UserIgnoreAction", "getDialog", { dialog: { - title: Language.get("wcf.user.button.ignore"), + title: (0, Language_1.getPhrase)("wcf.user.button.ignore"), }, actionParameters: { userID: this._userId, @@ -26,7 +25,7 @@ define(["require", "exports", "tslib", "../../../../../Language", "./Abstract", }); } _getLabel() { - return Language.get("wcf.user.button." + (this._isActive ? "un" : "") + "ignore"); + return (0, Language_1.getPhrase)("wcf.user.button." + (this._isActive ? "un" : "") + "ignore"); } _ajaxSuccess(data) { this._isActive = !!data.isIgnoredUser; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Session/Delete.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Session/Delete.js index 6186a1466a9..db04a73d14e 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Session/Delete.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Session/Delete.js @@ -6,15 +6,14 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle all */ -define(["require", "exports", "tslib", "../../Confirmation", "../../../Language", "WoltLabSuite/Core/Api/Sessions/DeleteSession", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, UiConfirmation, Language, DeleteSession_1, Snackbar_1) { +define(["require", "exports", "tslib", "../../Confirmation", "WoltLabSuite/Core/Language", "WoltLabSuite/Core/Api/Sessions/DeleteSession", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, tslib_1, UiConfirmation, Language_1, DeleteSession_1, Snackbar_1) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.setup = setup; UiConfirmation = tslib_1.__importStar(UiConfirmation); - Language = tslib_1.__importStar(Language); function onClick(button) { UiConfirmation.show({ - message: Language.get("wcf.user.security.deleteSession.confirmMessage"), + message: (0, Language_1.getPhrase)("wcf.user.security.deleteSession.confirmMessage"), confirm: async (_parameters) => { await (0, DeleteSession_1.deleteSession)(button.dataset.sessionId); button.closest("li")?.remove(); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Upload.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Upload.js index ed7384af2af..14e92fc6fa3 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Upload.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Upload.js @@ -6,12 +6,11 @@ * @license GNU Lesser General Public License * @woltlabExcludeBundle tiny */ -define(["require", "exports", "tslib", "./Ajax/Request", "./Core", "./Dom/Change/Listener", "./Language"], function (require, exports, tslib_1, Request_1, Core, Listener_1, Language) { +define(["require", "exports", "tslib", "./Ajax/Request", "./Core", "./Dom/Change/Listener", "WoltLabSuite/Core/Language"], function (require, exports, tslib_1, Request_1, Core, Listener_1, Language_1) { "use strict"; Request_1 = tslib_1.__importDefault(Request_1); Core = tslib_1.__importStar(Core); Listener_1 = tslib_1.__importDefault(Listener_1); - Language = tslib_1.__importStar(Language); class Upload { _button = document.createElement("p"); _buttonContainer; @@ -89,7 +88,7 @@ define(["require", "exports", "tslib", "./Ajax/Request", "./Core", "./Dom/Change this._button.classList.remove("active"); }); const span = document.createElement("span"); - span.textContent = Language.get("wcf.global.button.upload"); + span.textContent = (0, Language_1.getPhrase)("wcf.global.button.upload"); this._button.appendChild(span); this._button.insertAdjacentElement("afterbegin", this._fileUpload); this._insertButton(); From 36bf4ff48ee9cbad081e578f9bb000a11da7ccb8 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Thu, 9 Jul 2026 17:01:14 +0200 Subject: [PATCH 2/4] Migrate deprecated `Language.add()` usages to `jsphrase` --- wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl | 4 ++-- .../install/files/acp/templates/packageInstallationSetup.tpl | 4 ++-- .../files/acp/templates/sendMailUserBulkProcessing.tpl | 4 ++-- wcfsetup/install/files/acp/templates/sitemapList.tpl | 4 ++-- .../install/files/acp/templates/userActivityPointOption.tpl | 4 ++-- wcfsetup/install/files/acp/templates/userRankList.tpl | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl index b386fe3c8a1..318db98c263 100644 --- a/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl +++ b/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl @@ -1,8 +1,8 @@ {include file='header' pageTitle='wcf.acp.devtools.project.list'} diff --git a/com.woltlab.wcf/templates/accountManagement.tpl b/com.woltlab.wcf/templates/accountManagement.tpl index 8d3f5045dc1..cf3833418f1 100644 --- a/com.woltlab.wcf/templates/accountManagement.tpl +++ b/com.woltlab.wcf/templates/accountManagement.tpl @@ -97,7 +97,7 @@ {event name='changePasswordFields'} {elseif $page->pageType !== 'system'}