extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow importing files with any encoding supported by server, not just eGW encodings

Browse Source
This commit is contained in:
Nathan Gray 2011-11-30 18:06:35 +00:00
parent abe612461c
commit 2c636586c6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,7 +219,7 @@ class importexport_wizard_basic_import_csv
array( array(
'utf-8' => 'utf-8 (Unicode)', 'utf-8' => 'utf-8 (Unicode)',
'user' => lang('User preference') 'user' => lang('User preference')
); ) + array(lang('All encodings') => array_combine(mb_list_encodings(),mb_list_encodings()));
$sel_options['convert'] = array( $sel_options['convert'] = array(
0 => lang('Database values'), 0 => lang('Database values'),
1 => lang('Human friendly values') 1 => lang('Human friendly values')

1
importexport/lang/egw_en.lang
View File

@ -9,6 +9,7 @@
(0-6, 0=sun) importexport en (0-6, 0=Sun) (0-6, 0=sun) importexport en (0-6, 0=Sun)
*contact id cannot be changed by import importexport en *Contact ID cannot be changed by import *contact id cannot be changed by import importexport en *Contact ID cannot be changed by import
admin disabled exporting importexport en Admin disabled exporting admin disabled exporting importexport en Admin disabled exporting
all encodings importexport en All encodings
allowed users importexport en Allowed users allowed users importexport en Allowed users
automatically created by importexport importexport en Automatically created by Import|Export automatically created by importexport importexport en Automatically created by Import|Export
basic csv import importexport en Basic CSV import basic csv import importexport en Basic CSV import