From 2c636586c63988a6b4d202b47542c131774b1bb0 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 30 Nov 2011 18:06:35 +0000 Subject: [PATCH] Allow importing files with any encoding supported by server, not just eGW encodings --- .../inc/class.importexport_wizard_basic_import_csv.inc.php | 2 +- importexport/lang/egw_en.lang | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php index f103233d1d..c051beee9f 100644 --- a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php +++ b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php @@ -219,7 +219,7 @@ class importexport_wizard_basic_import_csv array( 'utf-8' => 'utf-8 (Unicode)', 'user' => lang('User preference') - ); + ) + array(lang('All encodings') => array_combine(mb_list_encodings(),mb_list_encodings())); $sel_options['convert'] = array( 0 => lang('Database values'), 1 => lang('Human friendly values') diff --git a/importexport/lang/egw_en.lang b/importexport/lang/egw_en.lang index 10b7377bb2..2da8816431 100644 --- a/importexport/lang/egw_en.lang +++ b/importexport/lang/egw_en.lang @@ -9,6 +9,7 @@ (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 admin disabled exporting importexport en Admin disabled exporting +all encodings importexport en All encodings allowed users importexport en Allowed users automatically created by importexport importexport en Automatically created by Import|Export basic csv import importexport en Basic CSV import