From 03bae6ff27440ebecfcd9a3cb97f305ee9a56ceb Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 14 Dec 2011 21:34:24 +0000
Subject: [PATCH] Add CP850 to translation class list of installed charsets,
 don't need to add it in import/export

---
 importexport/inc/class.importexport_definitions_ui.inc.php     | 1 -
 .../inc/class.importexport_wizard_basic_export_csv.inc.php     | 2 --
 .../inc/class.importexport_wizard_basic_import_csv.inc.php     | 2 --
 phpgwapi/inc/class.translation.inc.php                         | 3 ++-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/importexport/inc/class.importexport_definitions_ui.inc.php b/importexport/inc/class.importexport_definitions_ui.inc.php
index ef25bff7f5..be5fe57869 100644
--- a/importexport/inc/class.importexport_definitions_ui.inc.php
+++ b/importexport/inc/class.importexport_definitions_ui.inc.php
@@ -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';
 
diff --git a/importexport/inc/class.importexport_wizard_basic_export_csv.inc.php b/importexport/inc/class.importexport_wizard_basic_export_csv.inc.php
index f18f5ed9f3..e554ba1ed5 100644
--- a/importexport/inc/class.importexport_wizard_basic_export_csv.inc.php
+++ b/importexport/inc/class.importexport_wizard_basic_export_csv.inc.php
@@ -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'),
                         );
 
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 3d89d806d6..92e6a75139 100644
--- a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
+++ b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
@@ -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'),
 			);
 
diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index e7d7edb979..1d89f9a312 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -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;