The branch, master has been updated via ed988b257cdad0ea74bfa4fbc105c47524ad0dae (commit) via 3eeb09bfe08c2939765d96967f78bc6ca8d0b421 (commit) via b382f33e8dd7c9b587878bff999d84dab5cd8756 (commit) from 297035b8536e0a3e976d9120acd459eade2ae1cf (commit)

- Log ----------------------------------------------------------------- commit ed988b257cdad0ea74bfa4fbc105c47524ad0dae Author: Michal Čihař mcihar@novell.com Date: Tue Apr 5 14:00:10 2011 +0200

Explicitely state GLOBALS here, though it should not be needed

commit 3eeb09bfe08c2939765d96967f78bc6ca8d0b421 Author: Michal Čihař mcihar@novell.com Date: Tue Apr 5 13:41:04 2011 +0200

Remove duplicate case for English

commit b382f33e8dd7c9b587878bff999d84dab5cd8756 Author: Michal Čihař mcihar@novell.com Date: Tue Apr 5 13:39:54 2011 +0200

Add UTF-8 transcription of language

-----------------------------------------------------------------------

Summary of changes: libraries/select_lang.lib.php | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 407da6f..2751df3 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -199,8 +199,6 @@ function PMA_langDetect($str, $envType) */ function PMA_langDetails($lang) { switch ($lang) { - case 'en': - return array('en|english', 'en', ''); case 'af': return array('af|afrikaans', 'af', ''); case 'ar': @@ -208,7 +206,7 @@ function PMA_langDetails($lang) { case 'az': return array('az|azerbaijani', 'az', 'Azərbaycanca'); case 'bn': - return array('bn|bangla', 'bn', ''); + return array('bn|bangla', 'bn', 'বাংলা'); case 'be': return array('be|belarusian', 'be', 'Беларуская'); case 'be@latin': @@ -479,7 +477,7 @@ if (! function_exists('__')) { $charset = 'utf-8';

/* l10n: Text direction, use either ltr or rtl */ -$text_dir = __('ltr'); +$GLOBALS['text_dir'] = __('ltr');

// now, that we have loaded the language strings we can send the errors if ($GLOBALS['lang_failed_cfg']) {

hooks/post-receive