Mailinglist Archive: yast-commit (535 mails)

< Previous Next >
[yast-commit] r41334 - in /branches/SuSE-SLE-10-SP1-Branch/country: VERSION language/src/select_language.ycp package/yast2-country.changes
  • From: jsuchome@xxxxxxxxxxxxxxxx
  • Date: Wed, 10 Oct 2007 14:08:50 -0000
  • Message-id: <20071010140851.0AA5F30F0B@xxxxxxxxxxxxxxxx>
Author: jsuchome
Date: Wed Oct 10 16:08:50 2007
New Revision: 41334

URL: http://svn.opensuse.org/viewcvs/yast?rev=41334&view=rev
Log:
- in firstboot, do not show list with secondary languages (F302520)
- 2.13.53


Modified:
    branches/SuSE-SLE-10-SP1-Branch/country/VERSION
    branches/SuSE-SLE-10-SP1-Branch/country/language/src/select_language.ycp
    branches/SuSE-SLE-10-SP1-Branch/country/package/yast2-country.changes

Modified: branches/SuSE-SLE-10-SP1-Branch/country/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/country/VERSION?rev=41334&r1=41333&r2=41334&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/country/VERSION (original)
+++ branches/SuSE-SLE-10-SP1-Branch/country/VERSION Wed Oct 10 16:08:50 2007
@@ -1 +1 @@
-2.13.52
+2.13.53

Modified: branches/SuSE-SLE-10-SP1-Branch/country/language/src/select_language.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/country/language/src/select_language.ycp?rev=41334&r1=41333&r2=41334&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/country/language/src/select_language.ycp (original)
+++ branches/SuSE-SLE-10-SP1-Branch/country/language/src/select_language.ycp Wed Oct 10 16:08:50 2007
@@ -205,7 +205,7 @@
 
     string preselected = Language::preselected;
 
-    if (Stage::initial () && preselected != "en_US" && set_default)
+    if (preselected != "en_US" && set_default)
     {
        if (ProductFeatures::GetBooleanFeature ("globals", "skip_language_dialog"))
        {
@@ -243,7 +243,7 @@
     // heading text
     string heading_text = _("Languages");
 
-    if (Stage::initial () && set_default && !Mode::repair ())
+    if (set_default && !Mode::repair ())
     {
        // heading text
        heading_text = _("Language");
@@ -254,7 +254,7 @@
        heading_text = _("Welcome to System Repair");
     }
 
-    if (Stage::initial () && set_default)
+    if (set_default)
     {
        show_expert     = false;
        more_languages  = false;
@@ -299,6 +299,15 @@
                          (language == codelist[1]:""))))
     );
 
+    // do not offer the dialog with native forms (fonts may not be installed)
+    if (Stage::firstboot ())
+       languagesel = `SelectionBox (`id(`language), `opt(`notify), "",
+           maplist (string trans_lang, lsort (lang_list), {
+               string code     = lang2code [trans_lang]:"";
+               return `item (`id (code), trans_lang, language == code);
+           })
+       );
+
     // this type of contents will be shown only for initial installation dialog
     term contents = `HVCenter (
        `BackgroundPixmap ("wallpapers/welcome.jpg"),
@@ -472,9 +481,9 @@
     UI::SetFocus(`id(`language));
 
     // adapt keyboard for language?
-    boolean kbd_adapt = (Stage::initial () && set_default && !Mode::config ());
+    boolean kbd_adapt = (set_default && !Mode::config ());
     // adapt timezone for language?
-    boolean tmz_adapt = (Stage::initial () && set_default && !Mode::config ());
+    boolean tmz_adapt = (set_default && !Mode::config ());
 
 
     repeat
@@ -547,7 +556,7 @@
                }
 
 
-               if (Stage::initial () && set_default)
+               if (set_default)
                {
                    Timezone::ResetZonemap ();
                }
@@ -610,7 +619,7 @@
                if (kbd_adapt)
                {
                    Keyboard::SetKeyboardForLanguage (language);
-                   if (Stage::initial () && set_default)
+                   if (set_default)
                    {
                        Keyboard::SetKeyboardDefault();
                    }

Modified: branches/SuSE-SLE-10-SP1-Branch/country/package/yast2-country.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/country/package/yast2-country.changes?rev=41334&r1=41333&r2=41334&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/country/package/yast2-country.changes (original)
+++ branches/SuSE-SLE-10-SP1-Branch/country/package/yast2-country.changes Wed Oct 10 16:08:50 2007
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Thu Aug 23 14:51:46 CEST 2007 - jsuchome@xxxxxxx
+
+- in firstboot, do not show list with secondary languages (F302520)
+- 2.13.53
+
+-------------------------------------------------------------------
 Mon Apr  2 08:24:47 CEST 2007 - jsuchome@xxxxxxx
 
 - Arabic added again (#258795)

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

< Previous Next >
This Thread
  • No further messages