Author: jsuchome Date: Fri Aug 17 15:13:23 2007 New Revision: 40336 URL: http://svn.opensuse.org/viewcvs/yast?rev=40336&view=rev Log: - when non-listed locale is selected, add it to the list of primary languages (#301019) - add autoyast support for use_utf8 and rootlang values (#289546) - 2.15.18 Modified: trunk/country/VERSION trunk/country/language/src/modules/Language.ycp trunk/country/language/src/select_language.ycp trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=40336&r1=40335&r2=40336&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Fri Aug 17 15:13:23 2007 @@ -1 +1 @@ -2.15.17 +2.15.18 Modified: trunk/country/language/src/modules/Language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/modules/Language.ycp?rev=40336&r1=40335&r2=40336&view=diff ============================================================================== --- trunk/country/language/src/modules/Language.ycp (original) +++ trunk/country/language/src/modules/Language.ycp Fri Aug 17 15:13:23 2007 @@ -855,6 +855,8 @@ Set (settings["language"]:language); languages = settings["languages"]:languages; + SetExpertValues (settings); + list<string> llanguages = splitstring (languages, ","); if (!contains (llanguages, language)) { @@ -881,6 +883,10 @@ "language" : language, "languages" : languages ]; + if (rootlang != "ctype") + ret["rootlang"] = rootlang; + if (!use_utf8) + ret["use_utf8"] = use_utf8; return ret; } Modified: trunk/country/language/src/select_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/select_language.ycp?rev=40336&r1=40335&r2=40336&view=diff ============================================================================== --- trunk/country/language/src/select_language.ycp (original) +++ trunk/country/language/src/select_language.ycp Fri Aug 17 15:13:23 2007 @@ -260,11 +260,6 @@ show_expert = false; more_languages = false; } - if (Mode::config ()) - { - show_expert = false; - } - // sort language by ASCII with help of a map // $[ "ascii-name" : [ "user-readable-string", "code" ], ...] @@ -319,10 +314,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 @@ -499,6 +494,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: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=40336&r1=40335&r2=40336&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Fri Aug 17 15:13:23 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Aug 17 14:34:32 CEST 2007 - jsuchome@suse.cz + +- when non-listed locale is selected, add it to the list of + primary languages (#301019) +- add autoyast support for use_utf8 and rootlang values (#289546) +- 2.15.18 + +------------------------------------------------------------------- Thu Aug 9 15:20:35 CEST 2007 - jsuchome@suse.cz - during live installation config, do not automatically adapt -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org