Author: jsrain Date: Tue Dec 11 16:35:57 2007 New Revision: 42971 URL: http://svn.opensuse.org/viewcvs/yast?rev=42971&view=rev Log: do not translate boot menu to unsupported language (#310459) Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/GfxMenu.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=42971&r1=42970&r2=42971&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Dec 11 16:35:57 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Dec 11 16:12:09 CET 2007 - jsrain@suse.cz + +- do not translate boot menu to unsupported language (#310459) + +------------------------------------------------------------------- Wed Dec 5 12:36:32 CET 2007 - jsrain@suse.cz - fixed the device map proposal if USB stick is present (F#302075) Modified: trunk/bootloader/src/modules/GfxMenu.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/GfxMenu.ycp?rev=42971&r1=42970&r2=42971&view=diff ============================================================================== --- trunk/bootloader/src/modules/GfxMenu.ycp (original) +++ trunk/bootloader/src/modules/GfxMenu.ycp Tue Dec 11 16:35:57 2007 @@ -345,6 +345,7 @@ string tmpdir = (string)SCR::Read (.target.tmpdir); string lang_params = ""; + boolean lang_supported = true; list<string> selected = []; foreach (string lang, languages, { @@ -358,6 +359,10 @@ if (! (contains (helps, lang_short) || contains (texts, lang_short))) { y2milestone ("Language %1 is not supported by gfxmenu", lang_short); + // rather avoid all translations; non-supported characters don't show + // in the future, the menu should be translated into selected language, + // not only into the system language + lang_supported = false; } else if (! (contains (selected, lang) || contains (selected, lang_short))) @@ -378,6 +383,11 @@ }); string trans_str = mergestring (trans_list, "\n"); trans_str = trans_str + "\n"; + if (! lang_supported) + { + y2milestone ("Avoiding providing bootloader menu translations"); + trans_str = ""; + } SCR::Write (.target.string, trans_file, trans_str); if (lang_params == "") lang_params = "en_EN en"; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org