Author: jsuchome Date: Thu Jun 4 12:46:45 2009 New Revision: 57427 URL: http://svn.opensuse.org/viewcvs/yast?rev=57427&view=rev Log: - show also native language forms in firstboot (bnc#492812) - fixed string for Traditional Chinese (bnc#492812) - 2.17.33 Modified: branches/SuSE-Code-11-Branch/country/VERSION branches/SuSE-Code-11-Branch/country/language/data/language_zh_TW.ycp branches/SuSE-Code-11-Branch/country/language/src/modules/Language.ycp branches/SuSE-Code-11-Branch/country/package/yast2-country.changes Modified: branches/SuSE-Code-11-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/country/VERSION?rev=57427&r1=57426&r2=57427&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/country/VERSION (original) +++ branches/SuSE-Code-11-Branch/country/VERSION Thu Jun 4 12:46:45 2009 @@ -1 +1 @@ -2.17.32 +2.17.33 Modified: branches/SuSE-Code-11-Branch/country/language/data/language_zh_TW.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/country/language/data/language_zh_TW.ycp?rev=57427&r1=57426&r2=57427&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/country/language/data/language_zh_TW.ycp (original) +++ branches/SuSE-Code-11-Branch/country/language/data/language_zh_TW.ycp Thu Jun 4 12:46:45 2009 @@ -28,8 +28,8 @@ // <translated Language-to-display-UTF8-coded> ] // "zh_TW" : [ - "繁體中文 (台灣)", - "Traditional Chinese (Taiwan)", + "繁體中文", + "Traditional Chinese", ".UTF-8", "", // language name @@ -40,4 +40,4 @@ // 3. which keyboard layout propose for this language "keyboard" : "english-us", ]; -} \ No newline at end of file +} Modified: branches/SuSE-Code-11-Branch/country/language/src/modules/Language.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/country/language/src/modules/Language.ycp?rev=57427&r1=57426&r2=57427&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/country/language/src/modules/Language.ycp (original) +++ branches/SuSE-Code-11-Branch/country/language/src/modules/Language.ycp Thu Jun 4 12:46:45 2009 @@ -1087,9 +1087,7 @@ boolean use_ascii = GetTextMode (); - if (kind == `first_screen) - { - map en_name_sort = + map en_name_sort = mapmap (string code, list info, Selection(), { string english = EnglishName (code, info[2]:code); return $[ @@ -1098,7 +1096,9 @@ code, ] ]; - }); + }); + if (kind == `first_screen) + { // fate 301789 // English name of language (translated language). // e.g. German (Deutsch) @@ -1140,9 +1140,12 @@ if (Stage::firstboot ()) { - ret = maplist (string trans_lang, lsort (lang_list), { - string code = lang2code [trans_lang]:""; - return `item (`id (code), trans_lang, language == code); + // show also native forms in firstboot (bnc#492812) + ret = maplist (string name, list codelist, en_name_sort, { + string code = codelist[1]:""; + string label = substring (code, 0, 2) == "en" ? + codelist[0]:"" : sformat ("%1 - %2", name, codelist[0]:""); + return `item (`id (code), label, language == code); }); return ret; } Modified: branches/SuSE-Code-11-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/country/package/yast2-country.changes?rev=57427&r1=57426&r2=57427&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Code-11-Branch/country/package/yast2-country.changes Thu Jun 4 12:46:45 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu May 28 08:59:14 CEST 2009 - jsuchome@suse.cz + +- show also native language forms in firstboot (bnc#492812) +- fixed string for Traditional Chinese (bnc#492812) +- 2.17.33 + +------------------------------------------------------------------- Wed Feb 25 14:34:18 CET 2009 - jsuchome@suse.cz - install language dependent packages in firstboot (bnc#479553) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org