Mailinglist Archive: yast-commit (545 mails)

[jsuchome@xxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Thu Jan  7 15:29:14 2010
New Revision: 60276

URL: http://svn.opensuse.org/viewcvs/yast?rev=60276&view=rev
Log:
- inst_complex_welcome adapted to Language::SwitchToEnglishIfNeeded
  (bnc#479529) 


Modified:
    
branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes
    
branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp

Modified: 
branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes?rev=60276&r1=60275&r2=60276&view=diff
==============================================================================
--- 
branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes
 (original)
+++ 
branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes
 Thu Jan  7 15:29:14 2010
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Thu Jan  7 15:28:48 CET 2010 - jsuchome@xxxxxxx
+
+- inst_complex_welcome adapted to Language::SwitchToEnglishIfNeeded
+  (bnc#479529) 
+
+-------------------------------------------------------------------
 Fri Dec 11 16:48:58 CET 2009 - locilka@xxxxxxx
 
 - Adapted for new API to ProductLicense (FATE #306295).

Modified: 
branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp?rev=60276&r1=60275&r2=60276&view=diff
==============================================================================
--- 
branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp
 (original)
+++ 
branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp
 Thu Jan  7 15:29:14 2010
@@ -242,16 +242,12 @@
        }
        // Check and set CJK languages
        if (Stage::initial () || Stage::firstboot ()) {
-           if (ret == `language &&
-               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");
-           } else if (ret == `language) {
+           if (ret == `language && Language::SwitchToEnglishIfNeeded (true))
+           {
+               y2debug ("UI switched to en_US");
+           }
+           else if (ret == `language)
+           {
                Console::SelectFont (language);
                // no yast translation for nn_NO, use nb_NO as a backup
                if (language == "nn_NO")

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx