Skip to content

Commit b9d897e

Browse files
BurntimeXBurntimeX
committed
Migrate calls to the deprecated Language methods
1 parent 6d5e6b6 commit b9d897e

8 files changed

Lines changed: 34 additions & 41 deletions

File tree

‎snippets/tutorial/tutorial-series/part-5/files/js/WoltLabSuite/Core/Controller/Person.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
77
* @module WoltLabSuite/Core/Controller/Person
88
*/
9-
define(["require", "exports", "tslib", "WoltLabSuite/Core/Form/Builder/Dialog", "WoltLabSuite/Core/Language", "WoltLabSuite/Core/Ui/Notification"], function (require, exports, tslib_1, Dialog_1, Language, UiNotification) {
9+
define(["require", "exports", "tslib", "WoltLabSuite/Core/Form/Builder/Dialog", "WoltLabSuite/Core/Language", "WoltLabSuite/Core/Ui/Notification"], function (require, exports, tslib_1, Dialog_1, Language_1, UiNotification) {
1010
"use strict";
1111
Object.defineProperty(exports, "__esModule", { value: true });
1212
exports.init = void 0;
1313
Dialog_1 = tslib_1.__importDefault(Dialog_1);
14-
Language = tslib_1.__importStar(Language);
1514
UiNotification = tslib_1.__importStar(UiNotification);
1615
let addDialog;
1716
const editDialogs = new Map();
@@ -29,13 +28,13 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Form/Builder/Dialog",
2928
informationID: informationId,
3029
},
3130
dialog: {
32-
title: Language.get("wcf.person.information.edit"),
31+
title: (0, Language_1.getPhrase)("wcf.person.information.edit"),
3332
},
3433
submitActionName: "submitEditDialog",
3534
successCallback(returnValues) {
3635
document.getElementById(`personInformation${returnValues.informationID}`).innerHTML =
3736
returnValues.formattedInformation;
38-
UiNotification.show(Language.get("wcf.person.information.edit.success"));
37+
UiNotification.show((0, Language_1.getPhrase)("wcf.person.information.edit.success"));
3938
},
4039
}));
4140
}
@@ -52,11 +51,11 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Form/Builder/Dialog",
5251
personID: personId,
5352
},
5453
dialog: {
55-
title: Language.get("wcf.person.information.add"),
54+
title: (0, Language_1.getPhrase)("wcf.person.information.add"),
5655
},
5756
submitActionName: "submitAddDialog",
5857
successCallback() {
59-
UiNotification.show(Language.get("wcf.person.information.add.success"), () => window.location.reload());
58+
UiNotification.show((0, Language_1.getPhrase)("wcf.person.information.add.success"), () => window.location.reload());
6059
},
6160
});
6261
document.getElementById("personInformationAddButton").addEventListener("click", (event) => {

‎snippets/tutorial/tutorial-series/part-5/templates/person.tpl‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,11 @@
124124
</footer>
125125

126126
<script data-relocate="true">
127-
require(['Language', 'WoltLabSuite/Core/Controller/Person'], (Language, ControllerPerson) => {
128-
Language.addObject({
129-
'wcf.person.information.add': '{jslang}wcf.person.information.add{/jslang}',
130-
'wcf.person.information.add.success': '{jslang}wcf.person.information.add.success{/jslang}',
131-
'wcf.person.information.edit': '{jslang}wcf.person.information.edit{/jslang}',
132-
'wcf.person.information.edit.success': '{jslang}wcf.person.information.edit.success{/jslang}',
133-
});
127+
require(['WoltLabSuite/Core/Controller/Person'], (ControllerPerson) => {
128+
{jsphrase name='wcf.person.information.add'}
129+
{jsphrase name='wcf.person.information.add.success'}
130+
{jsphrase name='wcf.person.information.edit'}
131+
{jsphrase name='wcf.person.information.edit.success'}
134132
135133
ControllerPerson.init({$person->personID}, {
136134
canAddInformation: {if $__wcf->session->getPermission('user.person.canAddInformation')}true{else}false{/if},

‎snippets/tutorial/tutorial-series/part-5/ts/WoltLabSuite/Core/Controller/Person.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
import FormBuilderDialog from "WoltLabSuite/Core/Form/Builder/Dialog";
11-
import * as Language from "WoltLabSuite/Core/Language";
11+
import { getPhrase } from "WoltLabSuite/Core/Language";
1212
import * as UiNotification from "WoltLabSuite/Core/Ui/Notification";
1313

1414
let addDialog: FormBuilderDialog;
@@ -45,14 +45,14 @@ function editInformation(event: Event): void {
4545
informationID: informationId,
4646
},
4747
dialog: {
48-
title: Language.get("wcf.person.information.edit"),
48+
title: getPhrase("wcf.person.information.edit"),
4949
},
5050
submitActionName: "submitEditDialog",
5151
successCallback(returnValues: EditReturnValues) {
5252
document.getElementById(`personInformation${returnValues.informationID}`)!.innerHTML =
5353
returnValues.formattedInformation;
5454

55-
UiNotification.show(Language.get("wcf.person.information.edit.success"));
55+
UiNotification.show(getPhrase("wcf.person.information.edit.success"));
5656
},
5757
},
5858
),
@@ -77,11 +77,11 @@ export function init(personId: number, options: Options): void {
7777
personID: personId,
7878
},
7979
dialog: {
80-
title: Language.get("wcf.person.information.add"),
80+
title: getPhrase("wcf.person.information.add"),
8181
},
8282
submitActionName: "submitAddDialog",
8383
successCallback() {
84-
UiNotification.show(Language.get("wcf.person.information.add.success"), () => window.location.reload());
84+
UiNotification.show(getPhrase("wcf.person.information.add.success"), () => window.location.reload());
8585
},
8686
},
8787
);

‎snippets/tutorial/tutorial-series/part-6/files/js/WoltLabSuite/Core/Controller/Person.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
77
* @module WoltLabSuite/Core/Controller/Person
88
*/
9-
define(["require", "exports", "tslib", "WoltLabSuite/Core/Form/Builder/Dialog", "WoltLabSuite/Core/Language", "WoltLabSuite/Core/Ui/Notification"], function (require, exports, tslib_1, Dialog_1, Language, UiNotification) {
9+
define(["require", "exports", "tslib", "WoltLabSuite/Core/Form/Builder/Dialog", "WoltLabSuite/Core/Language", "WoltLabSuite/Core/Ui/Notification"], function (require, exports, tslib_1, Dialog_1, Language_1, UiNotification) {
1010
"use strict";
1111
Object.defineProperty(exports, "__esModule", { value: true });
1212
exports.init = void 0;
1313
Dialog_1 = tslib_1.__importDefault(Dialog_1);
14-
Language = tslib_1.__importStar(Language);
1514
UiNotification = tslib_1.__importStar(UiNotification);
1615
let addDialog;
1716
const editDialogs = new Map();
@@ -29,13 +28,13 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Form/Builder/Dialog",
2928
informationID: informationId,
3029
},
3130
dialog: {
32-
title: Language.get("wcf.person.information.edit"),
31+
title: (0, Language_1.getPhrase)("wcf.person.information.edit"),
3332
},
3433
submitActionName: "submitEditDialog",
3534
successCallback(returnValues) {
3635
document.getElementById(`personInformation${returnValues.informationID}`).innerHTML =
3736
returnValues.formattedInformation;
38-
UiNotification.show(Language.get("wcf.person.information.edit.success"));
37+
UiNotification.show((0, Language_1.getPhrase)("wcf.person.information.edit.success"));
3938
},
4039
}));
4140
}
@@ -52,11 +51,11 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Form/Builder/Dialog",
5251
personID: personId,
5352
},
5453
dialog: {
55-
title: Language.get("wcf.person.information.add"),
54+
title: (0, Language_1.getPhrase)("wcf.person.information.add"),
5655
},
5756
submitActionName: "submitAddDialog",
5857
successCallback() {
59-
UiNotification.show(Language.get("wcf.person.information.add.success"), () => window.location.reload());
58+
UiNotification.show((0, Language_1.getPhrase)("wcf.person.information.add.success"), () => window.location.reload());
6059
},
6160
});
6261
document.getElementById("personInformationAddButton").addEventListener("click", (event) => {

‎snippets/tutorial/tutorial-series/part-6/templates/person.tpl‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,11 @@
124124
</footer>
125125

126126
<script data-relocate="true">
127-
require(['Language', 'WoltLabSuite/Core/Controller/Person'], (Language, ControllerPerson) => {
128-
Language.addObject({
129-
'wcf.person.information.add': '{jslang}wcf.person.information.add{/jslang}',
130-
'wcf.person.information.add.success': '{jslang}wcf.person.information.add.success{/jslang}',
131-
'wcf.person.information.edit': '{jslang}wcf.person.information.edit{/jslang}',
132-
'wcf.person.information.edit.success': '{jslang}wcf.person.information.edit.success{/jslang}',
133-
});
127+
require(['WoltLabSuite/Core/Controller/Person'], (ControllerPerson) => {
128+
{jsphrase name='wcf.person.information.add'}
129+
{jsphrase name='wcf.person.information.add.success'}
130+
{jsphrase name='wcf.person.information.edit'}
131+
{jsphrase name='wcf.person.information.edit.success'}
134132
135133
ControllerPerson.init({$person->personID}, {
136134
canAddInformation: {if $__wcf->session->getPermission('user.person.canAddInformation')}true{else}false{/if},

‎snippets/tutorial/tutorial-series/part-6/ts/WoltLabSuite/Core/Controller/Person.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
import FormBuilderDialog from "WoltLabSuite/Core/Form/Builder/Dialog";
11-
import * as Language from "WoltLabSuite/Core/Language";
11+
import { getPhrase } from "WoltLabSuite/Core/Language";
1212
import * as UiNotification from "WoltLabSuite/Core/Ui/Notification";
1313

1414
let addDialog: FormBuilderDialog;
@@ -45,14 +45,14 @@ function editInformation(event: Event): void {
4545
informationID: informationId,
4646
},
4747
dialog: {
48-
title: Language.get("wcf.person.information.edit"),
48+
title: getPhrase("wcf.person.information.edit"),
4949
},
5050
submitActionName: "submitEditDialog",
5151
successCallback(returnValues: EditReturnValues) {
5252
document.getElementById(`personInformation${returnValues.informationID}`)!.innerHTML =
5353
returnValues.formattedInformation;
5454

55-
UiNotification.show(Language.get("wcf.person.information.edit.success"));
55+
UiNotification.show(getPhrase("wcf.person.information.edit.success"));
5656
},
5757
},
5858
),
@@ -77,11 +77,11 @@ export function init(personId: number, options: Options): void {
7777
personID: personId,
7878
},
7979
dialog: {
80-
title: Language.get("wcf.person.information.add"),
80+
title: getPhrase("wcf.person.information.add"),
8181
},
8282
submitActionName: "submitAddDialog",
8383
successCallback() {
84-
UiNotification.show(Language.get("wcf.person.information.add.success"), () => window.location.reload());
84+
UiNotification.show(getPhrase("wcf.person.information.add.success"), () => window.location.reload());
8585
},
8686
},
8787
);

‎snippets/typescript/Example.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
define(["require", "exports", "tslib", "WoltLabSuite/Core/Language"], function (require, exports, tslib_1, Language) {
1+
define(["require", "exports", "WoltLabSuite/Core/Language"], function (require, exports, Language_1) {
22
"use strict";
33
Object.defineProperty(exports, "__esModule", { value: true });
44
exports.run = void 0;
5-
Language = tslib_1.__importStar(Language);
65
function run() {
7-
alert(Language.get("wcf.foo.bar"));
6+
alert((0, Language_1.getPhrase)("wcf.foo.bar"));
87
}
98
exports.run = run;
109
});

‎snippets/typescript/Example.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as Language from "WoltLabSuite/Core/Language";
1+
import { getPhrase } from "WoltLabSuite/Core/Language";
22

33
export function run() {
4-
alert(Language.get("wcf.foo.bar"));
4+
alert(getPhrase("wcf.foo.bar"));
55
}

0 commit comments

Comments
 (0)