Author: jsuchome Date: Thu Feb 7 13:14:21 2008 New Revision: 44234 URL: http://svn.opensuse.org/viewcvs/yast?rev=44234&view=rev Log: - the agent for adapting fvwm2 font not needed anymore (bnc#359183) - timezone regions sorted according to current locale (bnc#359192) - 2.16.8 Removed: trunk/country/language/agents/ag_fvwm2_setlang trunk/country/language/agents/fvwm2_setlang.scr Modified: trunk/country/VERSION trunk/country/language/agents/Makefile.am trunk/country/language/src/modules/Language.ycp trunk/country/package/yast2-country.changes trunk/country/timezone/src/Timezone.ycp trunk/country/timezone/src/dialogs.ycp trunk/country/yast2-country.spec.in Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=44234&r1=44233&r2=44234&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Thu Feb 7 13:14:21 2008 @@ -1 +1 @@ -2.16.7 +2.16.8 Modified: trunk/country/language/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/agents/Makefile.am?rev=44234&r1=44233&r2=44234&view=diff ============================================================================== --- trunk/country/language/agents/Makefile.am (original) +++ trunk/country/language/agents/Makefile.am Thu Feb 7 13:14:21 2008 @@ -4,9 +4,3 @@ scrconf_DATA = $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.scr)) EXTRA_DIST = $(scrconf_DATA) - -agentdir = $(execcompdir)/servers_non_y2 -agent_SCRIPTS = ag_fvwm2_setlang - -EXTRA_DIST += $(agent_SCRIPTS) - Modified: trunk/country/language/src/modules/Language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/modules/Language.ycp?rev=44234&r1=44233&r2=44234&view=diff ============================================================================== --- trunk/country/language/src/modules/Language.ycp (original) +++ trunk/country/language/src/modules/Language.ycp Thu Feb 7 13:14:21 2008 @@ -578,11 +578,6 @@ { WFM::SetLanguage(lang); } - if (Stage::initial () && !GetTextMode ()) - { - // update font for windowmanager windows - SCR::Write (.FvwmCommand.lang, lang); - } } Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=44234&r1=44233&r2=44234&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Thu Feb 7 13:14:21 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 7 10:56:54 CET 2008 - jsuchome@suse.cz + +- the agent for adapting fvwm2 font not needed anymore (bnc#359183) +- timezone regions sorted according to current locale (bnc#359192) +- 2.16.8 + +------------------------------------------------------------------- Wed Jan 23 13:09:24 CET 2008 - jsuchome@suse.cz - correct path to the worldmap image Modified: trunk/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/Timezone.ycp?rev=44234&r1=44233&r2=44234&view=diff ============================================================================== --- trunk/country/timezone/src/Timezone.ycp (original) +++ trunk/country/timezone/src/Timezone.ycp Thu Feb 7 13:14:21 2008 @@ -139,6 +139,7 @@ string name = ""; +// list with maps, each map provides time zone information about one region list < map < string, any> > zonemap = []; // 'language --> default timezone' conversion map @@ -149,9 +150,9 @@ // ------------------------------------------------------------------ -// --------------------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- // START: Globally defined functions -// --------------------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- /** * get_lang2tz() @@ -192,9 +193,15 @@ if (size(zonemap) == 0) { - zonemap = (list >) + list > zmap = (list >) eval (SCR::Read (.target.yast2, "timezone_raw.ycp")); - if( zonemap == nil ) zonemap = []; + if (zmap == nil) zmap = []; + + zonemap = sort (map a, map b, zmap, { + // [ "USA", "Canada" ] -> [ "Canada", "USA" ] + list lsorted = lsort ([a["name"]:"", b["name"]:""]); + return (lsorted[0]:"" == a["name"]:"" && a["name"]:"" != b["name"]:""); + }); } return zonemap; } @@ -273,7 +280,6 @@ { updated_tmz = obsoleted_zones[tmz]:tmz; y2milestone ("updating timezone from %1 to %2", tmz, updated_tmz); - // TODO if still not present, search file in /usr/share/zoneinfo } return updated_tmz; @@ -475,7 +481,6 @@ * * @return The string output. * - * @see - */ global define string GetDateTime (boolean real_time, boolean locale_format) { @@ -525,10 +530,13 @@ return( local_date ); } -global define void ResetZonemap() - ``{ +/** + * Clear the internal map with timezones, so the timezone data could be + * retranslated next time when they are needed + */ +global define void ResetZonemap() { zonemap = []; - } +} /** * Return true if localtime should be proposed as default @@ -690,10 +698,6 @@ * Save() * * Save timezone to target sysconfig. - * - * @param - - * - * @return - */ global define void Save() { Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp?rev=44234&r1=44233&r2=44234&view=diff ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Thu Feb 7 13:14:21 2008 @@ -30,6 +30,8 @@ symbol hwclock_s_initial = `none; + // helper function for seting the time related stuff in module and possibly + // adapting current time according to it define void SetTimezone (symbol hwclock, string timezone, boolean really, boolean changed_time) { Modified: trunk/country/yast2-country.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/yast2-country.spec.in?rev=44234&r1=44233&r2=44234&view=diff ============================================================================== --- trunk/country/yast2-country.spec.in (original) +++ trunk/country/yast2-country.spec.in Thu Feb 7 13:14:21 2008 @@ -68,7 +68,6 @@ @yncludedir@/timezone/ @scrconfdir@/*.scr @schemadir@/autoyast/rnc/*.rnc -@agentdir@/* %ifnarch s390 s390x @desktopdir@/keyboard.desktop %endif -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org