Fixes missing i18n package name consideration in language export form
authorMatthias Schmidt <gravatronics@live.com>
Mon, 21 May 2012 11:28:43 +0000 (13:28 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 21 May 2012 11:28:43 +0000 (13:28 +0200)
acptemplates/languageExport.tpl
files/lib/acp/form/LanguageExportForm.class.php

index 43613026caed77f230eb7471d4f129b4264847df..1b0ce189de3c9e1f903ea20cb5c3a82e0f265fdc 100644 (file)
@@ -42,7 +42,7 @@
                                                <option value="-">--------------------</option>
                                                {foreach from=$packages item=package}
                                                        {assign var=loop value=$packageNameLength-$package->packageNameLength}
-                                                       <option value="{@$package->packageID}"{if $selectedPackages[$package->packageID]|isset} selected="selected"{/if}>{$package->packageName} {section name=i loop=$loop}&nbsp;{/section}&nbsp;&nbsp;{$package->package}</option>
+                                                       <option value="{@$package->packageID}"{if $selectedPackages[$package->packageID]|isset} selected="selected"{/if}>{lang}{$package->packageName}{/lang} {section name=i loop=$loop}&nbsp;{/section}&nbsp;&nbsp;{$package->package}</option>
                                                {/foreach}
                                        </select>
                                </dd>
@@ -58,7 +58,6 @@
        
        <div class="formSubmit">
                <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
-               {@SID_INPUT_TAG}
        </div>
 </form>
 
index ef12a733b586c8308fa2ba94296f8dd87b3d4eeb..3c504e6afd5df00f950fbddb57e5366fae2c41b2 100644 (file)
@@ -158,7 +158,7 @@ class LanguageExportForm extends ACPForm {
                $statement = WCF::getDB()->prepareStatement($sql);
                $statement->execute(array($this->languageID));
                while ($row = $statement->fetchArray()) {
-                       $row['packageNameLength'] = StringUtil::length($row['packageName']); 
+                       $row['packageNameLength'] = StringUtil::length(WCF::getLanguage()->get($row['packageName']));
                        $this->packages[] = new Package(null, $row);
                        if ($row['packageNameLength'] > $this->packageNameLength) {
                                $this->packageNameLength = $row['packageNameLength'];