January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60274 - in /trunk/firstboot: ./ doc/ package/ src/ src/control/
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:27:42 2010 New Revision: 60274 URL: http://svn.opensuse.org/viewcvs/yast?rev=60274&view=rev Log: - added firstboot_licenses step able to show 2 license texts (fate#306295) - adapt to Language::SwitchToEnglishIfNeeded (bnc#479529) - 2.19.1 Added: trunk/firstboot/src/firstboot_licenses.ycp (with props) Modified: trunk/firstboot/VERSION trunk/firstboot/doc/firstboot-section_mod.xml trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/Makefile.am trunk/firstboot/src/control/firstboot.xml trunk/firstboot/src/firstboot_language_keyboard.ycp trunk/firstboot/yast2-firstboot.spec.in Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=60274&r1=6… ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Thu Jan 7 15:27:42 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/firstboot/doc/firstboot-section_mod.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/doc/firstboot-section_… ============================================================================== --- trunk/firstboot/doc/firstboot-section_mod.xml (original) +++ trunk/firstboot/doc/firstboot-section_mod.xml Thu Jan 7 15:27:42 2010 @@ -143,6 +143,10 @@ </para> <para> + To show two license texts in one dialog (typically the one from vendor and one from Novell), use 'firstboot_license_novell' step in your firstboot.xml file. This client will use the license texts specified by both FIRSTBOOT_LICENSE_DIR and FIRSTBOOT_NOVELL_LICENSE_DIR. + </para> + + <para> If you want to use FIRSTBOOT_FINISH_FILE, you need to update the firstboot workflow so that it calls firstboot_finish instead of inst_finish. The recommended way of customizing the congratulate text is specifying it in the firstboot.xml control file. </para> Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Thu Jan 7 15:27:42 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 7 14:34:43 CET 2010 - jsuchome(a)suse.cz + +- added firstboot_licenses step able to show 2 license texts + (fate#306295) +- adapt to Language::SwitchToEnglishIfNeeded (bnc#479529) +- 2.19.1 + +------------------------------------------------------------------- Tue Dec 22 13:04:01 CET 2009 - jsuchome(a)suse.cz - handle arguments from control file (bnc#566669) Modified: trunk/firstboot/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/Makefile.am?rev=60… ============================================================================== --- trunk/firstboot/src/Makefile.am (original) +++ trunk/firstboot/src/Makefile.am Thu Jan 7 15:27:42 2010 @@ -11,6 +11,7 @@ firstboot_language_keyboard.ycp \ firstboot_timezone.ycp \ firstboot_license.ycp \ + firstboot_licenses.ycp \ firstboot_welcome.ycp \ firstboot_ssh.ycp \ firstboot_keyboard.ycp \ Modified: trunk/firstboot/src/control/firstboot.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/control/firstboot.… ============================================================================== --- trunk/firstboot/src/control/firstboot.xml (original) +++ trunk/firstboot/src/control/firstboot.xml Thu Jan 7 15:27:42 2010 @@ -104,6 +104,11 @@ <name>firstboot_welcome</name> </module> <module> + <label>License Agreements</label> + <enabled config:type="boolean">false</enabled> + <name>firstboot_licenses</name> + </module> + <module> <label>License Agreement</label> <enabled config:type="boolean">true</enabled> <name>firstboot_license_novell</name> Modified: trunk/firstboot/src/firstboot_language_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_language… ============================================================================== --- trunk/firstboot/src/firstboot_language_keyboard.ycp (original) +++ trunk/firstboot/src/firstboot_language_keyboard.ycp Thu Jan 7 15:27:42 2010 @@ -137,13 +137,9 @@ Language::Set (language); } // Check and set CJK languages - if (ret == `language && Language::CJKLanguage (language) && - !Language::CJKLanguage (preselected) && Language::GetTextMode ()) + if (ret == `language && Language::SwitchToEnglishIfNeeded (true)) { - // popup message (user selected CJK language in text mode) - Popup::Message (_("The selected language cannot be used in text mode. English is used for -installation, but the selected language will be used for the new system.")); - Language::WfmSetGivenLanguage ("en_US"); + y2debug ("UI switched to en_US"); } else if (ret == `language) { Added: trunk/firstboot/src/firstboot_licenses.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_licenses… ============================================================================== --- trunk/firstboot/src/firstboot_licenses.ycp (added) +++ trunk/firstboot/src/firstboot_licenses.ycp Thu Jan 7 15:27:42 2010 @@ -0,0 +1,49 @@ +/* + * Purpose : Display 2 license texts (probably from vendor and Novell) during firstboot configuration + * + * $Id$ + */ + +{ + textdomain "firstboot"; + + import "Misc"; + import "GetInstArgs"; + import "ProductFeatures"; + + + any result = nil; + + map args = GetInstArgs::argmap(); + + // default directory with Novell license texts + string default_dir = ProductFeatures::GetStringFeature ("globals", + "base_product_license_directory"); + + string dir1 = Misc::SysconfigRead ( + .sysconfig.firstboot.FIRSTBOOT_LICENSE_DIR, "/etc/YaST2"); + string dir2 = Misc::SysconfigRead ( + .sysconfig.firstboot.FIRSTBOOT_NOVELL_LICENSE_DIR, default_dir); + + if (dir2 != dir1) + args["directories"] = [ dir1, dir2]; + else + args["directories"] = [ dir1 ]; + + args["action"] = Misc::SysconfigRead ( + .sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort"); + + y2milestone("inst_license options: %1", args); + + result = WFM::CallFunction( "inst_license", [ args ] ); + + if (result == `halt) + { + UI::CloseDialog(); + y2milestone("Halting the system..."); + SCR::Execute(.target.bash, "/sbin/halt"); + } + + return result; + +} Modified: trunk/firstboot/yast2-firstboot.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/yast2-firstboot.spec.i… ============================================================================== --- trunk/firstboot/yast2-firstboot.spec.in (original) +++ trunk/firstboot/yast2-firstboot.spec.in Thu Jan 7 15:27:42 2010 @@ -13,10 +13,10 @@ # yast2/NeworkDevices -> yast2/NetworkInterfaces Requires: yast2 >= 2.16.23 Requires: yast2-bootloader -# Keyboard::Write (), bnc#441404 -Requires: yast2-country >= 2.18.14 -# Installation startup scripts -Requires: yast2-installation +# Language::SwitchToEnglishIfNeeded +Requires: yast2-country >= 2.19.5 +# new version of inst_license +Requires: yast2-installation >= 2.19.0 BuildArchitectures: noarch -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60273 - /tags/branch-Code-11-SP1-2_17_12/firstboot/
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:22:43 2010 New Revision: 60273 URL: http://svn.opensuse.org/viewcvs/yast?rev=60273&view=rev Log: Created tag branch-Code-11-SP1-2_17_12 for firstboot Added: tags/branch-Code-11-SP1-2_17_12/firstboot/ (props changed) - copied from r60272, branches/SuSE-Code-11-SP1-Branch/firstboot/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60272 - in /branches/SuSE-Code-11-SP1-Branch/firstboot: ./ doc/ package/ src/ src/control/
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:22:36 2010 New Revision: 60272 URL: http://svn.opensuse.org/viewcvs/yast?rev=60272&view=rev Log: - added firstboot_licenses step able to show 2 license texts (fate#306295) - adapt to Language::SwitchToEnglishIfNeeded (bnc#479529) - 2.17.12 Added: branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_licenses.ycp (with props) Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION branches/SuSE-Code-11-SP1-Branch/firstboot/doc/firstboot-section_mod.xml branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes branches/SuSE-Code-11-SP1-Branch/firstboot/src/Makefile.am branches/SuSE-Code-11-SP1-Branch/firstboot/src/control/firstboot.xml branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language_keyboard.ycp branches/SuSE-Code-11-SP1-Branch/firstboot/yast2-firstboot.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION Thu Jan 7 15:22:36 2010 @@ -1 +1 @@ -2.17.11 +2.17.12 Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/doc/firstboot-section_mod.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/doc/firstboot-section_mod.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/doc/firstboot-section_mod.xml Thu Jan 7 15:22:36 2010 @@ -143,6 +143,10 @@ </para> <para> + To show two license texts in one dialog (typically the one from vendor and one from Novell), use 'firstboot_license_novell' step in your firstboot.xml file. This client will use the license texts specified by both FIRSTBOOT_LICENSE_DIR and FIRSTBOOT_NOVELL_LICENSE_DIR. + </para> + + <para> If you want to use FIRSTBOOT_FINISH_FILE, you need to update the firstboot workflow so that it calls firstboot_finish instead of inst_finish. The recommended way of customizing the congratulate text is specifying it in the firstboot.xml control file. </para> Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes Thu Jan 7 15:22:36 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 7 15:12:05 CET 2010 - jsuchome(a)suse.cz + +- added firstboot_licenses step able to show 2 license texts + (fate#306295) +- adapt to Language::SwitchToEnglishIfNeeded (bnc#479529) +- 2.17.12 + +------------------------------------------------------------------- Tue Dec 22 13:04:44 CET 2009 - jsuchome(a)suse.cz - handle arguments from control file (bnc#566669) Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/src/Makefile.am Thu Jan 7 15:22:36 2010 @@ -11,6 +11,7 @@ firstboot_language_keyboard.ycp \ firstboot_timezone.ycp \ firstboot_license.ycp \ + firstboot_licenses.ycp \ firstboot_welcome.ycp \ firstboot_ssh.ycp \ firstboot_keyboard.ycp \ Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/src/control/firstboot.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/src/control/firstboot.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/src/control/firstboot.xml Thu Jan 7 15:22:36 2010 @@ -104,6 +104,11 @@ <name>firstboot_welcome</name> </module> <module> + <label>License Agreements</label> + <enabled config:type="boolean">false</enabled> + <name>firstboot_licenses</name> + </module> + <module> <label>License Agreement</label> <enabled config:type="boolean">true</enabled> <name>firstboot_license_novell</name> Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language_keyboard.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language_keyboard.ycp Thu Jan 7 15:22:36 2010 @@ -137,13 +137,9 @@ Language::Set (language); } // Check and set CJK languages - if (ret == `language && Language::CJKLanguage (language) && - !Language::CJKLanguage (preselected) && Language::GetTextMode ()) + if (ret == `language && Language::SwitchToEnglishIfNeeded (true)) { - // popup message (user selected CJK language in text mode) - Popup::Message (_("The selected language cannot be used in text mode. English is used for -installation, but the selected language will be used for the new system.")); - Language::WfmSetGivenLanguage ("en_US"); + y2debug ("UI switched to en_US"); } else if (ret == `language) { Added: branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_licenses.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_licenses.ycp (added) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_licenses.ycp Thu Jan 7 15:22:36 2010 @@ -0,0 +1,49 @@ +/* + * Purpose : Display 2 license texts (probably from vendor and Novell) during firstboot configuration + * + * $Id$ + */ + +{ + textdomain "firstboot"; + + import "Misc"; + import "GetInstArgs"; + import "ProductFeatures"; + + + any result = nil; + + map args = GetInstArgs::argmap(); + + // default directory with Novell license texts + string default_dir = ProductFeatures::GetStringFeature ("globals", + "base_product_license_directory"); + + string dir1 = Misc::SysconfigRead ( + .sysconfig.firstboot.FIRSTBOOT_LICENSE_DIR, "/etc/YaST2"); + string dir2 = Misc::SysconfigRead ( + .sysconfig.firstboot.FIRSTBOOT_NOVELL_LICENSE_DIR, default_dir); + + if (dir2 != dir1) + args["directories"] = [ dir1, dir2]; + else + args["directories"] = [ dir1 ]; + + args["action"] = Misc::SysconfigRead ( + .sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort"); + + y2milestone("inst_license options: %1", args); + + result = WFM::CallFunction( "inst_license", [ args ] ); + + if (result == `halt) + { + UI::CloseDialog(); + y2milestone("Halting the system..."); + SCR::Execute(.target.bash, "/sbin/halt"); + } + + return result; + +} Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/yast2-firstboot.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/yast2-firstboot.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/yast2-firstboot.spec.in Thu Jan 7 15:22:36 2010 @@ -11,8 +11,8 @@ # yast2/NeworkDevices -> yast2/NetworkInterfaces Requires: yast2 >= 2.16.23 Requires: yast2-bootloader -# Language::PackagesCommit -Requires: yast2-country >= 2.17.37 +# Language::SwitchToEnglishIfNeeded +Requires: yast2-country >= 2.17.40 # Installation startup scripts Requires: yast2-installation -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60271 - /tags/stable-2_19_5/country/
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:09:41 2010 New Revision: 60271 URL: http://svn.opensuse.org/viewcvs/yast?rev=60271&view=rev Log: Created tag stable-2_19_5 for country Added: tags/stable-2_19_5/country/ - copied from r60270, trunk/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60270 - in /trunk/country: VERSION language/src/modules/Language.ycp language/src/select_language.ycp package/yast2-country.changes
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:09:34 2010 New Revision: 60270 URL: http://svn.opensuse.org/viewcvs/yast?rev=60270&view=rev Log: - added Language::SwitchToEnglishIfNeeded to be called when it might be necessary to use English in UI, due to possible displaying problems with another language (bnc#479529) - 2.19.5 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=60270&r1=602… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Thu Jan 7 15:09:34 2010 @@ -1 +1 @@ -2.19.4 +2.19.5 Modified: trunk/country/language/src/modules/Language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/modules/Lan… ============================================================================== --- trunk/country/language/src/modules/Language.ycp (original) +++ trunk/country/language/src/modules/Language.ycp Thu Jan 7 15:09:34 2010 @@ -134,7 +134,6 @@ return contains (cjk_languages, l); } - /** * return the value of text_mode (true for ncurses) */ @@ -1239,5 +1238,40 @@ } } +/** + * Set current YaST language to English if method for showing text in + * current language is not supported (usually for CJK languages) + * See http://bugzilla.novell.com/show_bug.cgi?id=479529 for discussion + * @boolean show_popup if information popup about the change should be shown + * @return true if UI language was changed + */ +global boolean SwitchToEnglishIfNeeded (boolean show_popup) { + + if (Stage::normal ()) + { + y2milestone ("no language switching in normal stage"); + return false; + } + if (GetTextMode () && + // current language is CJK + CJKLanguage (language) && + // fbiterm is not running + getenv ("TERM") != "iterm") + { + if (show_popup) + { + // popup message (user selected CJK language in text mode) + Popup::Message (_("The selected language cannot be used in text mode. English is used for +installation, but the selected language will be used for the new system.")); + } + WfmSetGivenLanguage ("en_US"); + return true; + } + return false; +} + + + + /* EOF */ } Modified: trunk/country/language/src/select_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/select_lang… ============================================================================== --- trunk/country/language/src/select_language.ycp (original) +++ trunk/country/language/src/select_language.ycp Thu Jan 7 15:09:34 2010 @@ -528,17 +528,10 @@ if (Stage::initial () || Stage::firstboot ()) { - if ((set_default && ret == `language || - (!set_default && ret == `next)) && - Language::CJKLanguage (language) && - !Language::CJKLanguage (preselected) && - Language::GetTextMode ()) - { - // popup message (user selected CJK language in text mode) - Popup::Message (_("The selected language cannot be used in text mode. English is used for -installation, but the selected language will be used for the new system.")); - - Language::WfmSetGivenLanguage ("en_US"); + if ((set_default && ret == `language || (!set_default && ret == `next)) && + Language::SwitchToEnglishIfNeeded (true)) + { + y2debug ("UI switched to en_US"); } else if (ret == `next || (set_default && ret == `language)) { Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Thu Jan 7 15:09:34 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 7 14:40:33 CET 2010 - jsuchome(a)suse.cz + +- added Language::SwitchToEnglishIfNeeded to be called when it might + be necessary to use English in UI, due to possible displaying + problems with another language (bnc#479529) +- 2.19.5 + +------------------------------------------------------------------- Mon Jan 4 10:47:25 CET 2010 - jsuchome(a)suse.cz - returned keyboard desktop file, adapted help text (bnc#560713) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60269 - /tags/branch-Code-11-SP1-2_17_40/country/
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:09:27 2010 New Revision: 60269 URL: http://svn.opensuse.org/viewcvs/yast?rev=60269&view=rev Log: Created tag branch-Code-11-SP1-2_17_40 for country Added: tags/branch-Code-11-SP1-2_17_40/country/ (props changed) - copied from r60268, branches/SuSE-Code-11-SP1-Branch/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60268 - in /branches/SuSE-Code-11-SP1-Branch/country: VERSION language/src/modules/Language.ycp language/src/select_language.ycp package/yast2-country.changes
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:09:21 2010 New Revision: 60268 URL: http://svn.opensuse.org/viewcvs/yast?rev=60268&view=rev Log: - added Language::SwitchToEnglishIfNeeded to be called when it might be necessary to use English in UI, due to possible displaying problems with another language (bnc#479529) - 2.17.40 Modified: branches/SuSE-Code-11-SP1-Branch/country/VERSION branches/SuSE-Code-11-SP1-Branch/country/language/src/modules/Language.ycp branches/SuSE-Code-11-SP1-Branch/country/language/src/select_language.ycp branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes Modified: branches/SuSE-Code-11-SP1-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/count… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/country/VERSION Thu Jan 7 15:09:21 2010 @@ -1 +1 @@ -2.17.39 +2.17.40 Modified: branches/SuSE-Code-11-SP1-Branch/country/language/src/modules/Language.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/count… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/language/src/modules/Language.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/country/language/src/modules/Language.ycp Thu Jan 7 15:09:21 2010 @@ -134,7 +134,6 @@ return contains (cjk_languages, l); } - /** * return the value of text_mode (true for ncurses) */ @@ -1239,5 +1238,40 @@ } } +/** + * Set current YaST language to English if method for showing text in + * current language is not supported (usually for CJK languages) + * See http://bugzilla.novell.com/show_bug.cgi?id=479529 for discussion + * @boolean show_popup if information popup about the change should be shown + * @return true if UI language was changed + */ +global boolean SwitchToEnglishIfNeeded (boolean show_popup) { + + if (Stage::normal ()) + { + y2milestone ("no language switching in normal stage"); + return false; + } + if (GetTextMode () && + // current language is CJK + CJKLanguage (language) && + // fbiterm is not running + getenv ("TERM") != "iterm") + { + if (show_popup) + { + // popup message (user selected CJK language in text mode) + Popup::Message (_("The selected language cannot be used in text mode. English is used for +installation, but the selected language will be used for the new system.")); + } + WfmSetGivenLanguage ("en_US"); + return true; + } + return false; +} + + + + /* EOF */ } Modified: branches/SuSE-Code-11-SP1-Branch/country/language/src/select_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/count… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/language/src/select_language.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/country/language/src/select_language.ycp Thu Jan 7 15:09:21 2010 @@ -528,17 +528,10 @@ if (Stage::initial () || Stage::firstboot ()) { - if ((set_default && ret == `language || - (!set_default && ret == `next)) && - Language::CJKLanguage (language) && - !Language::CJKLanguage (preselected) && - Language::GetTextMode ()) - { - // popup message (user selected CJK language in text mode) - Popup::Message (_("The selected language cannot be used in text mode. English is used for -installation, but the selected language will be used for the new system.")); - - Language::WfmSetGivenLanguage ("en_US"); + if ((set_default && ret == `language || (!set_default && ret == `next)) && + Language::SwitchToEnglishIfNeeded (true)) + { + y2debug ("UI switched to en_US"); } else if (ret == `next || (set_default && ret == `language)) { Modified: branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/count… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes Thu Jan 7 15:09:21 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 7 14:45:07 CET 2010 - jsuchome(a)suse.cz + +- added Language::SwitchToEnglishIfNeeded to be called when it might + be necessary to use English in UI, due to possible displaying + problems with another language (bnc#479529) +- 2.17.40 + +------------------------------------------------------------------- Fri Dec 4 14:12:20 CET 2009 - jsuchome(a)suse.cz - install ntp together with yast2-ntp-client (bnc#560732) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60267 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: aschnell Date: Thu Jan 7 14:39:06 2010 New Revision: 60267 URL: http://svn.opensuse.org/viewcvs/yast?rev=60267&view=rev Log: - added more type information Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Jan 7 14:39:06 2010 @@ -4055,9 +4055,8 @@ * @param boolean foreign_os * @return list of primary partitions */ -global define list GetPrimPartitions( map<string,map> targets, - boolean foreign_os ) - ``{ +list<map> GetPrimPartitions(map<string, map> targets, boolean foreign_os) + { list<map> ret = []; map entry = $[]; string text = ""; @@ -4178,9 +4177,10 @@ return( ret ); } -global define list GetWinPrimPartitions( map<string,map> targets ) - ``{ - list ret = GetPrimPartitions( targets, true ); + +global list<map> GetWinPrimPartitions(map<string, map> targets) + { + list<map> ret = GetPrimPartitions( targets, true ); y2milestone( "GetWinPrimPartitions ret %1", ret ); return( ret ); } @@ -4288,13 +4288,13 @@ } -global define list GetForeignPrimary() - ``{ - list ret = []; + +global list<string> GetForeignPrimary() + { + list<string> ret = []; if( Arch::i386 () || Arch::ia64 () || Arch::x86_64 () ) { - foreach(map e, (list<map>)GetPrimPartitions( GetTargetMap(), false ), - ``{ + foreach(map e, GetPrimPartitions( GetTargetMap(), false ), { ret = add( ret, sformat( "%1 %2", e["device"]:"", e["string"]:"" )); }); } @@ -4302,6 +4302,7 @@ return( ret ); } + /** * Returns whether a partition is resizable * -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60266 - /trunk/autoinstallation/src/include/io.ycp
by ug＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: ug Date: Thu Jan 7 14:37:31 2010 New Revision: 60266 URL: http://svn.opensuse.org/viewcvs/yast?rev=60266&view=rev Log: old usb:// code dropped after testrun of the new code Modified: trunk/autoinstallation/src/include/io.ycp Modified: trunk/autoinstallation/src/include/io.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/io.… ============================================================================== --- trunk/autoinstallation/src/include/io.ycp (original) +++ trunk/autoinstallation/src/include/io.ycp Thu Jan 7 14:37:31 2010 @@ -238,10 +238,9 @@ WFM::Execute(.local.umount, mount_point); } -// else if (Scheme == "floppy" || Scheme == "usb") else if (Scheme == "floppy") { - if (StorageDevices::FloppyReady() && Scheme == "floppy") + if (StorageDevices::FloppyReady()) { WFM::Execute(.local.mount, [StorageDevices::FloppyDevice(), mount_point]); @@ -256,40 +255,6 @@ } SCR::Execute(.target.umount, mount_point); } - /* - } else { - y2milestone("looking for %1 on USB", Path); - list<map> probe = (list<map>)SCR::Read(.probe.usb); - foreach( map d, probe, ``{ - if( d["bus"]:"USB" == "SCSI" && haskey(d, "dev_name") ) { - integer i = 0; - string dev = d["dev_name"]:""; - while( SCR::Read(.target.lstat, dev) != $[] || i < 5 ) { - if( !(boolean)WFM::Execute(.local.mount, [ dev, mount_point ]) ) { - y2milestone("mount failed for %1", dev); - i = i + 1; - dev = d["dev_name"]:"" + sformat("%1",i); - continue; - } - if (WFM::Execute (.local.bash, "/bin/cp " + mount_point + "/" + Path + " " + Localfile) != 0) { - y2milestone("not found on %1",dev); - } else { - y2milestone("found on %1", dev); - GET_error = ""; - ok = true; - } - SCR::Execute(.target.umount, mount_point); - if( ok == true ) - break; - i = i + 1; - dev = d["dev_name"]:"" + sformat("%1",i); - } - } - if( ok == true ) - break; - }); - } - */ } else if (Scheme == "device" || Scheme == "usb" ) // Device or USB { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60265 - in /trunk/control-center: package/yast2-control-center.changes yast2-control-center.spec.in
by jsrain＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsrain Date: Thu Jan 7 14:27:56 2010 New Revision: 60265 URL: http://svn.opensuse.org/viewcvs/yast?rev=60265&view=rev Log: added yast2-control-center-qt Recommends yast2-qt (bnc#545331) Modified: trunk/control-center/package/yast2-control-center.changes trunk/control-center/yast2-control-center.spec.in Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Thu Jan 7 14:27:56 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 7 14:24:15 CET 2010 - jsrain(a)suse.cz + +- added yast2-control-center-qt Recommends yast2-qt (bnc#545331) + +------------------------------------------------------------------- Thu Dec 10 13:03:24 CET 2009 - kmachalkova(a)suse.cz - Correctly show GenericNames containing comma (convert QStringList Modified: trunk/control-center/yast2-control-center.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/yast2-control-cen… ============================================================================== --- trunk/control-center/yast2-control-center.spec.in (original) +++ trunk/control-center/yast2-control-center.spec.in Thu Jan 7 14:27:56 2010 @@ -20,6 +20,7 @@ Requires: yast2-control-center Provides: yast2-control-center-binary Provides: yast2-control-center:%{_prefix}/lib/YaST2/bin/y2controlcenter +Recommends: yast2-qt Supplements: kdebase3 Supplements: kdebase4-session Group: System/YaST -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0