Hello community,
here is the log from the commit of package yast2-country
checked in at Tue Jun 27 19:04:09 CEST 2006.
--------
--- yast2-country/yast2-country.changes 2006-06-13 10:54:07.000000000 +0200
+++ yast2-country/yast2-country.changes 2006-06-26 16:23:48.000000000 +0200
@@ -1,0 +2,9 @@
+Mon Jun 26 13:27:03 CEST 2006 - jsuchome@suse.cz
+
+- added some missing time zones (#173019)
+- fixed language name in autoyast (#180633)
+- changed the date format displayed in time zone dialog to
+ YYYY-MM-DD (#62312)
+- 2.13.25
+
+-------------------------------------------------------------------
Old:
----
yast2-country-2.13.24.tar.bz2
New:
----
yast2-country-2.13.25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.LDNBB0/_old 2006-06-27 19:02:31.000000000 +0200
+++ /var/tmp/diff_new_pack.LDNBB0/_new 2006-06-27 19:02:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-country (Version 2.13.24)
+# spec file for package yast2-country (Version 2.13.25)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-country
-Version: 2.13.24
+Version: 2.13.25
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-country-2.13.24.tar.bz2
+Source0: yast2-country-2.13.25.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: yast2 yast2-trans-stats yast2-perl-bindings
@@ -60,7 +60,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-country-2.13.24
+%setup -n yast2-country-2.13.25
%build
%{prefix}/bin/y2tool y2autoconf
@@ -105,6 +105,12 @@
%{prefix}/share/applications/YaST2/timezone.desktop
%changelog -n yast2-country
+* Mon Jun 26 2006 - jsuchome@suse.cz
+- added some missing time zones (#173019)
+- fixed language name in autoyast (#180633)
+- changed the date format displayed in time zone dialog to
+ YYYY-MM-DD (#62312)
+- 2.13.25
* Mon Jun 12 2006 - jsuchome@suse.cz
- added Canadian (Multilingual) layout (#158951)
- 2.13.24
++++++ yast2-country-2.13.24.tar.bz2 -> yast2-country-2.13.25.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/Makefile.am new/yast2-country-2.13.25/Makefile.am
--- old/yast2-country-2.13.24/Makefile.am 2006-01-31 14:47:38.000000000 +0100
+++ new/yast2-country-2.13.25/Makefile.am 2006-06-26 13:52:01.000000000 +0200
@@ -8,6 +8,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -95,7 +96,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +117,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +144,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -199,10 +200,13 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/Makefile.in new/yast2-country-2.13.25/Makefile.in
--- old/yast2-country-2.13.24/Makefile.in 2006-01-31 14:47:50.000000000 +0100
+++ new/yast2-country-2.13.25/Makefile.in 2006-06-26 13:52:11.000000000 +0200
@@ -198,6 +198,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS)
ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
@@ -227,7 +228,7 @@
$(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1)
@CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc
@CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
# test ! -d $(srcdir)/po \
# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
# Contents of ./SUBDIRS
@@ -724,7 +725,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -745,7 +746,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -772,18 +773,18 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -826,10 +827,13 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
checkpo:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/VERSION new/yast2-country-2.13.25/VERSION
--- old/yast2-country-2.13.24/VERSION 2006-06-12 16:09:01.000000000 +0200
+++ new/yast2-country-2.13.25/VERSION 2006-06-26 13:52:49.000000000 +0200
@@ -1 +1 @@
-2.13.24
+2.13.25
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/configure new/yast2-country-2.13.25/configure
--- old/yast2-country-2.13.24/configure 2006-01-31 14:47:42.000000000 +0100
+++ new/yast2-country-2.13.25/configure 2006-06-26 13:52:06.000000000 +0200
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-country 2.13.11.
+# Generated by GNU Autoconf 2.59 for yast2-country 2.13.24.
#
-# Report bugs to http://www.suse.de/feedback.
+# Report bugs to http://bugs.opensuse.org/.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -269,9 +269,9 @@
# Identity of this package.
PACKAGE_NAME='yast2-country'
PACKAGE_TARNAME='yast2-country'
-PACKAGE_VERSION='2.13.11'
-PACKAGE_STRING='yast2-country 2.13.11'
-PACKAGE_BUGREPORT='http://www.suse.de/feedback'
+PACKAGE_VERSION='2.13.24'
+PACKAGE_STRING='yast2-country 2.13.24'
+PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
ac_default_prefix=/usr
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-country 2.13.11 to adapt to many kinds of systems.
+\`configure' configures yast2-country 2.13.24 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-country 2.13.11:";;
+ short | recursive ) echo "Configuration of yast2-country 2.13.24:";;
esac
cat <<\_ACEOF
@@ -812,7 +812,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to http://www.suse.de/feedback.
+Report bugs to http://bugs.opensuse.org/.
_ACEOF
fi
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-country configure 2.13.11
+yast2-country configure 2.13.24
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-country $as_me 2.13.11, which was
+It was created by yast2-country $as_me 2.13.24, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-country'
- VERSION='2.13.11'
+ VERSION='2.13.24'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.11"
+VERSION="2.13.24"
RPMNAME="yast2-country"
MAINTAINER="Jiri Suchomel "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-country $as_me 2.13.11, which was
+This file was extended by yast2-country $as_me 2.13.24, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-country config.status 2.13.11
+yast2-country config.status 2.13.24
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/configure.in new/yast2-country-2.13.25/configure.in
--- old/yast2-country-2.13.24/configure.in 2006-01-31 14:47:38.000000000 +0100
+++ new/yast2-country-2.13.25/configure.in 2006-06-26 13:52:01.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-country
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-country, 2.13.11, http://www.suse.de/feedback, yast2-country)
+AC_INIT(yast2-country, 2.13.24, http://bugs.opensuse.org/, yast2-country)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.11"
+VERSION="2.13.24"
RPMNAME="yast2-country"
MAINTAINER="Jiri Suchomel "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/keyboard/data/keyboard_raw.ycp new/yast2-country-2.13.25/keyboard/data/keyboard_raw.ycp
--- old/yast2-country-2.13.24/keyboard/data/keyboard_raw.ycp 2006-06-12 13:16:52.000000000 +0200
+++ new/yast2-country-2.13.25/keyboard/data/keyboard_raw.ycp 2006-06-13 10:55:04.000000000 +0200
@@ -10,7 +10,7 @@
* Summary:
* The untranslated keyboard database.
*
- * $Id: keyboard_raw.ycp 29977 2006-04-11 12:04:49Z jsuchome $
+ * $Id: keyboard_raw.ycp 31465 2006-06-13 08:54:53Z jsuchome $
*
* *****************************************************************
* In case of changes please keep the following three files in sync:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/keyboard/data/lang2keyboard.ycp new/yast2-country-2.13.25/keyboard/data/lang2keyboard.ycp
--- old/yast2-country-2.13.24/keyboard/data/lang2keyboard.ycp 2006-06-13 10:46:02.000000000 +0200
+++ new/yast2-country-2.13.25/keyboard/data/lang2keyboard.ycp 2006-06-13 10:55:04.000000000 +0200
@@ -16,7 +16,7 @@
* The xkblayout-codes may or may not resemble a locale code, therefore
* an extra conversion map is necessary (see xkblayout2keyboard.ycp).
*
- * $Id: lang2keyboard.ycp 29977 2006-04-11 12:04:49Z jsuchome $
+ * $Id: lang2keyboard.ycp 31465 2006-06-13 08:54:53Z jsuchome $
*
* *****************************************************************
* In case of changes please keep the following three files in sync:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/keyboard/data/xkblayout2keyboard.ycp new/yast2-country-2.13.25/keyboard/data/xkblayout2keyboard.ycp
--- old/yast2-country-2.13.24/keyboard/data/xkblayout2keyboard.ycp 2006-06-12 09:24:10.000000000 +0200
+++ new/yast2-country-2.13.25/keyboard/data/xkblayout2keyboard.ycp 2006-06-13 10:55:04.000000000 +0200
@@ -14,7 +14,7 @@
* The xkblayout-codes may or may not resemble a locale code, therefore
* an extra conversion map is necessary (see also lang2keyboard.ycp).
*
- * $Id: xkblayout2keyboard.ycp 21295 2005-02-07 13:31:00Z jsuchome $
+ * $Id: xkblayout2keyboard.ycp 31465 2006-06-13 08:54:53Z jsuchome $
*
* *****************************************************************
* In case of changes please keep the following three files in sync:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/keyboard/src/proposal/Makefile.am new/yast2-country-2.13.25/keyboard/src/proposal/Makefile.am
--- old/yast2-country-2.13.24/keyboard/src/proposal/Makefile.am 2005-09-08 10:34:44.000000000 +0200
+++ new/yast2-country-2.13.25/keyboard/src/proposal/Makefile.am 2006-06-13 11:14:16.000000000 +0200
@@ -1,6 +1,6 @@
# Makefile.am for country/keyboard/src/proposal
-client_DATA = keyboard_proposal.ycp
+client_DATA = keyboard_proposal.ycp keyboard_simple_proposal.ycp
EXTRA_DIST = $(client_DATA)
include $(top_srcdir)/Makefile.am.common
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/keyboard/src/proposal/Makefile.in new/yast2-country-2.13.25/keyboard/src/proposal/Makefile.in
--- old/yast2-country-2.13.24/keyboard/src/proposal/Makefile.in 2006-01-31 14:47:45.000000000 +0100
+++ new/yast2-country-2.13.25/keyboard/src/proposal/Makefile.in 2006-06-26 13:52:08.000000000 +0200
@@ -168,7 +168,7 @@
ydatadir = @ydatadir@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
-client_DATA = keyboard_proposal.ycp
+client_DATA = keyboard_proposal.ycp keyboard_simple_proposal.ycp
EXTRA_DIST = $(client_DATA)
modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA))
modulebindir = $(moduledir)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/keyboard/src/proposal/keyboard_simple_proposal.ycp new/yast2-country-2.13.25/keyboard/src/proposal/keyboard_simple_proposal.ycp
--- old/yast2-country-2.13.24/keyboard/src/proposal/keyboard_simple_proposal.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-country-2.13.25/keyboard/src/proposal/keyboard_simple_proposal.ycp 2006-06-26 16:22:55.000000000 +0200
@@ -0,0 +1,15 @@
+/**
+ * File: keyboard_simple_proposal.ycp
+ * Author: Jiri Suchomel
+ * Purpose: Simple keyboard proposal (for overview tab)
+ * $Id: keyboard_simple_proposal.ycp 31665 2006-06-26 14:24:27Z jsuchome $
+ */
+{
+ textdomain "country";
+
+
+ string func = (string)WFM::Args(0);
+ map param = (map)WFM::Args(1);
+ map ret = (map) WFM::CallFunction ("keyboard_proposal", [func, param]);
+ return ret;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/language/src/modules/Language.ycp new/yast2-country-2.13.25/language/src/modules/Language.ycp
--- old/yast2-country-2.13.24/language/src/modules/Language.ycp 2006-03-20 13:41:32.000000000 +0100
+++ new/yast2-country-2.13.25/language/src/modules/Language.ycp 2006-06-26 16:22:55.000000000 +0200
@@ -6,7 +6,7 @@
* Thomas Roelz
* Maintainer: Jiri Suchomel
*
- * $Id: Language.ycp 29153 2006-03-20 12:41:23Z jsuchome $
+ * $Id: Language.ycp 31665 2006-06-26 14:24:27Z jsuchome $
*/
{
@@ -297,7 +297,12 @@
global define void Language() {
if (Mode::config ())
+ {
+ // read the translated name: bug #180633
+ read_languages_map();
+ name = languages_map[language, 4]:language;
return;
+ }
if (Stage::initial ())
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/timezone/data/lang2tz.ycp new/yast2-country-2.13.25/timezone/data/lang2tz.ycp
--- old/yast2-country-2.13.24/timezone/data/lang2tz.ycp 2006-04-27 13:34:56.000000000 +0200
+++ new/yast2-country-2.13.25/timezone/data/lang2tz.ycp 2006-06-13 10:55:04.000000000 +0200
@@ -9,7 +9,7 @@
*
* Summary: map language code to default timezone
*
- * $Id: lang2tz.ycp 29866 2006-04-07 10:27:44Z jsuchome $
+ * $Id: lang2tz.ycp 31465 2006-06-13 08:54:53Z jsuchome $
*
* *****************************************************************
* In case of changes please keep the following files in sync:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/timezone/data/timezone_raw.ycp new/yast2-country-2.13.25/timezone/data/timezone_raw.ycp
--- old/yast2-country-2.13.24/timezone/data/timezone_raw.ycp 2006-06-12 11:04:24.000000000 +0200
+++ new/yast2-country-2.13.25/timezone/data/timezone_raw.ycp 2006-06-26 16:22:55.000000000 +0200
@@ -3,7 +3,7 @@
* Authors: Thomas Roelz
* Summary: The untranslated timezone database.
*
- * $Id: timezone_raw.ycp 29621 2006-04-03 13:14:28Z jsuchome $
+ * $Id: timezone_raw.ycp 31665 2006-06-26 14:24:27Z jsuchome $
*
* *****************************************************************
* In case of changes please keep the following files in sync:
@@ -54,6 +54,8 @@
"Europe/Riga" : _("Latvia"),
"Europe/Rome" : _("Italy"),
// time zone
+ "Europe/San_Marino" : _("San Marino"),
+ // time zone
"Europe/Samara" : _("Russia (Samara)"),
"Europe/Sarajevo" : _("Bosnia & Herzegovina"),
"Europe/Skopje" : _("Macedonia"),
@@ -100,6 +102,8 @@
$[ "name" : _("Central and South America"),
"entries" : $[
+ // time zone
+ "Brazil/Acre" : _("Brazil Acre"),
"Brazil/East" : _("Brazil East"),
"Brazil/West" : _("Brazil West"),
"Chile/Continental" : _("Chile Continental"),
@@ -112,6 +116,8 @@
"America/Barbados" : _("Barbados"),
"America/Bogota" : _("Bogota"),
"America/Buenos_Aires" : _("Buenos Aires"),
+ // time zone
+ "America/Cayenne" : _("Cayenne"),
"America/Caracas" : _("Caracas"),
"America/Costa_Rica" : _("Costa Rica"),
"America/Dominica" : _("Dominica"),
@@ -119,13 +125,16 @@
"America/Grenada" : _("Grenada"),
"America/Guadeloupe" : _("Guadeloupe"),
"America/Guatemala" : _("Guatemala"),
+ // time zone
+ "America/Guyana" : _("Guyana"),
"America/Lima" : _("Lima"),
"America/Managua" : _("Managua"),
"America/Martinique" : _("Martinique"),
"America/Panama" : _("Panama"),
"America/Puerto_Rico" : _("Puerto Rico"),
"America/Montevideo" : _("Uruguay"),
- "America/Virgin" : _("Virgin"),
+ // time zone
+ "America/Virgin" : _("Virgin Islands"),
"Mexico/General" : _("Mexico General") ] ],
$[
@@ -174,8 +183,12 @@
// time zone
"Hongkong" : _("Hongkong"),
// time zone
+ "Asia/Kabul" : _("Afghanistan"),
+ // time zone
"Asia/Anadyr" : _("Anadyr"),
// time zone
+ "Asia/Baghdad" : _("Baghdad"),
+ // time zone
"Asia/Bahrain" : _("Bahrain"),
// time zone
"Asia/Bangkok" : _("Bangkok"),
@@ -330,7 +343,6 @@
"NZ-CHAT" : _("NZ-CHAT"),
"Navajo" : _("Navajo"),
"PST8PDT" : _("PST8PDT"),
-// "ROC" : _("ROC"),
"UCT" : _("UCT"),
"UTC" : _("UTC"),
"Universal" : _("Universal"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/timezone/src/Timezone.ycp new/yast2-country-2.13.25/timezone/src/Timezone.ycp
--- old/yast2-country-2.13.24/timezone/src/Timezone.ycp 2006-04-07 12:27:48.000000000 +0200
+++ new/yast2-country-2.13.25/timezone/src/Timezone.ycp 2006-06-26 16:22:55.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Klaus Kaempf
* Thomas Roelz
*
- * $Id: Timezone.ycp 29866 2006-04-07 10:27:44Z jsuchome $
+ * $Id: Timezone.ycp 31665 2006-06-26 14:24:27Z jsuchome $
*/
{
@@ -400,7 +400,7 @@
string cmd = "";
string date_format = (locale_format && Mode::normal ())
- ? "+%c" : "+%H:%M:%S - %d-%m-%Y";
+ ? "+%c" : "+%H:%M:%S - %Y-%m-%d";
y2milestone( "GetDateTime hwclock %1 real:%2", hwclock, real_time );
if (!real_time && !Mode::config ())
@@ -636,9 +636,9 @@
ret["hour"] = dparts[0]:"";
ret["minute"] = dparts[1]:"";
ret["second"] = dparts[2]:"";
- ret["day"] = dparts[3]:"";
+ ret["year"] = dparts[3]:"";
ret["month"] = dparts[4]:"";
- ret["year"] = deletechars (dparts[5]:"", "\n");
+ ret["day"] = deletechars (dparts[5]:"", "\n");
y2milestone( "GetDateTimeMap dparts %1 ret %2", dparts, ret );
return( ret );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/timezone/testsuite/tests/GetDateTime.out new/yast2-country-2.13.25/timezone/testsuite/tests/GetDateTime.out
--- old/yast2-country-2.13.24/timezone/testsuite/tests/GetDateTime.out 2005-11-29 09:24:50.000000000 +0100
+++ new/yast2-country-2.13.25/timezone/testsuite/tests/GetDateTime.out 2006-06-26 13:38:03.000000000 +0200
@@ -1,9 +1,9 @@
-Execute .target.bash_output "TZ=Europe/Prague /bin/date \"+%c\" \"--date=now 0sec\"" $["stdout":"00:00:00 - 01-01-0001"]
-Return 00:00:00 - 01-01-0001
-Execute .target.bash_output "TZ=Europe/Prague /bin/date \"+%H:%M:%S - %d-%m-%Y\" \"--date=now 0sec\"" $["stdout":"00:00:00 - 01-01-0001"]
-Return 00:00:00 - 01-01-0001
-Execute .target.bash_output "/bin/date \"+%H:%M:%S - %d-%m-%Y\" \"--date=now 0sec\"" $["stdout":"00:00:00 - 01-01-0001"]
-Return 00:00:00 - 01-01-0001
-Execute .target.bash_output "date +%z" $["stdout":"00:00:00 - 01-01-0001"]
-Execute .target.bash_output "TZ=Europe/Prague /bin/date \"+%H:%M:%S - %d-%m-%Y\" \"--date=now 0sec\"" $["stdout":"00:00:00 - 01-01-0001"]
-Return 00:00:00 - 01-01-0001
+Execute .target.bash_output "TZ=Europe/Prague /bin/date \"+%c\" \"--date=now 0sec\"" $["stdout":"00:00:00 - 0001-01-01"]
+Return 00:00:00 - 0001-01-01
+Execute .target.bash_output "TZ=Europe/Prague /bin/date \"+%H:%M:%S - %Y-%m-%d\" \"--date=now 0sec\"" $["stdout":"00:00:00 - 0001-01-01"]
+Return 00:00:00 - 0001-01-01
+Execute .target.bash_output "/bin/date \"+%H:%M:%S - %Y-%m-%d\" \"--date=now 0sec\"" $["stdout":"00:00:00 - 0001-01-01"]
+Return 00:00:00 - 0001-01-01
+Execute .target.bash_output "date +%z" $["stdout":"00:00:00 - 0001-01-01"]
+Execute .target.bash_output "TZ=Europe/Prague /bin/date \"+%H:%M:%S - %Y-%m-%d\" \"--date=now 0sec\"" $["stdout":"00:00:00 - 0001-01-01"]
+Return 00:00:00 - 0001-01-01
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/timezone/testsuite/tests/GetDateTime.ycp new/yast2-country-2.13.25/timezone/testsuite/tests/GetDateTime.ycp
--- old/yast2-country-2.13.24/timezone/testsuite/tests/GetDateTime.ycp 2006-02-27 09:27:32.000000000 +0100
+++ new/yast2-country-2.13.25/timezone/testsuite/tests/GetDateTime.ycp 2006-06-26 16:22:55.000000000 +0200
@@ -1,7 +1,7 @@
/**
* tests for Timezone::GetDateTime
* Author: jsuchome@suse.cz
- * $Id: GetDateTime.ycp 27936 2006-02-13 20:01:14Z olh $
+ * $Id: GetDateTime.ycp 31665 2006-06-26 14:24:27Z jsuchome $
*/
{
@@ -34,7 +34,7 @@
map E = $[
"target" : $[
"bash_output" : $[
- "stdout" : "00:00:00 - 01-01-0001"
+ "stdout" : "00:00:00 - 0001-01-01"
],
],
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/timezone/testsuite/tests/GetDateTimeMap.out new/yast2-country-2.13.25/timezone/testsuite/tests/GetDateTimeMap.out
--- old/yast2-country-2.13.24/timezone/testsuite/tests/GetDateTimeMap.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-country-2.13.25/timezone/testsuite/tests/GetDateTimeMap.out 2006-06-26 13:49:54.000000000 +0200
@@ -0,0 +1,2 @@
+Execute .target.bash_output "TZ=Europe/Prague /bin/date \"+%H:%M:%S - %Y-%m-%d\" \"--date=now 0sec\"" $["stdout":"23:59:59 - 0000-12-24"]
+Return $["day":"24", "hour":"23", "minute":"59", "month":"12", "second":"59", "year":"0000"]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.13.24/timezone/testsuite/tests/GetDateTimeMap.ycp new/yast2-country-2.13.25/timezone/testsuite/tests/GetDateTimeMap.ycp
--- old/yast2-country-2.13.24/timezone/testsuite/tests/GetDateTimeMap.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-country-2.13.25/timezone/testsuite/tests/GetDateTimeMap.ycp 2006-06-26 16:22:55.000000000 +0200
@@ -0,0 +1,44 @@
+/**
+ * test for Timezone::GetDateTimeMap
+ * - check correct parsing after changed time format (bug #62312)
+ * Author: jsuchome@suse.cz
+ * $Id: GetDateTimeMap.ycp 31665 2006-06-26 14:24:27Z jsuchome $
+ */
+{
+ // testedfiles: Timezone.ycp
+
+ import "Testsuite";
+
+ map READ = $[
+ "sysconfig" : $[
+ "clock" : $[
+ "TIMEZONE" : "Europe/Prague",
+ "HWCLOCK" : "-u",
+ ],
+ ],
+ "target" : $[
+ "size" : 1,
+ "yast2" : $[],
+ ],
+ ];
+ map EXECUTE = $[
+ "target" : $[
+ "bash_output" : $[],
+ ],
+ ];
+
+ Testsuite::Init([READ,$[],EXECUTE], nil);
+
+ import "Timezone";
+
+ map E = $[
+ "target" : $[
+ "bash_output" : $[
+ "stdout" : "23:59:59 - 0000-12-24"
+ ],
+ ],
+ ];
+
+ Testsuite::Test (``(Timezone::GetDateTimeMap ()), [$[],$[],E], []);
+
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org