Author: jsuchome Date: Wed Feb 22 13:25:45 2012 New Revision: 67511 URL: http://svn.opensuse.org/viewcvs/yast?rev=67511&view=rev Log: - do not show duplicates in locale entry (bnc#748122) - 2.22.2 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=67511&r1=67510&r2=67511&view=diff ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Wed Feb 22 13:25:45 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=67511&r1=67510&r2=67511&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Feb 22 13:25:45 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 22 13:19:58 CET 2012 - jsuchome@suse.cz + +- do not show duplicates in locale entry (bnc#748122) +- 2.22.2 + +------------------------------------------------------------------- Wed Jan 25 10:16:54 CET 2012 - jsuchome@suse.cz - confirmed license Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev=67511&r1=67510&r2=67511&view=diff ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Wed Feb 22 13:25:45 2012 @@ -100,7 +100,7 @@ string logs_directory = "/tmp"; // all available locales - global list<string> all_locales = []; + global map<string,integer> all_locales = $[]; // all available time zones global list<string> all_timezones = []; Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=67511&r1=67510&r2=67511&view=diff ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Wed Feb 22 13:25:45 2012 @@ -652,15 +652,16 @@ string lang = KiwiConfig["preferences",0,id,0,content_key]:""; list items = []; - if (Kiwi::all_locales == []) + if (Kiwi::all_locales == $[]) { map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/locale -a"); - Kiwi::all_locales = filter (string s, splitstring (out["stdout"]:"", "\n"), { - return s != ""; + foreach (string line, splitstring (out["stdout"]:"", "\n"), { + string code = splitstring (line, ".@")[0]:line; + if (code != "") + Kiwi::all_locales[code] = 1; }); } - foreach (string line, Kiwi::all_locales, { - string code = splitstring (line, ".@")[0]:line; + foreach (string code, integer i, Kiwi::all_locales, { items = add (items, `item (`id (code), code, lang == code)); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org