diff --git a/phpgwapi/inc/class.sbox.inc.php b/phpgwapi/inc/class.sbox.inc.php index 638d6f40f4..e56b5d3482 100644 --- a/phpgwapi/inc/class.sbox.inc.php +++ b/phpgwapi/inc/class.sbox.inc.php @@ -283,6 +283,19 @@ 'ZW'=>'ZIMBABWE' ); + function sbox() + { + foreach ($this->country_array as $key => $name) + { + $translated = lang($name); + if ($translated != $name.'*') + { + $this->country_array[$key] = $translated; + } + } + asort($this->country_array); + } + function hour_formated_text($name, $selected = 0) { $s = '<select name="' . $name . '">'; diff --git a/preferences/inc/hook_settings.inc.php b/preferences/inc/hook_settings.inc.php index 55e4813144..6faa1b1c3c 100755 --- a/preferences/inc/hook_settings.inc.php +++ b/preferences/inc/hook_settings.inc.php @@ -82,6 +82,14 @@ $langs[$GLOBALS['phpgw']->db->f('lang')] = $db2->f('lang_name'); } } + foreach ($langs as $key => $name) // if we have a translation use it + { + $trans = lang($name); + if ($trans != $name . '*') + { + $langs[$key] = $trans; + } + } create_select_box('Language','lang',$langs); // preference.php handles this function