From: Jens T. <je...@us...> - 2003-09-30 23:06:42
|
Update of /cvsroot/gallery/gallery In directory sc8-pr-cvs1:/tmp/cvs-serv22385 Modified Files: Tag: BRANCH_1_4 ChangeLog Version.php nls.php util.php Log Message: 2003-10-01 Jens Tkotz <je...@pe...> 1.4-pl1-lang1 * Fixed Bug in initlanguage() which caused Gallery not to detect Broweserlanguage when using Opera * Fixed Bug in report. * New Languages: Bulgarian (bg_BG), Brazilian Portuguese (pt_BR), Korean (ko_KR), Hungarian (hu_HU) * Language updates: German (de_DE), Polish (pl_PL), Icelandish (is_IS); Finnish (fi_FI), Czech (cs_CZ), Hebrew (he_IL), Turkish (tr_TR), Dutch (nl_NL), Spanish (es_ES), Japanese (ja_JP), Traditional Chinese (zh_TW) * Changed charset for Czech (cs_CZ) to windows-1250 * removed broken lines in .po files (thanks to donwillingham for help and script !) * Added Copyright to po files Index: ChangeLog =================================================================== RCS file: /cvsroot/gallery/gallery/ChangeLog,v retrieving revision 1.479.2.62 retrieving revision 1.479.2.63 diff -u -r1.479.2.62 -r1.479.2.63 --- ChangeLog 13 Sep 2003 00:20:12 -0000 1.479.2.62 +++ ChangeLog 30 Sep 2003 23:05:35 -0000 1.479.2.63 @@ -1,4 +1,29 @@ =============================================================================== +2003-10-01 v1.4-pl1-lang1 release +=============================================================================== + +2003-10-01 Jens Tkotz <je...@pe...> 1.4-pl1-lang1 + + * Fixed Bug in initlanguage() which caused Gallery + not to detect Broweserlanguage when using Opera + + * Fixed Bug in report. + + * New Languages: Bulgarian (bg_BG), Brazilian Portuguese (pt_BR), Korean (ko_KR), + Hungarian (hu_HU) + + * Language updates: German (de_DE), Polish (pl_PL), Icelandish (is_IS); Finnish (fi_FI), + Czech (cs_CZ), Hebrew (he_IL), Turkish (tr_TR), Dutch (nl_NL), + Spanish (es_ES), Japanese (ja_JP), Traditional Chinese (zh_TW) + + * Changed charset for Czech (cs_CZ) to windows-1250 + + * removed broken lines in .po files + (thanks to donwillingham for help and script !) + + * Added Copyright to po files + +=============================================================================== 2003-09-12 v1.4-pl1 release =============================================================================== Index: Version.php =================================================================== RCS file: /cvsroot/gallery/gallery/Version.php,v retrieving revision 1.282.2.57 retrieving revision 1.282.2.58 diff -u -r1.282.2.57 -r1.282.2.58 --- Version.php 13 Sep 2003 00:12:33 -0000 1.282.2.57 +++ Version.php 30 Sep 2003 23:05:35 -0000 1.282.2.58 @@ -40,8 +40,8 @@ $gallery = new stdClass(); } -$gallery->version = "1.4-pl1"; -$gallery->config_version = 48; +$gallery->version = "1.4-pl1-lang1"; +$gallery->config_version = 49; $gallery->album_version = '15.1'; $gallery->remote_protocol_version = 1; $gallery->user_version = 1; Index: nls.php =================================================================== RCS file: /cvsroot/gallery/gallery/nls.php,v retrieving revision 1.10.2.8 retrieving revision 1.10.2.9 diff -u -r1.10.2.8 -r1.10.2.9 --- nls.php 9 Sep 2003 05:10:10 -0000 1.10.2.8 +++ nls.php 30 Sep 2003 23:05:35 -0000 1.10.2.9 @@ -24,7 +24,7 @@ * * This array was taken from then Horde Framework (http://horde.org) * The original filename was horde/config/nls.php.dist and it was - * maintained by Jan Schneider (ma...@ja...) + * maintained by Jan Schneider (ja...@ho...) * The modifications to fit it for Gallery were made by Jens Tkotz * (je...@pe...) * @@ -42,6 +42,7 @@ function getNLS () { $nls['language']['zh_CN'] = 'Simplified Chinese (简体中文)'; $nls['language']['zh_TW'] = 'Traditional Chinese (繁體中文)'; + $nls['language']['bg_BG'] = 'Български'; $nls['language']['cs_CZ'] = 'Česky'; $nls['language']['da_DK'] = 'Dansk'; $nls['language']['de_DE'] = 'Deutsch'; @@ -53,11 +54,14 @@ $nls['language']['he_IL'] = 'Hebrew'; $nls['language']['is_IS'] = 'Íslenska'; $nls['language']['ja_JP'] = '日本語 (EUC-JP)'; + $nls['language']['ko_KR'] = '한국어'; $nls['language']['lt_LT'] = 'Lietuvių'; + $nls['language']['hu_HU'] = 'Magyar'; $nls['language']['nl_NL'] = 'Nederlands'; $nls['language']['no_NO'] = 'Norsk bokmål'; $nls['language']['pl_PL'] = 'Polski'; $nls['language']['pt_PT'] = 'Português'; + $nls['language']['pt_BR'] = 'Português Brasileiro'; $nls['language']['ru_RU'] = 'Русский (Windows)'; $nls['language']['ru_RU.koi8r'] = 'Русский (KOI8-R)'; $nls['language']['sl_SI'] = 'Slovenščina'; @@ -77,9 +81,11 @@ $nls['alias']['es'] = 'es_ES'; $nls['alias']['fi'] = 'fi_FI'; $nls['alias']['fr'] = 'fr_FR'; + $nls['alias']['hu'] = 'hu_HU'; $nls['alias']['is'] = 'is_IS'; $nls['alias']['it'] = 'it_IT'; $nls['alias']['ja'] = 'ja_JP'; + $nls['alias']['ko'] = 'ko_KR'; $nls['alias']['lt'] = 'lt_LT'; $nls['alias']['nl'] = 'nl_NL'; $nls['alias']['no'] = 'no_NO'; @@ -103,11 +109,11 @@ $nls['alias']['danish'] = 'da_DK' ; $nls['alias']['da_DK.ISO8859-1'] = 'da_DK' ; + $nls['alias']['german'] = 'de_DE' ; $nls['alias']['de_LI'] = 'de_DE' ; $nls['alias']['de_LU'] = 'de_DE' ; $nls['alias']['de_CH'] = 'de_DE' ; $nls['alias']['de_AT'] = 'de_DE' ; - $nls['alias']['german'] = 'de_DE' ; $nls['alias']['de_DE.ISO8859-1'] = 'de_DE' ; $nls['alias']['spanish'] = 'es_ES' ; @@ -119,11 +125,12 @@ $nls['alias']['english'] = 'en_US' ; $nls['alias']['en_US.ISO8859-1'] = 'en_US' ; + $nls['alias']['french'] = 'fr_FR' ; $nls['alias']['fr_BE'] = 'fr_FR' ; $nls['alias']['fr_CA'] = 'fr_FR' ; $nls['alias']['fr_LU'] = 'fr_FR' ; $nls['alias']['fr_CH'] = 'fr_FR' ; - $nls['alias']['french'] = 'fr_FR' ; + $nls['alias']['fr_FR.ISO8859-1'] = 'fr_FR' ; $nls['alias']['finnish'] = 'fi_FI' ; @@ -135,12 +142,16 @@ $nls['alias']['italian'] = 'it_IT' ; $nls['alias']['it_IT.ISO8859-1'] = 'it_IT' ; - $nls['alias']['he_HE'] = 'he_IL' ; $nls['alias']['hebrew'] = 'he_IL' ; + $nls['alias']['he_HE'] = 'he_IL' ; $nls['alias']['he_IL.ISO8859-8'] = 'he_IL' ; + $nls['alias']['hungarian'] = 'hu_HU' ; + $nls['alias']['ja_JP.EUC-JP'] = 'ja_JP' ; $nls['alias']['ja_JP.EUC'] = 'ja_JP' ; + + $nls['alias']['ko_KR.EUC-KR'] = 'ko_KR' ; $nls['alias']['lt_LT.ISO8859-4'] = 'lt_LT' ; $nls['alias']['lt_LT.ISO8859-13'] = 'lt_LT' ; @@ -155,9 +166,13 @@ $nls['alias']['polish'] = 'pl_PL' ; $nls['alias']['pl_PL.ISO8859-2'] = 'pl_PL' ; + $nls['alias']['brazilian'] = 'pt_BR' ; + $nls['alias']['pt_BR.ISO8859-1'] = 'pt_BR' ; + $nls['alias']['pt_BR.ISO8859-15'] = 'pt_BR' ; + $nls['alias']['portuguese'] = 'pt_PT' ; - $nls['alias']['pt_PT.ISO8859-2'] = 'pt_PT' ; $nls['alias']['pt_PT.ISO8859-1'] = 'pt_PT' ; + $nls['alias']['pt_PT.ISO8859-15'] = 'pt_PT' ; $nls['alias']['russian'] = 'ru_RU'; //$nls['alias']['russian'] = 'ru_RU.koi8r'; @@ -179,9 +194,10 @@ $nls['alias']['zh_CN.EUC'] = 'zh_CN' ; + $nls['alias']['chinese'] = 'zh_TW' ; $nls['alias']['zh_TW.GB2312'] = 'zh_TW' ; $nls['alias']['zh_TW.Big5'] = 'zh_TW' ; - $nls['alias']['chinese'] = 'zh_TW' ; + /** ** Charsets @@ -192,11 +208,14 @@ $nls['default']['charset'] = 'ISO-8859-1'; - $nls['charset']['cs_CZ'] = 'ISO-8859-2'; + $nls['charset']['bg_BG'] = 'windows-1251'; + $nls['charset']['cs_CZ'] = 'windows-1250'; $nls['charset']['he_IL'] = 'windows-1255'; + $nls['charset']['hu_HU'] = 'ISO-8859-2'; $nls['charset']['ja_JP'] = 'EUC-JP'; $nls['charset']['lt_LT'] = 'windows-1257'; $nls['charset']['ja_JP'] = 'EUC-JP'; + $nls['charset']['ko_KR'] = 'EUC-KR'; $nls['charset']['pl_PL'] = 'ISO-8859-2'; $nls['charset']['ru_RU'] = 'windows-1251'; $nls['charset']['ru_RU.KOI8-R'] = 'KOI8-R'; @@ -216,6 +235,7 @@ $nls['multibyte']['BIG5'] = true; $nls['multibyte']['GB2312'] = true; $nls['multibyte']['EUC-JP'] = true; + $nls['multibyte']['EUC-KR'] = true; $nls['multibyte']['UTF-8'] = true; /** @@ -235,6 +255,7 @@ /** ** Nuke **/ + $nls['nuke']['pt_BR'] = 'brazilian' ; $nls['nuke']['zh_TW'] = 'chinese' ; $nls['nuke']['cs_CZ'] = 'czech' ; $nls['nuke']['de_DE'] = 'german'; @@ -243,6 +264,7 @@ $nls['nuke']['es_ES'] = 'spanish'; $nls['nuke']['fr_FR'] = 'french'; $nls['nuke']['fi_FI'] = 'finnish'; + $nls['nuke']['hu_HU'] = 'hungarian'; $nls['nuke']['it_IT'] = 'italian'; $nls['nuke']['is_IS'] = 'icelandic'; $nls['nuke']['nl_NL'] = 'dutch'; Index: util.php =================================================================== RCS file: /cvsroot/gallery/gallery/util.php,v retrieving revision 1.184.2.12 retrieving revision 1.184.2.13 diff -u -r1.184.2.12 -r1.184.2.13 --- util.php 13 Sep 2003 00:12:33 -0000 1.184.2.12 +++ util.php 30 Sep 2003 23:05:36 -0000 1.184.2.13 @@ -1800,6 +1800,10 @@ // Detect Browser Language $lang = explode (",", $HTTP_SERVER_VARS["HTTP_ACCEPT_LANGUAGE"]); $lang_pieces=explode ("-",$lang[0]); + $spos=strpos($lang[0],";"); + if ($spos >0) { + $lang[0]=substr($lang[0],0,$spos); + } if (strlen($lang[0]) ==2) { $gallery->browser_language=$lang[0] ."_".strtoupper($lang[0]); |