From 6f71f8618127b4abcaec96e90ee0816141e65a0a Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Sun, 5 May 2013 00:29:24 +0000
Subject: [PATCH]  * set the charset of export same as mail configuration.

---
 module/common/lang/en.php        | 5 -----
 module/common/lang/zh-cn.php     | 5 -----
 module/file/view/export.html.php | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index d91d116955..3aff149ef2 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -109,11 +109,6 @@ $lang->importEncodeList['gbk']   = 'GBK';
 $lang->importEncodeList['big5']  = 'BIG5';
 $lang->importEncodeList['utf-8'] = 'UTF-8';
 
-/* File type of export. */
-$lang->exportFileTypeList['csv']  = 'csv';
-$lang->exportFileTypeList['xml']  = 'xml';
-$lang->exportFileTypeList['html'] = 'html';
-
 $lang->exportTypeList['all']      = 'All records';
 $lang->exportTypeList['selected'] = 'Only checked';
 
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 432bb98d5c..80e1ce6caf 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -117,11 +117,6 @@ $lang->exportFileTypeList['html'] = 'html';
 $lang->exportTypeList['all']      = '全部记录';
 $lang->exportTypeList['selected'] = '选中记录';
 
-/* 支持的编码格式。*/
-$lang->exportEncodeList['gbk']   = 'GBK';
-$lang->exportEncodeList['big5']  = 'BIG5';
-$lang->exportEncodeList['utf-8'] = 'UTF-8';
-
 /* 风格列表。*/
 $lang->themes['default']   = '默认';
 $lang->themes['green']     = '绿色';
diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php
index 377d98c401..2322a07a2a 100644
--- a/module/file/view/export.html.php
+++ b/module/file/view/export.html.php
@@ -52,7 +52,7 @@ function switchEncode(fileType)
         echo $lang->setFileName . ' ';
         echo html::input('fileName', '', 'class=text-2');
         echo html::select('fileType',   $lang->exportFileTypeList, '', 'onchange=switchEncode(this.value)');
-        echo html::select('encode',     $lang->exportEncodeList, 'gbk', key($lang->exportFileTypeList) == 'csv' ? "" : "class='hidden'");
+        echo html::select('encode',     $config->charsets[$this->cookie->lang], 'utf-8', key($lang->exportFileTypeList) == 'csv' ? "" : "class='hidden'");
         echo html::select('exportType', $lang->exportTypeList, ($this->cookie->checkedItem) ? 'selected' : 'all');
         echo html::submitButton();
         ?>