rpms/system-config-language/devel s-c-l-bug-598975.patch, NONE, 1.1 system-config-language.spec, 1.50, 1.51

[Pravin Satpute]

Author: pravins

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7931

Modified Files:
	system-config-language.spec 
Added Files:
	s-c-l-bug-598975.patch 
Log Message:
* Tue Jul 07 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.2-7
- fix bug 598975


s-c-l-bug-598975.patch:

--- NEW FILE s-c-l-bug-598975.patch ---
diff -rup system-config-language-1.3.2/src/gui_detailsDialog.py system-config-language-1.3.2_mod/src/gui_detailsDialog.py
--- system-config-language-1.3.2/src/gui_detailsDialog.py	2008-09-16 17:55:22.000000000 +0530
+++ system-config-language-1.3.2_mod/src/gui_detailsDialog.py	2009-07-07 11:03:15.340263293 +0530
@@ -21,7 +21,9 @@ import gtk
 import gtk.glade
 import gobject
 
-from rhpl.translate import _
+
+import gettext
+_ = lambda x: gettext.ldgettext("system-config-language", x)
 
 if os.access("data/yumhelpers.glade", os.R_OK):
     gygladefn = "data/yumhelpers.glade"
diff -rup system-config-language-1.3.2/src/gui_install.py system-config-language-1.3.2_mod/src/gui_install.py
--- system-config-language-1.3.2/src/gui_install.py	2008-09-16 17:55:22.000000000 +0530
+++ system-config-language-1.3.2_mod/src/gui_install.py	2009-07-07 11:04:02.347264301 +0530
@@ -19,7 +19,6 @@ import string
 import os, sys
 import gtk
 import pango
-from rhpl.translate import _, N_
 import urlgrabber, urlgrabber.progress
 import urllib2
 import time
@@ -32,6 +31,11 @@ import gui_progress    
 from gui_errors import *    
 import gui_detailsDialog
 
+import gettext
+_ = lambda x: gettext.ldgettext("system-config-language", x)
+N_ = lambda x: x
+
+
 GuiDetailsDialog = gui_detailsDialog.GuiDetailsDialog
 GuiTransactionProgress = gui_progress.GuiTransactionProgress
 GuiProgress = gui_progress.GuiProgress
diff -rup system-config-language-1.3.2/src/gui_progress.py system-config-language-1.3.2_mod/src/gui_progress.py
--- system-config-language-1.3.2/src/gui_progress.py	2008-09-16 17:55:22.000000000 +0530
+++ system-config-language-1.3.2_mod/src/gui_progress.py	2009-07-07 10:56:46.169264285 +0530
@@ -23,7 +23,8 @@ import gtk
 import gtk.glade
 import gtk.gdk as gdk
 
-from rhpl.translate import _
+import gettext
+_ = lambda x: gettext.ldgettext("system-config-language", x)
 
 from yum.constants import *
 from gui_errors import *
diff -rup system-config-language-1.3.2/src/language_gui.py system-config-language-1.3.2_mod/src/language_gui.py
--- system-config-language-1.3.2/src/language_gui.py	2008-09-16 17:55:22.000000000 +0530
+++ system-config-language-1.3.2_mod/src/language_gui.py	2009-07-07 11:04:35.230264013 +0530
@@ -32,9 +32,9 @@ from gui_errors import * 
 ##
 ## I18N
 ## 
-from rhpl.translate import _, N_
-import rhpl.translate as translate
-translate.textdomain ("system-config-language")
+import gettext
+_ = lambda x: gettext.ldgettext("system-config-language", x)
+N_ = lambda x: x
 
 ##
 ## Icon for windows
diff -rup system-config-language-1.3.2/src/language_tui.py system-config-language-1.3.2_mod/src/language_tui.py
--- system-config-language-1.3.2/src/language_tui.py	2008-09-16 17:55:22.000000000 +0530
+++ system-config-language-1.3.2_mod/src/language_tui.py	2009-07-07 10:56:03.463264737 +0530
@@ -18,7 +18,6 @@
 
 
 from snack import *
-from rhpl.translate import _, textdomain_codeset
 import os
 import locale
 import language_backend
@@ -27,7 +26,10 @@ import tui_install
 from gui_errors import *
 
 locale.setlocale(locale.LC_ALL, "")
-textdomain_codeset("system-config-language", locale.nl_langinfo(locale.CODESET))
+import gettext
+_ = lambda x: gettext.ldgettext("system-config-language", x)
+N_ = lambda x: x
+gettext.bind_textdomain_codeset("system-config-language", locale.nl_langinfo(locale.CODESET))
 
 languageBackend = language_backend.LanguageBackend()
 
diff -rup system-config-language-1.3.2/src/system-config-language.py system-config-language-1.3.2_mod/src/system-config-language.py
--- system-config-language-1.3.2/src/system-config-language.py	2008-09-16 17:55:22.000000000 +0530
+++ system-config-language-1.3.2_mod/src/system-config-language.py	2009-07-07 10:58:24.911325478 +0530
@@ -25,10 +25,9 @@ import getopt
 ##
 ## I18N
 ##
-from rhpl.translate import _, N_
-import rhpl.translate as translate
-translate.textdomain ("system-config-language")
-
+import gettext
+_ = lambda x: gettext.ldgettext("system-config-language", x)
+N_ = lambda x: x
 
 if __name__ == "__main__":
     signal.signal (signal.SIGINT, signal.SIG_DFL)


Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- system-config-language.spec	25 May 2009 09:14:21 -0000	1.50
+++ system-config-language.spec	7 Jul 2009 08:10:20 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.3.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPLv2+
 Group: System Environment/Base
@@ -13,7 +13,6 @@ BuildRequires: gettext
 BuildRequires: intltool
 Requires: pygtk2
 Requires: python2
-Requires: rhpl
 Requires: usermode >= 1.36
 Requires: usermode-gtk >= 1.36
 Requires: yum >= 2.9.5
@@ -21,6 +20,7 @@ Requires: gtk2 >= 2.6
 Obsoletes: locale_config  <= %{version}
 Patch1: ca-po-462914.patch
 Patch2: dialogue-center-493824.patch
+Patch3: s-c-l-bug-598975.patch
 
 %description
 system-config-language is a graphical user interface that 
@@ -30,6 +30,7 @@ allows the user to change the default la
 %setup -q
 %patch1 -p1 -b .1-ca-po
 %patch2 -p1 -b .2-dialogue-center
+%patch3 -p1 -b .3-rhpl
 
 %build
 make %{?_smp_mflags}
@@ -87,6 +88,9 @@ fi
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Tue Jul 07 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.2-7
+- fix bug 598975
+
 * Mon May 25 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.2-6
 - fix bug 493824