holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add CP850 to translation class list of installed charsets, don't need to add it in import/export

Browse Source
This commit is contained in:
Nathan Gray 2011-12-14 21:34:24 +00:00
parent ee98b63c0b
commit 03bae6ff27
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
importexport/inc/class.importexport_definitions_ui.inc.php
View File

@ -966,7 +966,6 @@ class importexport_definitions_ui
{
unset($sel_options['import_charsets'][strtoupper($charset)]);
}
unset($sel_options['import_charsets']['CP850']); // This one explicitly added in wizard
if(!$data['update']) $data['update'] = 'request';

2
importexport/inc/class.importexport_wizard_basic_export_csv.inc.php
View File

@ -201,8 +201,6 @@ class importexport_wizard_basic_export_csv
);
$sel_options['charset'] = $GLOBALS['egw']->translation->get_installed_charsets()+
array(
'utf-8' => 'utf-8 (Unicode)',
'CP850' => 'CP850 (Old DOS systems)',
'user' => lang('User preference'),
);

2
importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
View File

@ -217,8 +217,6 @@ class importexport_wizard_basic_import_csv
$sel_options['charset'] = $GLOBALS['egw']->translation->get_installed_charsets()+
array(
'utf-8' => 'utf-8 (Unicode)',
'CP850' => 'CP850 (Old DOS systems)',
'user' => lang('User preference'),
);

3
phpgwapi/inc/class.translation.inc.php
View File

@ -498,7 +498,7 @@ class translation
if (!isset($charsets))
{
$charsets = array(
'utf-8' => lang('all languages').' (utf-8)',
'utf-8' => lang('Unicode').' (utf-8)',
'iso-8859-1' => lang('Western european').' (iso-8859-1)',
'iso-8859-2' => lang('Eastern european').' (iso-8859-2)',
'iso-8859-7' => lang('Greek').' (iso-8859-7)',
@ -506,6 +506,7 @@ class translation
'euc-kr' => lang('Korean').' (euc-kr)',
'koi8-r' => lang('Russian').' (koi8-r)',
'windows-1251' => lang('Bulgarian').' (windows-1251)',
'cp850' => lang('DOS International').' (CP850)',
);
}
return $charsets;