Author: jsuchome Date: Mon Jan 21 12:50:42 2008 New Revision: 43771 URL: http://svn.opensuse.org/viewcvs/yast?rev=43771&view=rev Log: - fixed selecting non-listed locale (#344105) - 2.13.55 Modified: branches/SuSE-SLE-10-SP2-Branch/country/VERSION branches/SuSE-SLE-10-SP2-Branch/country/language/src/select_language.ycp branches/SuSE-SLE-10-SP2-Branch/country/package/yast2-country.changes Modified: branches/SuSE-SLE-10-SP2-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/country/VERSION?rev=43771&r1=43770&r2=43771&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/country/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/country/VERSION Mon Jan 21 12:50:42 2008 @@ -1 +1 @@ -2.13.54 +2.13.55 Modified: branches/SuSE-SLE-10-SP2-Branch/country/language/src/select_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/country/language/src/select_language.ycp?rev=43771&r1=43770&r2=43771&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/country/language/src/select_language.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/country/language/src/select_language.ycp Mon Jan 21 12:50:42 2008 @@ -327,10 +327,10 @@ // if checkboxes for adapting keyboard and timezone should be shown boolean adapt_term = more_languages && !Mode::config (); + list<term> primary_items = []; if (more_languages) { boolean primary_included= false; - list primary_items = []; term languages_term = `MultiSelectionBox (`id(`languages), // multiselection box label @@ -507,6 +507,21 @@ Wizard::ShowHelp( help_text ); } + if (ret == `changed_locale) + { + boolean primary_included = false; + if (nil == find (term i, primary_items,``(i[0,0]:nil == language))) + { + primary_items = add (primary_items, + `item (`id (language), language, true)); + UI::ChangeWidget (`id(`language), `Items, primary_items); + }; + if (Mode::config ()) + { + Language::Set (language); + } + } + if (ret == `next || ((ret == `language || ret == `changed_locale) && ! Mode::config ())) { Modified: branches/SuSE-SLE-10-SP2-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/country/package/yast2-country.changes?rev=43771&r1=43770&r2=43771&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/country/package/yast2-country.changes Mon Jan 21 12:50:42 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 21 12:28:57 CET 2008 - jsuchome@suse.cz + +- fixed selecting non-listed locale (#344105) +- 2.13.55 + +------------------------------------------------------------------- Thu Dec 13 14:22:19 CET 2007 - jsuchome@suse.cz - disable DPMS while adapting time (#348348) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org