Author: jsuchome Date: Tue Feb 22 10:30:04 2011 New Revision: 63451 URL: http://svn.opensuse.org/viewcvs/yast?rev=63451&view=rev Log: - more time zones (bnc#673425) - do not show time zones that conflict with others - 2.20.6 Modified: trunk/country/VERSION trunk/country/package/yast2-country.changes trunk/country/timezone/data/timezone_raw.ycp trunk/country/timezone/src/Timezone.ycp trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=63451&r1=63450&r2=63451&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Tue Feb 22 10:30:04 2011 @@ -1 +1 @@ -2.20.5 +2.20.6 Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=63451&r1=63450&r2=63451&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Tue Feb 22 10:30:04 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 22 10:27:40 CET 2011 - jsuchome@suse.cz + +- more time zones (bnc#673425) +- do not show time zones that conflict with others +- 2.20.6 + +------------------------------------------------------------------- Wed Nov 10 07:56:37 CET 2010 - jsuchome@suse.cz - fixed broken build Modified: trunk/country/timezone/data/timezone_raw.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/data/timezone_raw.ycp?rev=63451&r1=63450&r2=63451&view=diff ============================================================================== --- trunk/country/timezone/data/timezone_raw.ycp (original) +++ trunk/country/timezone/data/timezone_raw.ycp Tue Feb 22 10:30:04 2011 @@ -544,7 +544,7 @@ // time zone "Asia/Kashgar" : _("Kashgar"), // CN // time zone - "Asia/Katmandu" : _("Katmandu"), + "Asia/Kathmandu" : _("Katmandu"), // time zone "Asia/Krasnoyarsk" : _("Krasnoyarsk"), // time zone @@ -815,13 +815,11 @@ // time zone "Pacific/Port_Moresby" : _("Port_Moresby"), // time zone - "Pacific/Dili" : _("Dili"), - // time zone "Pacific/Rarotonga" : _("Rarotonga"), // CK // time zone - "Pacific/Truk" : _("Chuuk"), // FM + "Pacific/Chuuk" : _("Chuuk"), // FM // time zone - "Pacific/Ponape" : _("Pohnpei"), // FM + "Pacific/Pohnpei" : _("Pohnpei"), // FM // time zone "Pacific/Kosrae" : _("Kosrae"), // FM // time zone Modified: trunk/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/Timezone.ycp?rev=63451&r1=63450&r2=63451&view=diff ============================================================================== --- trunk/country/timezone/src/Timezone.ycp (original) +++ trunk/country/timezone/src/Timezone.ycp Tue Feb 22 10:30:04 2011 @@ -67,6 +67,7 @@ "Mideast/Riyadh87" : "Asia/Riyadh", "Mideast/Riyadh88" : "Asia/Riyadh", "Mideast/Riyadh89" : "Asia/Riyadh", + "Europe/Vatican" : "Europe/Rome", ]; // on init, translate these to correct ones Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp?rev=63451&r1=63450&r2=63451&view=diff ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Tue Feb 22 10:30:04 2011 @@ -386,14 +386,10 @@ if (Timezone::hwclock == "--localtime" && !Stage::initial ()) { Timezone::Set (Timezone::timezone, true); + Timezone::call_mkinitrd = true; } Timezone::SetTime( year, month, day, hour, minute, second ); - - if (Timezone::hwclock == "--localtime" && !Stage::initial ()) - { - Timezone::call_mkinitrd = true; - } } } } @@ -480,7 +476,7 @@ foreach (map region, zonemap, { foreach (string key, string name, region["entries"]:$[], { - if (key != "Europe/Vatican") + if (!haskey (yast2zonetab, key)) zones[yast2zonetab[key]:key] = name; }); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org