From e44c5271c000d7f24af7f69f0808860676b2f024 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Mon, 25 Jul 2011 16:09:26 +0200 Subject: [PATCH] Merge pull request #29 from WCFSolutions/languageConstantsRemoval --- .../install/files/acp/templates/header.tpl | 6 +- .../files/acp/templates/setupHeader.tpl | 4 +- .../files/acp/templates/setupWindowHeader.tpl | 38 +- .../lib/data/language/Language.class.php | 306 ++++++----- .../lib/data/language/SetupLanguage.class.php | 195 +++---- .../install/files/lib/system/WCF.class.php | 9 +- .../files/lib/system/WCFSetup.class.php | 13 +- .../system/language/LanguageFactory.class.php | 19 +- .../system/package/PackageArchive.class.php | 4 +- wcfsetup/setup/template/header.tpl | 520 +++++++++--------- 10 files changed, 557 insertions(+), 557 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl index 42e7a39b88..de7184b9ed 100644 --- a/wcfsetup/install/files/acp/templates/header.tpl +++ b/wcfsetup/install/files/acp/templates/header.tpl @@ -1,5 +1,5 @@ - + {if $pageTitle|isset}{@$pageTitle}{else}{lang}wcf.global.pageTitle{/lang}{/if} - {lang}wcf.acp{/lang} @@ -30,12 +30,12 @@ {* *} diff --git a/wcfsetup/install/files/acp/templates/setupHeader.tpl b/wcfsetup/install/files/acp/templates/setupHeader.tpl index 4de4001c56..952a0d1356 100644 --- a/wcfsetup/install/files/acp/templates/setupHeader.tpl +++ b/wcfsetup/install/files/acp/templates/setupHeader.tpl @@ -1,6 +1,6 @@ - + {@$pageTitle} - {lang}wcf.global.pageTitle{/lang} @@ -16,7 +16,7 @@ - - - -
- -

{lang}wcf.global.title{/lang}

-
-
-
{lang}wcf.global.progressBar{/lang}
-
-
- + + + + + {lang}wcf.global.progressBar{/lang} - {lang}wcf.global.pageTitle{/lang} + + + + + + +
+ +

{lang}wcf.global.title{/lang}

+
+
+
{lang}wcf.global.progressBar{/lang}
+
+
+ \ No newline at end of file -- 2.20.1