Unify the registering of update-related phrases for use in JS

diff --git a/wcfsetup/install/files/acp/templates/license.tpl b/wcfsetup/install/files/acp/templates/license.tpl
index 649b04db4926ffd19407b4ae86039a023fc1ae6a..4ba0759db5533f71a267162a3129a646b9b3dd17 100644 (file)
--- a/wcfsetup/install/files/acp/templates/license.tpl
+++ b/wcfsetup/install/files/acp/templates/license.tpl
@@ -172,7 +172,12 @@
 
 <script data-relocate="true">
     require(["WoltLabSuite/Core/Acp/Component/License"], ({ setup }) => {
+        {jsphrase name='wcf.acp.package.error.uniqueAlreadyInstalled'}
         {jsphrase name='wcf.acp.package.install.title'}
+        {jsphrase name='wcf.acp.package.quickInstallation.code.error.invalid'}
+        {jsphrase name='wcf.acp.package.update.excludedPackages'}
+        {jsphrase name='wcf.acp.package.update.title'}
+        {jsphrase name='wcf.acp.package.update.unauthorized'}
         
         setup();
     });

diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 6f7561598617ddb2a9794b3282f5851dd2b4ae02..ca9856ae67cc21f61092f8339debc925cfbaf1e8 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -7,14 +7,14 @@
 
 <script data-relocate="true">
        require([
-               "Language", "WoltLabSuite/Core/Acp/Ui/Package/QuickInstallation", "WoltLabSuite/Core/Acp/Ui/Package/Search"],
-               (Language, AcpUiPackageQuickInstallation, AcpUiPackageSearch) => {
-               Language.addObject({
-                       'wcf.acp.package.error.uniqueAlreadyInstalled': '{jslang}wcf.acp.package.error.uniqueAlreadyInstalled{/jslang}',
-                       'wcf.acp.package.install.title': '{jslang}wcf.acp.package.install.title{/jslang}',
-                       'wcf.acp.package.update.unauthorized': '{jslang}wcf.acp.package.update.unauthorized{/jslang}',
-                       'wcf.acp.package.quickInstallation.code.error.invalid': '{jslang}wcf.acp.package.quickInstallation.code.error.invalid{/jslang}',
-               });
+               "WoltLabSuite/Core/Acp/Ui/Package/QuickInstallation", "WoltLabSuite/Core/Acp/Ui/Package/Search"],
+               (AcpUiPackageQuickInstallation, AcpUiPackageSearch) => {
+               {jsphrase name='wcf.acp.package.error.uniqueAlreadyInstalled'}
+               {jsphrase name='wcf.acp.package.install.title'}
+               {jsphrase name='wcf.acp.package.quickInstallation.code.error.invalid'}
+               {jsphrase name='wcf.acp.package.update.excludedPackages'}
+               {jsphrase name='wcf.acp.package.update.title'}
+               {jsphrase name='wcf.acp.package.update.unauthorized'}
                
                AcpUiPackageQuickInstallation.setup();
                new AcpUiPackageSearch();

diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index e6cf3caac40dfbe0594bfef38d65dc6f32ad28cc..7299fb90ab3ab907152daba1df16d5e1076cf6b8 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
@@ -39,12 +39,13 @@
 </div>
 
 <script data-relocate="true">
-       require(["WoltLabSuite/Core/Language", "WoltLabSuite/Core/Acp/Ui/Package/Update/Manager"], (Language, { setup }) => {
-               Language.addObject({
-                       'wcf.acp.package.update.excludedPackages': '{jslang}wcf.acp.package.update.excludedPackages{/jslang}',
-                       'wcf.acp.package.update.title': '{jslang}wcf.acp.package.update.title{/jslang}',
-                       'wcf.acp.package.update.unauthorized': '{jslang}wcf.acp.package.update.unauthorized{/jslang}',
-               });
+       require(["WoltLabSuite/Core/Acp/Ui/Package/Update/Manager"], ({ setup }) => {
+               {jsphrase name='wcf.acp.package.error.uniqueAlreadyInstalled'}
+               {jsphrase name='wcf.acp.package.install.title'}
+               {jsphrase name='wcf.acp.package.quickInstallation.code.error.invalid'}
+               {jsphrase name='wcf.acp.package.update.excludedPackages'}
+               {jsphrase name='wcf.acp.package.update.title'}
+               {jsphrase name='wcf.acp.package.update.unauthorized'}
 
                setup();
        });