Author: jsuchome Date: Thu Nov 19 09:51:10 2009 New Revision: 59607 URL: http://svn.opensuse.org/viewcvs/yast?rev=59607&view=rev Log: - show native language form also on installed system (bnc#555531) - 2.17.38 Modified: branches/SuSE-Code-11-SP1-Branch/country/VERSION branches/SuSE-Code-11-SP1-Branch/country/language/src/modules/Language.ycp branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes Modified: branches/SuSE-Code-11-SP1-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/country/VERSION?rev=59607&r1=59606&r2=59607&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/country/VERSION Thu Nov 19 09:51:10 2009 @@ -1 +1 @@ -2.17.37 +2.17.38 Modified: branches/SuSE-Code-11-SP1-Branch/country/language/src/modules/Language.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/country/language/src/modules/Language.ycp?rev=59607&r1=59606&r2=59607&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/language/src/modules/Language.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/country/language/src/modules/Language.ycp Thu Nov 19 09:51:10 2009 @@ -1157,11 +1157,14 @@ // mapping of language name (translated) to language code map lang2code = $[]; + // mapping language code to native form + map code2native = $[]; // list of language names (translated) list<string> lang_list = []; foreach (any name, list codelist, languageselsort, { lang2code [codelist[2]:""] = codelist[1]:""; lang_list = add (lang_list, codelist[2]:""); + code2native[codelist[1]:""] = codelist[0]:""; }); @@ -1189,8 +1192,9 @@ secondary_items = maplist (string trans_lang, lsort (lang_list), { string code = lang2code [trans_lang]:""; + string show_lang = language == code ? trans_lang : sformat ("%1 - %2", trans_lang, code2native[code]:""); primary_items = add (primary_items, icons ? - `item (`id (code), `icon(tolower(Language::GetGivenLanguageCountry(code))+"/flag.png"), trans_lang, language == code) : + `item (`id (code), `icon(tolower(Language::GetGivenLanguageCountry(code))+"/flag.png"), show_lang, language == code) : `item (`id (code), trans_lang, language == code)); if (language == code) primary_included = true; Modified: branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes?rev=59607&r1=59606&r2=59607&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes Thu Nov 19 09:51:10 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 19 09:49:11 CET 2009 - jsuchome@suse.cz + +- show native language form also on installed system (bnc#555531) +- 2.17.38 + +------------------------------------------------------------------- Tue Oct 27 13:58:30 CET 2009 - jsuchome@suse.cz - make PackagesCommit available for outside -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org