Hello community,
here is the log from the commit of package yast2-online-update-configuration
for openSUSE:Factory checked in at 2013-03-26 19:49:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-online-update-configuration (Old)
and /work/SRC/openSUSE:Factory/.yast2-online-update-configuration.new
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-online-update-configuration", Maintainer is "j...@suse.com"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-online-update-configuration/yast2-online-update-configuration.changes
2012-11-02 15:21:48.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-online-update-configuration.new/yast2-online-update-configuration.changes
2013-03-26 19:49:21.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Mar 13 16:51:35 UTC 2013 - j...@suse.de
+
+- translate cron intervals and update categories (bnc#807773)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-online-update-configuration.spec ++++++
--- /var/tmp/diff_new_pack.K2BxtG/_old 2013-03-26 19:49:23.000000000 +0100
+++ /var/tmp/diff_new_pack.K2BxtG/_new 2013-03-26 19:49:23.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-online-update-configuration
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -41,7 +41,7 @@
BuildArch: noarch
Summary: Configuration of Online Update
-License: GPL-2.0+
+License: GPL-2.0
Group: System/YaST
%description
++++++ yast2-online-update-configuration-2.22.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-online-update-configuration-2.22.1/Makefile.in
new/yast2-online-update-configuration-2.22.1/Makefile.in
--- old/yast2-online-update-configuration-2.22.1/Makefile.in 2012-10-24
17:20:34.000000000 +0200
+++ new/yast2-online-update-configuration-2.22.1/Makefile.in 2013-03-15
18:41:03.000000000 +0100
@@ -684,7 +684,7 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
+ chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-2.22.1/configure.in
new/yast2-online-update-configuration-2.22.1/configure.in
--- old/yast2-online-update-configuration-2.22.1/configure.in 2012-10-24
17:20:30.000000000 +0200
+++ new/yast2-online-update-configuration-2.22.1/configure.in 2013-03-15
18:40:58.000000000 +0100
@@ -1,6 +1,6 @@
dnl configure.in for yast2-online-update-configuration
dnl
-dnl -- This file is generated by y2autoconf 2.23.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-online-update-configuration, 2.22.1, http://bugs.opensuse.org/,
yast2-online-update-configuration)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-2.22.1/src/clients/online_update_configuration.ycp
new/yast2-online-update-configuration-2.22.1/src/clients/online_update_configuration.ycp
---
old/yast2-online-update-configuration-2.22.1/src/clients/online_update_configuration.ycp
2012-10-23 15:08:58.000000000 +0200
+++
new/yast2-online-update-configuration-2.22.1/src/clients/online_update_configuration.ycp
2013-01-22 11:37:42.000000000 +0100
@@ -1,3 +1,24 @@
+/****************************************************************************
+
+Copyright (c) 2006 - 2012 Novell, Inc.
+All Rights Reserved.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of version 2 of the GNU General Public License as
+published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, contact Novell, Inc.
+
+To contact Novell about this file by physical or electronic mail,
+you may find current contact information at www.novell.com
+
+****************************************************************************/
/**
* File: online_update_configuration
* Module: Online Update Configuration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-2.22.1/src/clients/online_update_configuration_auto.ycp
new/yast2-online-update-configuration-2.22.1/src/clients/online_update_configuration_auto.ycp
---
old/yast2-online-update-configuration-2.22.1/src/clients/online_update_configuration_auto.ycp
2012-10-23 15:08:58.000000000 +0200
+++
new/yast2-online-update-configuration-2.22.1/src/clients/online_update_configuration_auto.ycp
2013-03-13 17:56:34.000000000 +0100
@@ -1,3 +1,24 @@
+/****************************************************************************
+
+Copyright (c) 2006 - 2012 Novell, Inc.
+All Rights Reserved.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of version 2 of the GNU General Public License as
+published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, contact Novell, Inc.
+
+To contact Novell about this file by physical or electronic mail,
+you may find current contact information at www.novell.com
+
+****************************************************************************/
/**
* File: online_update_configuration
* Module: Online Update Configuration
@@ -89,7 +110,7 @@
if (OnlineUpdateConfiguration::enableAOU)
{
summary = Summary::AddHeader (summary, interval);
- summary = Summary::AddLine (summary,
OnlineUpdateConfiguration::intervalSymbolToString(OnlineUpdateConfiguration::updateInterval)
);
+ summary = Summary::AddLine (summary,
OnlineUpdateConfiguration::intervalSymbolToString(OnlineUpdateConfiguration::updateInterval,
`trans) );
summary = Summary::AddHeader (summary, skipInteractivePatches);
summary = Summary::AddLine (summary,
OnlineUpdateConfiguration::skipInteractivePatches ? enabledMsg:disabledMsg );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-2.22.1/src/dialogs/OUCDialogs.ycp
new/yast2-online-update-configuration-2.22.1/src/dialogs/OUCDialogs.ycp
--- old/yast2-online-update-configuration-2.22.1/src/dialogs/OUCDialogs.ycp
2012-10-23 15:08:58.000000000 +0200
+++ new/yast2-online-update-configuration-2.22.1/src/dialogs/OUCDialogs.ycp
2013-03-13 17:56:34.000000000 +0100
@@ -1,3 +1,24 @@
+/****************************************************************************
+
+Copyright (c) 2006 - 2012 Novell, Inc.
+All Rights Reserved.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of version 2 of the GNU General Public License as
+published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, contact Novell, Inc.
+
+To contact Novell about this file by physical or electronic mail,
+you may find current contact information at www.novell.com
+
+****************************************************************************/
/**
* File: OUCDialogs.ycp
* Module: online-update-configuration
@@ -88,8 +109,8 @@
// , `item(`id(`smolt), sendDataToSmolt )
];
- list<term> updateIntervals = maplist(symbol intid, string intname,
OnlineUpdateConfiguration::Intervals, {
- return `item( `id(intid), intname);
+ list<term> updateIntervals = maplist(symbol intid, map<symbol,string> i,
OnlineUpdateConfiguration::Intervals, {
+ return `item( `id(intid), i[`trans]:"none" );
});
term upRepo = `Frame(updateRepository,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-online-update-configuration-2.22.1/src/modules/OnlineUpdateConfiguration.ycp
new/yast2-online-update-configuration-2.22.1/src/modules/OnlineUpdateConfiguration.ycp
---
old/yast2-online-update-configuration-2.22.1/src/modules/OnlineUpdateConfiguration.ycp
2012-10-23 15:08:58.000000000 +0200
+++
new/yast2-online-update-configuration-2.22.1/src/modules/OnlineUpdateConfiguration.ycp
2013-03-13 17:56:34.000000000 +0100
@@ -1,3 +1,24 @@
+/****************************************************************************
+
+Copyright (c) 2006 - 2012 Novell, Inc.
+All Rights Reserved.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of version 2 of the GNU General Public License as
+published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, contact Novell, Inc.
+
+To contact Novell about this file by physical or electronic mail,
+you may find current contact information at www.novell.com
+
+****************************************************************************/
/**
* File: modules/OnlineUpdateConfiguration.ycp
* Package: Online Update Configuration
@@ -42,19 +63,25 @@
// cache the base product details
map<string, any> baseProductDetail = $[];
-global map<symbol, string> Intervals = $[
- `daily : "daily",
- `weekly : "weekly",
- `monthly: "monthly"
+global map<symbol, map<symbol,string> > Intervals = $[
+ `daily : $[`name:"daily" , `trans:_("daily") ],
+ `weekly : $[`name:"weekly", `trans:_("weekly") ],
+ `monthly: $[`name:"monthly", `trans:_("monthly")]
];
global map<string,term> defaultCategories = $[
- "yast" : `item( `id("yast"), "Packagemanager and YaST"),
- "security" : `item( `id("security"), "Security"),
- "recommended" : `item( `id("recommended"), "Recommended"),
- "optional" : `item( `id("optional"), "Optional"),
- "document" : `item( `id("document"), "Document"),
- "other" : `item( `id("other"), "Other")
+ //translators: this name is a (technical) category for an update package
+ "yast" : `item( `id("yast"), _("Packagemanager and YaST")),
+ //translators: this name is a (technical) category for an update package
+ "security" : `item( `id("security"), _("Security")),
+ //translators: this name is a (technical) category for an update package
+ "recommended" : `item( `id("recommended"), _("Recommended")),
+ //translators: this name is a (technical) category for an update package
+ "optional" : `item( `id("optional"), _("Optional")),
+ //translators: this name is a (technical) category for an update package:
Document, meaning Documentation
+ "document" : `item( `id("document"), _("Document")),
+ //translators: this name is a (technical) category for an update package
+ "other" : `item( `id("other"), _("Other"))
];
/*
@@ -377,16 +404,17 @@
return true;
}
-global string intervalSymbolToString(symbol intervalSym)
+global string intervalSymbolToString(symbol intervalSym, symbol strType)
{
- return Intervals[intervalSym]:"none";
+ map<symbol,string> i = Intervals[intervalSym]:$[];
+ return i[strType]:"none";
}
global symbol intervalStringToSymbol(string intervalStr)
{
symbol result = `none;
- foreach(symbol sym, string str, Intervals, {
- if ( str == intervalStr ) result = sym;
+ foreach(symbol sym, map<symbol,string> i, Intervals, {
+ if ( i[`name]:"none" == intervalStr ) result = sym;
return;
} );
return result;
@@ -552,7 +580,7 @@
"skip_interactive_patches":skipInteractivePatches,
"auto_agree_with_licenses":autoAgreeWithLicenses,
"include_recommends":includeRecommends,
- "update_interval":intervalSymbolToString(updateInterval),
+ "update_interval":intervalSymbolToString(updateInterval, `name),
"category_filter": $[ "category":currentCategories ]
];
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
