From ea861628d48e52e8669dfe1620ae332dc0ad6b2e Mon Sep 17 00:00:00 2001
From: David Aguilar <davvid@gmail.com>
Date: Wed, 26 Dec 2007 20:11:06 -0800
Subject: [PATCH] More i18n tweaks

Signed-off by: David Aguilar <davvid@gmail.com>
---
 ugitlibs/qtutils.py | 18 +++++++++++++-----
 ugitlibs/views.py   |  4 ++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ugitlibs/qtutils.py b/ugitlibs/qtutils.py
index 0b91830..0bc297f 100644
--- a/ugitlibs/qtutils.py
+++ b/ugitlibs/qtutils.py
@@ -5,7 +5,7 @@ from PyQt4.QtGui import QIcon
 from PyQt4.QtGui import QListWidgetItem
 from PyQt4.QtGui import QMessageBox
 from PyQt4.QtGui import QPixmap
-from views import GitCommandDialog
+import views
 
 def create_listwidget_item(text, filename):
 	icon = QIcon(QPixmap(filename))
@@ -44,17 +44,17 @@ def get_selected_item(list_widget, items):
 def open_dialog(parent, title, filename=None):
 	qstr = QFileDialog.getOpenFileName(
 			parent, title, filename)
-	return str(qstr)
+	return unicode(qstr)
 
 def save_dialog(parent, title, filename=None):
 	qstr = QFileDialog.getSaveFileName(
 			parent, title, filename)
-	return str(qstr)
+	return unicode(qstr)
 
 def dir_dialog(parent, title, directory):
 	directory = QFileDialog.getExistingDirectory(
 			parent, title, directory)
-	return str(directory)
+	return unicode(directory)
 
 def question(parent, title, message, default=True):
 	'''Launches a QMessageBox question with the provided title and message.
@@ -82,6 +82,14 @@ def set_items(widget, items):
 
 def show_command(parent, output):
 	if not output: return
-	dialog = GitCommandDialog(parent, output=output)
+	dialog = views.GitCommandDialog(parent, output=output)
 	dialog.show()
 	dialog.exec_()
+
+def tr(text):
+	trtext = unicode(QtGui.qApp.tr(text))
+	if trtext.endswith('@@verb'):
+		trtext = trtext.replace('@@verb','')
+	if trtext.endswith('@@noun'):
+		trtext = trtext.replace('@@noun','')
+	return trtext
diff --git a/ugitlibs/views.py b/ugitlibs/views.py
index 1a4b1e1..313b874 100644
--- a/ugitlibs/views.py
+++ b/ugitlibs/views.py
@@ -8,6 +8,7 @@ from BranchDialog import Ui_BranchDialog
 from CreateBranchDialog import Ui_CreateBranchDialog
 from PushDialog import Ui_PushDialog
 from syntax import GitSyntaxHighlighter
+import qtutils
 
 class GitView(Ui_Window, QtGui.QMainWindow):
 	'''The main ugit interface.'''
@@ -16,6 +17,9 @@ class GitView(Ui_Window, QtGui.QMainWindow):
 		Ui_Window.__init__(self)
 		self.setupUi(self)
 		GitSyntaxHighlighter(self.displayText.document())
+		# Qt does not handle noun/verb support
+		self.commitButton.setText(qtutils.tr('Commit@@verb'))
+		self.menuCommit.setTitle(qtutils.tr('Commit@@verb'))
 
 class GitCommandDialog(Ui_CommandDialog, QtGui.QDialog):
 	'''A simple dialog to display command output.'''
-- 
2.11.4.GIT