totem r6132 - in branches/gnome-2-26: . src/plugins/coherence_upnp src/plugins/jamendo src/plugins/opensubtitles src/plugins/totem src/plugins/youtube

[pwithnall svn gnome org]

Author: pwithnall
Date: Wed Mar 11 23:42:25 2009
New Revision: 6132
URL: http://svn.gnome.org/viewvc/totem?rev=6132&view=rev

Log:
2009-03-11  Philip Withnall  <philip tecnocode co uk>

	* src/plugins/totem/__init__.py: Import gettext and set the
	translation domain when importing the module

	* src/plugins/coherence_upnp/coherence_upnp.py:
	* src/plugins/jamendo/jamendo.py:
	* src/plugins/opensubtitles/opensubtitles.py:
	* src/plugins/youtube/youtube.py: Use the gettext set in the
	totem Python module

	Spotted by Gabor Kelemen <kelemeng gnome hu> (Closes: #574700)



Modified:
   branches/gnome-2-26/ChangeLog
   branches/gnome-2-26/src/plugins/coherence_upnp/coherence_upnp.py
   branches/gnome-2-26/src/plugins/jamendo/jamendo.py
   branches/gnome-2-26/src/plugins/opensubtitles/opensubtitles.py
   branches/gnome-2-26/src/plugins/totem/__init__.py
   branches/gnome-2-26/src/plugins/youtube/youtube.py

Modified: branches/gnome-2-26/src/plugins/coherence_upnp/coherence_upnp.py
==============================================================================
--- branches/gnome-2-26/src/plugins/coherence_upnp/coherence_upnp.py	(original)
+++ branches/gnome-2-26/src/plugins/coherence_upnp/coherence_upnp.py	Wed Mar 11 23:42:25 2009
@@ -11,9 +11,6 @@
 from coherence.ui.av_widgets import UDN_COLUMN,UPNP_CLASS_COLUMN,SERVICE_COLUMN
 
 import totem
-import gettext
-
-_ = gettext.gettext
 
 class UPnPClient(totem.Plugin):
 

Modified: branches/gnome-2-26/src/plugins/jamendo/jamendo.py
==============================================================================
--- branches/gnome-2-26/src/plugins/jamendo/jamendo.py	(original)
+++ branches/gnome-2-26/src/plugins/jamendo/jamendo.py	Wed Mar 11 23:42:25 2009
@@ -32,7 +32,6 @@
 
 import os
 import totem
-import gettext
 import gconf
 import gobject
 import gtk
@@ -60,7 +59,6 @@
 
 socket.setdefaulttimeout(30)
 gobject.threads_init()
-_ = gettext.gettext
 gconf_key = '/apps/totem/plugins/jamendo'
 
 

Modified: branches/gnome-2-26/src/plugins/opensubtitles/opensubtitles.py
==============================================================================
--- branches/gnome-2-26/src/plugins/opensubtitles/opensubtitles.py	(original)
+++ branches/gnome-2-26/src/plugins/opensubtitles/opensubtitles.py	Wed Mar 11 23:42:25 2009
@@ -1,5 +1,4 @@
 import totem
-import gettext
 import gobject, gtk, gio, gconf
 gobject.threads_init()
 import xmlrpclib
@@ -9,9 +8,6 @@
 
 from hash import hashFile
 
-D_ = gettext.dgettext
-_ = gettext.gettext
-
 USER_AGENT = 'Totem'
 OK200 = '200 OK'
 TOTEM_REMOTE_COMMAND_REPLACE = 14

Modified: branches/gnome-2-26/src/plugins/totem/__init__.py
==============================================================================
--- branches/gnome-2-26/src/plugins/totem/__init__.py	(original)
+++ branches/gnome-2-26/src/plugins/totem/__init__.py	Wed Mar 11 23:42:25 2009
@@ -0,0 +1,6 @@
+import gettext
+gettext.textdomain("totem")
+
+D_ = gettext.dgettext
+_ = gettext.gettext
+

Modified: branches/gnome-2-26/src/plugins/youtube/youtube.py
==============================================================================
--- branches/gnome-2-26/src/plugins/youtube/youtube.py	(original)
+++ branches/gnome-2-26/src/plugins/youtube/youtube.py	Wed Mar 11 23:42:25 2009
@@ -10,9 +10,6 @@
 import re
 import os
 import random
-import gettext
-
-_ = gettext.gettext
 
 class DownloadThread (threading.Thread):
 	def __init__ (self, youtube, url, treeview_name):