Author: jsuchome Date: Thu Nov 19 09:50:57 2009 New Revision: 59606 URL: http://svn.opensuse.org/viewcvs/yast?rev=59606&view=rev Log: - show native language form also on installed system (bnc#555531) - 2.19.1 Modified: trunk/country/VERSION trunk/country/language/src/modules/Language.ycp trunk/country/package/yast2-country.changes trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=59606&r1=59605&r2=59606&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Thu Nov 19 09:50:57 2009 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/country/language/src/modules/Language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/modules/Language.ycp?rev=59606&r1=59605&r2=59606&view=diff ============================================================================== --- trunk/country/language/src/modules/Language.ycp (original) +++ trunk/country/language/src/modules/Language.ycp Thu Nov 19 09:50:57 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: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=59606&r1=59605&r2=59606&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Thu Nov 19 09:50:57 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 19 09:48:22 CET 2009 - jsuchome@suse.cz + +- show native language form also on installed system (bnc#555531) +- 2.19.1 + +------------------------------------------------------------------- Thu Nov 05 18:47:28 CET 2009 - aschnell@suse.de - follow naming convention for sysconfig agents Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp?rev=59606&r1=59605&r2=59606&view=diff ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Thu Nov 19 09:50:57 2009 @@ -403,6 +403,8 @@ term settime = `Empty(); + // "On a mainframe it is impossible for the user to change the hardware clock. + // So you can only specify the timezone." (ihno) if (!Arch::s390 () && !Mode::config ()) { // button text -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org