From 82489247c40a7eb354b7b031617ad5ffd9d84484 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Sun, 9 Dec 2012 17:16:56 +0100 Subject: [PATCH] Cleans up package --- acpMenu.xml | 4 +-- acptemplates/languageAdd.tpl | 25 ++++++++++++------- acptemplates/languageExport.tpl | 4 +-- acptemplates/languageMultilingualism.tpl | 6 ++--- acptemplates/languageServerAdd.tpl | 1 - acptemplates/languageServerList.tpl | 2 +- .../LanguageMultilingualismForm.class.php | 5 ++-- .../acp/form/LanguageServerAddForm.class.php | 2 +- .../acp/form/LanguageServerEditForm.class.php | 2 +- files/lib/acp/page/LanguageListPage.class.php | 4 +-- .../acp/page/LanguageServerListPage.class.php | 2 +- language/de.xml | 19 +++++++------- 12 files changed, 40 insertions(+), 36 deletions(-) diff --git a/acpMenu.xml b/acpMenu.xml index a55e7e9aee..123490c8ed 100644 --- a/acpMenu.xml +++ b/acpMenu.xml @@ -26,13 +26,13 @@ wcf.acp.menu.link.language - + index.php/LanguageServerList/ wcf.acp.menu.link.language.server admin.language.canEditServer,admin.language.canDeleteServer - + index.php/LanguageServerAdd/ wcf.acp.menu.link.language.server diff --git a/acptemplates/languageAdd.tpl b/acptemplates/languageAdd.tpl index 5f42107f46..37b83e46d2 100644 --- a/acptemplates/languageAdd.tpl +++ b/acptemplates/languageAdd.tpl @@ -37,10 +37,10 @@ {lang}wcf.acp.language.add.mode{/lang}
-
- - -
+
+ + +
@@ -76,7 +76,7 @@ - +
{lang}wcf.acp.language.add.new{/lang} @@ -86,8 +86,11 @@ {if $errorField == 'languageCode'} - {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} - {if $errorType == 'notUnique'}{lang}wcf.acp.language.add.languageCode.error.notUnique{/lang}{/if} + {if $errorType == 'empty'} + {lang}wcf.global.error.empty{/lang} + {else} + {lang}wcf.acp.language.add.languageCode.error.{@$errorType}{/lang} + {/if} {/if} {lang}wcf.acp.language.code.description{/lang} @@ -104,14 +107,18 @@ {if $errorField == 'sourceLanguageID'} - {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if} + {if $errorType == 'empty'} + {lang}wcf.global.error.empty{/lang} + {else} + {lang}wcf.acp.language.add.source.error.{@$errorType}{/lang} + {/if} {/if}
- {if $additionalFields|isset}{@$additionalFields}{/if} + {event name='fieldsets'}
diff --git a/acptemplates/languageExport.tpl b/acptemplates/languageExport.tpl index 3be4301a90..5ee2e053eb 100644 --- a/acptemplates/languageExport.tpl +++ b/acptemplates/languageExport.tpl @@ -11,7 +11,7 @@ {/if} {if $success|isset} -

{lang}wcf.acp.language.add.success{/lang}

+

{lang}wcf.acp.language.add.success{/lang}

{/if}
@@ -26,7 +26,7 @@
{lang}wcf.acp.language.export{/lang} - +
diff --git a/acptemplates/languageMultilingualism.tpl b/acptemplates/languageMultilingualism.tpl index a68c317da8..d4bbba383c 100644 --- a/acptemplates/languageMultilingualism.tpl +++ b/acptemplates/languageMultilingualism.tpl @@ -29,7 +29,7 @@
{lang}wcf.acp.language.multilingualism.enable.description{/lang} - +
@@ -37,7 +37,7 @@ {if $errorField == 'languageIDs'} - {if $errorType == 'empty'}{lang}wcf.acp.language.multilingualism.languages.error.empty{/lang}{/if} + {lang}wcf.acp.language.multilingualism.languages.error.{@$errorType}{/lang} {/if}
@@ -45,8 +45,6 @@ {event name='additionalFields'}
- -
diff --git a/acptemplates/languageServerAdd.tpl b/acptemplates/languageServerAdd.tpl index 64404eafa8..1faef1e8d2 100644 --- a/acptemplates/languageServerAdd.tpl +++ b/acptemplates/languageServerAdd.tpl @@ -40,7 +40,6 @@ {lang}wcf.acp.languageServer.server.description{/lang} -
diff --git a/acptemplates/languageServerList.tpl b/acptemplates/languageServerList.tpl index 59cea2f681..f5d2c993cb 100644 --- a/acptemplates/languageServerList.tpl +++ b/acptemplates/languageServerList.tpl @@ -40,7 +40,7 @@

{lang}wcf.acp.languageServer.list{/lang} {#$items}

- + diff --git a/files/lib/acp/form/LanguageMultilingualismForm.class.php b/files/lib/acp/form/LanguageMultilingualismForm.class.php index c1aaaba2b1..f8a3a1ef15 100644 --- a/files/lib/acp/form/LanguageMultilingualismForm.class.php +++ b/files/lib/acp/form/LanguageMultilingualismForm.class.php @@ -30,6 +30,7 @@ class LanguageMultilingualismForm extends ACPForm { public $neededPermissions = array('admin.language.canEditLanguage'); // data + // todo: comment public $enable = 0; public $languageIDs = array(); public $languages = array(); @@ -65,7 +66,7 @@ class LanguageMultilingualismForm extends ACPForm { if (!in_array(LanguageFactory::getInstance()->getDefaultLanguageID(), $this->languageIDs)) { $this->languageIDs[] = LanguageFactory::getInstance()->getDefaultLanguageID(); } - + // validate language ids $contentLanguages = 0; foreach ($this->languageIDs as $languageID) { @@ -85,7 +86,7 @@ class LanguageMultilingualismForm extends ACPForm { */ public function save() { parent::save(); - + // save LanguageEditor::enableMultilingualism(($this->enable == 1 ? $this->languageIDs : array())); diff --git a/files/lib/acp/form/LanguageServerAddForm.class.php b/files/lib/acp/form/LanguageServerAddForm.class.php index a4ca54ddf7..8c6edf0230 100644 --- a/files/lib/acp/form/LanguageServerAddForm.class.php +++ b/files/lib/acp/form/LanguageServerAddForm.class.php @@ -9,7 +9,7 @@ use wcf\util\StringUtil; /** * Shows the language server add form. - * + * * @author Alexander Ebert * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/files/lib/acp/form/LanguageServerEditForm.class.php b/files/lib/acp/form/LanguageServerEditForm.class.php index 59f8242e13..7411e77315 100644 --- a/files/lib/acp/form/LanguageServerEditForm.class.php +++ b/files/lib/acp/form/LanguageServerEditForm.class.php @@ -8,7 +8,7 @@ use wcf\system\exception\IllegalLinkException; /** * Shows the language server edit form. - * + * * @author Alexander Ebert * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License diff --git a/files/lib/acp/page/LanguageListPage.class.php b/files/lib/acp/page/LanguageListPage.class.php index e8c5ea691d..c475fd4925 100644 --- a/files/lib/acp/page/LanguageListPage.class.php +++ b/files/lib/acp/page/LanguageListPage.class.php @@ -32,12 +32,12 @@ class LanguageListPage extends SortablePage { /** * @see wcf\page\MultipleLinkPage::$objectListClassName - */ + */ public $objectListClassName = 'wcf\data\language\LanguageList'; /** * @see wcf\page\MultipleLinkPage::initObjectList() - */ + */ public function initObjectList() { parent::initObjectList(); diff --git a/files/lib/acp/page/LanguageServerListPage.class.php b/files/lib/acp/page/LanguageServerListPage.class.php index 70adc0c1e3..ff6248710e 100644 --- a/files/lib/acp/page/LanguageServerListPage.class.php +++ b/files/lib/acp/page/LanguageServerListPage.class.php @@ -32,7 +32,7 @@ class LanguageServerListPage extends SortablePage { /** * @see wcf\page\MultipleLinkPage::$objectListClassName - */ + */ public $objectListClassName = 'wcf\data\language\server\LanguageServerList'; /** diff --git a/language/de.xml b/language/de.xml index ad795c061d..b58ec83726 100644 --- a/language/de.xml +++ b/language/de.xml @@ -9,16 +9,7 @@ - - - - - - - - - @@ -27,7 +18,10 @@ ISO 639-1 an. Weitere Informationen zu Sprachcodes finden Sie unter http://de.wikipedia.org/wiki/ISO_639-1.]]> + languageName}“ wirklich löschen?]]> + + @@ -36,12 +30,17 @@ + + - + + + + \ No newline at end of file -- 2.20.1