[kupfer] uiutils, prefs: Use version directly instead of version_subst



commit 91269b61ebb0d05642c9a8903343afb489269abe
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Thu Dec 10 02:39:28 2009 +0100

    uiutils, prefs: Use version directly instead of version_subst

 kupfer/preferences.py |   10 ++--------
 kupfer/uiutils.py     |   10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)
---
diff --git a/kupfer/preferences.py b/kupfer/preferences.py
index 65a9c10..7de1c75 100644
--- a/kupfer/preferences.py
+++ b/kupfer/preferences.py
@@ -10,20 +10,14 @@ from xdg import DesktopEntry as desktop
 
 
 from kupfer import config, plugins, pretty, settings, utils, icons
-from kupfer import keybindings
+from kupfer import keybindings, version
 
 class PreferencesWindowController (pretty.OutputMixin):
 	def __init__(self):
 		"""Load ui from data file"""
 		builder = gtk.Builder()
+		builder.set_translation_domain(version.PACKAGE_NAME)
 		ui_file = config.get_data_file("preferences.ui")
-		try:
-			import version_subst
-		except ImportError:
-			package_name = "kupfer"
-		else:
-			package_name = version_subst.PACKAGE_NAME
-		builder.set_translation_domain(package_name)
 
 		if ui_file:
 			builder.add_from_file(ui_file)
diff --git a/kupfer/uiutils.py b/kupfer/uiutils.py
index be48353..0c86d2e 100644
--- a/kupfer/uiutils.py
+++ b/kupfer/uiutils.py
@@ -10,7 +10,7 @@ import glib
 import gtk
 import pango
 
-from kupfer import config
+from kupfer import config, version
 
 def _window_destroy_on_escape(widget, event):
 	"""
@@ -30,13 +30,7 @@ def builder_get_objects_from_file(fname, attrs, autoconnect_to=None):
 	and a user_data object is passed as a namespace containing all @attrs
 	"""
 	builder = gtk.Builder()
-	try:
-		import version_subst
-	except ImportError:
-		package_name = "kupfer"
-	else:
-		package_name = version_subst.PACKAGE_NAME
-	builder.set_translation_domain(package_name)
+	builder.set_translation_domain(version.PACKAGE_NAME)
 
 	ui_file = config.get_data_file(fname)
 	builder.add_from_file(ui_file)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]