Cleans up package

diff --git a/acpMenu.xml b/acpMenu.xml
index a55e7e9aeefdda6aa6564e5854838f89eeb0223d..123490c8edbeacd3e8fe7bdd31d7103f74739725 100644 (file)
--- a/acpMenu.xml
+++ b/acpMenu.xml
@@ -26,13 +26,13 @@
                <acpmenuitem name="wcf.acp.menu.link.language.server">
                        <parent>wcf.acp.menu.link.language</parent>
                </acpmenuitem>
-
+               
                <acpmenuitem name="wcf.acp.menu.link.language.server.list">
                        <link>index.php/LanguageServerList/</link>
                        <parent>wcf.acp.menu.link.language.server</parent>
                        <permissions>admin.language.canEditServer,admin.language.canDeleteServer</permissions>
                </acpmenuitem>
-
+               
                <acpmenuitem name="wcf.acp.menu.link.language.server.add">
                        <link>index.php/LanguageServerAdd/</link>
                        <parent>wcf.acp.menu.link.language.server</parent>

diff --git a/acptemplates/languageAdd.tpl b/acptemplates/languageAdd.tpl
index 5f42107f4682389ff7683754bd20d836911405fc..37b83e46d2a52aac5d1e77345b8b24adaa9a9035 100644 (file)
--- a/acptemplates/languageAdd.tpl
+++ b/acptemplates/languageAdd.tpl
@@ -37,10 +37,10 @@
                        <legend>{lang}wcf.acp.language.add.mode{/lang}</legend>
                        
                        <dl>
-                                       <dd class="floated">
-                                               <label><input type="radio" name="mode" value="import" id="import" {if $mode == 'import'}checked="checked" {/if}/> {lang}wcf.acp.language.add.mode.import{/lang}</label>
-                                               <label><input type="radio" name="mode" value="copy" id="copy" {if $mode == 'copy'}checked="checked" {/if}/> {lang}wcf.acp.language.add.mode.copy{/lang}</label>
-                                       </dd>
+                               <dd class="floated">
+                                       <label><input type="radio" name="mode" value="import" id="import" {if $mode == 'import'}checked="checked" {/if}/> {lang}wcf.acp.language.add.mode.import{/lang}</label>
+                                       <label><input type="radio" name="mode" value="copy" id="copy" {if $mode == 'copy'}checked="checked" {/if}/> {lang}wcf.acp.language.add.mode.copy{/lang}</label>
+                               </dd>
                        </dl>
                </fieldset>
                
@@ -76,7 +76,7 @@
                                </dd>
                        </dl>
                </fieldset>
-       
+               
                <fieldset id="copyDiv">
                        <legend>{lang}wcf.acp.language.add.new{/lang}</legend>
                        
@@ -86,8 +86,11 @@
                                        <input type="text" id="languageCode" name="languageCode" value="{$languageCode}" class="long" />
                                        {if $errorField == 'languageCode'}
                                                <small class="innerError">
-                                                       {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}
                                                </small>
                                        {/if}
                                        <small>{lang}wcf.acp.language.code.description{/lang}</small>
@@ -104,14 +107,18 @@
                                        </select>
                                        {if $errorField == 'sourceLanguageID'}
                                                <small class="innerError">
-                                                       {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}
                                                </small>
                                        {/if}
                                </dd>
                        </dl>
                </fieldset>
                
-               {if $additionalFields|isset}{@$additionalFields}{/if}
+               {event name='fieldsets'}
        </div>
        
        <div class="formSubmit">

diff --git a/acptemplates/languageExport.tpl b/acptemplates/languageExport.tpl
index 3be4301a900d1c659ee3800e16739d4576b9e24e..5ee2e053eb7b158de79940835778282bfa54ea7b 100644 (file)
--- a/acptemplates/languageExport.tpl
+++ b/acptemplates/languageExport.tpl
@@ -11,7 +11,7 @@
 {/if}
 
 {if $success|isset}
-       <p class="success">{lang}wcf.acp.language.add.success{/lang}</p>        
+       <p class="success">{lang}wcf.acp.language.add.success{/lang}</p>
 {/if}
 
 <div class="contentNavigation">
@@ -26,7 +26,7 @@
        <div class="container containerPadding marginTop shadow">
                <fieldset>
                        <legend>{lang}wcf.acp.language.export{/lang}</legend>
-               
+                       
                        <dl>
                                <dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
                                <dd>

diff --git a/acptemplates/languageMultilingualism.tpl b/acptemplates/languageMultilingualism.tpl
index a68c317da81ca58ea2ae975f1eb8e8f366a43868..d4bbba383cdd3ae4e2edb1e95c91e1fa703589fc 100644 (file)
--- a/acptemplates/languageMultilingualism.tpl
+++ b/acptemplates/languageMultilingualism.tpl
@@ -29,7 +29,7 @@
                <fieldset>
                        <legend><label><input type="checkbox" id="enable" name="enable" value="1" {if $enable}checked="checked" {/if}/> {lang}wcf.acp.language.multilingualism.enable{/lang}</label></legend>
                        <small>{lang}wcf.acp.language.multilingualism.enable.description{/lang}</small>
-               
+                       
                        <dl id="languageIDs" class="marginTop{if $errorField == 'languageIDs'} formError{/if}">
                                <dt><label for="languageIDs">{lang}wcf.acp.language.multilingualism.languages{/lang}</label></dt>
                                <dd class="floated">
@@ -37,7 +37,7 @@
                                        
                                        {if $errorField == 'languageIDs'}
                                                <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.acp.language.multilingualism.languages.error.empty{/lang}{/if}
+                                                       {lang}wcf.acp.language.multilingualism.languages.error.{@$errorType}{/lang}
                                                </small>
                                        {/if}
                                </dd>
@@ -45,8 +45,6 @@
                        
                        {event name='additionalFields'}
                </fieldset>
-               
-               
        </div>
        
        <div class="formSubmit">

diff --git a/acptemplates/languageServerAdd.tpl b/acptemplates/languageServerAdd.tpl
index 64404eafa8dd5bb140a7bf2361bf0e5b6bf116b8..1faef1e8d268149a5c59cb0846e77ee68d902a4d 100644 (file)
--- a/acptemplates/languageServerAdd.tpl
+++ b/acptemplates/languageServerAdd.tpl
@@ -40,7 +40,6 @@
                                        <small>{lang}wcf.acp.languageServer.server.description{/lang}</small>
                                </dd>
                        </dl>
-               
                </fieldset>
        </div>
        

diff --git a/acptemplates/languageServerList.tpl b/acptemplates/languageServerList.tpl
index 59cea2f681c752738390e9a06dbf768292d7dd27..f5d2c993cba5bb194f964e3d762d827363c775b3 100644 (file)
--- a/acptemplates/languageServerList.tpl
+++ b/acptemplates/languageServerList.tpl
@@ -40,7 +40,7 @@
                <hgroup>
                        <h1>{lang}wcf.acp.languageServer.list{/lang} <span class="badge badgeInverse" title="{lang}wcf.acp.languageServer.list.count{/lang}">{#$items}</span></h1>
                </hgroup>
-       
+               
                <table class="table">
                        <thead>
                                <tr>

diff --git a/files/lib/acp/form/LanguageMultilingualismForm.class.php b/files/lib/acp/form/LanguageMultilingualismForm.class.php
index c1aaaba2b13444128e9d9a6fa986bbf324287b3b..f8a3a1ef15f3e10bafdee33cee035a5c74d6ca3e 100644 (file)
--- 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 a4ca54ddf796362b61a376da9d653006bf1f1a71..8c6edf0230a42e2283cac01a253ad8384ff3bc7e 100644 (file)
--- 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 <http://opensource.org/licenses/lgpl-license.php>

diff --git a/files/lib/acp/form/LanguageServerEditForm.class.php b/files/lib/acp/form/LanguageServerEditForm.class.php
index 59f8242e13086b7d73d6ddd2d12583840ad066f4..7411e773158a5dc6b74e757872bc4925bb64c82f 100644 (file)
--- 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 <http://opensource.org/licenses/lgpl-license.php>

diff --git a/files/lib/acp/page/LanguageListPage.class.php b/files/lib/acp/page/LanguageListPage.class.php
index e8c5ea691de0ff1fb1baaad5f0e4ee328e2acc71..c475fd4925bfd1c9f6a49ccc7b6e9a93cfc7572c 100644 (file)
--- 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 70adc0c1e34f5aeccb22fc950f0e3dc3ddf2a03f..ff6248710e1a4fc212ffe82b445be04904169652 100644 (file)
--- 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 ad795c061deb03d3974d3492b4a426ee6dacc33b..b58ec83726f400acb0b387b94e12d298a5196c0b 100644 (file)
--- a/language/de.xml
+++ b/language/de.xml
@@ -9,16 +9,7 @@
        </category>
        
        <category name="wcf.acp.language">
-               <item name="wcf.acp.language.list"><![CDATA[Sprachen]]></item>
-               <item name="wcf.acp.language.list.count"><![CDATA[{#$items} Sprache{if $items != 1}n{/if}]]></item>
-               <item name="wcf.acp.language.name"><![CDATA[Name]]></item>
-               <item name="wcf.acp.language.users"><![CDATA[Verwendet von]]></item>
-               <item name="wcf.acp.language.variables"><![CDATA[Variablen]]></item>
-               <item name="wcf.acp.language.customVariables"><![CDATA[Veränderte Variablen]]></item>
-               <item name="wcf.acp.language.export"><![CDATA[Sprache exportieren]]></item>
-               <item name="wcf.acp.language.setAsDefault"><![CDATA[Zur Standardsprache machen]]></item>
                <item name="wcf.acp.language.add"><![CDATA[Sprache hinzufügen]]></item>
-               <item name="wcf.acp.language.edit"><![CDATA[Sprache bearbeiten]]></item>
                <item name="wcf.acp.language.add.languageCode.error.notUnique"><![CDATA[Dieser Sprachcode wird bereits von einer anderen im System installierten Sprache verwendet.]]></item>
                <item name="wcf.acp.language.add.mode"><![CDATA[Sprache erstellen durch]]></item>
                <item name="wcf.acp.language.add.mode.copy"><![CDATA[Übersetzen einer vorhandenen Sprache]]></item>
@@ -27,7 +18,10 @@
                <item name="wcf.acp.language.add.source"><![CDATA[Zu übersetzende Sprache]]></item>
                <item name="wcf.acp.language.code"><![CDATA[Sprachcode]]></item>
                <item name="wcf.acp.language.code.description"><![CDATA[Geben Sie hier den passenden Sprachcode nach <strong>ISO 639-1</strong> an. Weitere Informationen zu Sprachcodes finden Sie unter <a href="http://de.wikipedia.org/wiki/ISO_639-1" class="wcf-externalURL">http://de.wikipedia.org/wiki/ISO_639-1</a>.]]></item>
+               <item name="wcf.acp.language.customVariables"><![CDATA[Veränderte Variablen]]></item>
                <item name="wcf.acp.language.delete.sure"><![CDATA[Wollen Sie die Sprache „{$language->languageName}“ wirklich löschen?]]></item>
+               <item name="wcf.acp.language.edit"><![CDATA[Sprache bearbeiten]]></item>
+               <item name="wcf.acp.language.export"><![CDATA[Sprache exportieren]]></item>
                <item name="wcf.acp.language.export.allPackages"><![CDATA[Alle Pakete]]></item>
                <item name="wcf.acp.language.export.customValues"><![CDATA[Veränderte Variablen exportieren]]></item>
                <item name="wcf.acp.language.export.selectPackages"><![CDATA[Pakete auswählen]]></item>
@@ -36,12 +30,17 @@
                <item name="wcf.acp.language.import.source.file"><![CDATA[Pfad zur Sprachdatei]]></item>
                <item name="wcf.acp.language.import.source.file.description"><![CDATA[Geben Sie hier den relativen Pfad zu einer gültigen XML-Sprachdatei an.]]></item>
                <item name="wcf.acp.language.import.source.upload"><![CDATA[Sprachdatei vom lokalen Computer hochladen]]></item>
+               <item name="wcf.acp.language.list"><![CDATA[Sprachen]]></item>
+               <item name="wcf.acp.language.list.count"><![CDATA[{#$items} Sprache{if $items != 1}n{/if}]]></item>
                <item name="wcf.acp.language.multilingualism"><![CDATA[Mehrsprachigkeit verwalten]]></item>
                <item name="wcf.acp.language.multilingualism.enable"><![CDATA[Mehrsprachige Inhalte aktivieren]]></item>
                <item name="wcf.acp.language.multilingualism.enable.description"><![CDATA[Haben Sie mehrere Sprachen installiert, können sich Ihre Mitglieder die Programmoberfläche in diesen Sprachen anzeigen lassen. Erstellte Inhalte werden durch die aktivierte Mehrsprachigkeit außerdem einer Sprache zugeordnet. Die Benutzer können in ihrem Profil auswählen, dass ausschließlich Inhalte von bestimmten Sprachen angezeigt werden. Bei der Erstellung von Inhalten ist standardmäßig die aktive Oberflächensprache vorausgewählt.]]></item>
                <item name="wcf.acp.language.multilingualism.languages"><![CDATA[Inhalte in folgenden Sprachen zulassen]]></item>
                <item name="wcf.acp.language.multilingualism.languages.error.empty"><![CDATA[Um die Mehrsprachigkeit zu nutzen, müssen Sie mindestens zwei Sprachen auswählen.]]></item>
                <item name="wcf.acp.language.multilingualism.success"><![CDATA[Ihre Einstellungen wurden erfolgreich gespeichert.]]></item>
-               
+               <item name="wcf.acp.language.name"><![CDATA[Name]]></item>
+               <item name="wcf.acp.language.setAsDefault"><![CDATA[Zur Standardsprache machen]]></item>
+               <item name="wcf.acp.language.variables"><![CDATA[Variablen]]></item>
+               <item name="wcf.acp.language.users"><![CDATA[Verwendet von]]></item>
        </category>
 </language>
\ No newline at end of file