From f20c3c18958f7681849f308ee69cb828822b2c3e Mon Sep 17 00:00:00 2001
From: Adam Waldenberg <adam.waldenberg@ejwa.se>
Date: Tue, 25 Jun 2013 16:37:18 +0200
Subject: [PATCH] Made some changes to ensure compatibility in Python 2 with
 gettext.

The gettext.install() functions supplies a way to force it to return
unicode which helps with compatibility between Python 2 & 3. To make it
work properly when merging those returned string with strings in the
different modules of gitinspector we also had to do some changes to make
sure all string literals are in unicode.
---
 gitinspector/comment.py          | 2 ++
 gitinspector/extensions.py       | 1 +
 gitinspector/filtering.py        | 3 ++-
 gitinspector/format.py           | 1 +
 gitinspector/gitinspector.py     | 1 +
 gitinspector/help.py             | 1 +
 gitinspector/interval.py         | 2 ++
 gitinspector/localization.py     | 3 ++-
 gitinspector/missing.py          | 1 +
 gitinspector/outputable.py       | 7 ++++---
 gitinspector/responsibilities.py | 1 +
 gitinspector/timeline.py         | 1 +
 gitinspector/version.py          | 1 +
 13 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/gitinspector/comment.py b/gitinspector/comment.py
index 00744cb..6675a47 100644
--- a/gitinspector/comment.py
+++ b/gitinspector/comment.py
@@ -17,6 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import unicode_literals
+
 __comment_begining__ = {"java": "/*", "c": "/*", "cpp": "/*", "h": "/*", "hpp": "/*", "html": "<!--", "php": "/*",
                         "py": "\"\"\"", "glsl": "/*", "rb": "=begin", "js": "/*", "sql": "/*", "xml": "<!--"}
 
diff --git a/gitinspector/extensions.py b/gitinspector/extensions.py
index 3dfc955..bffa6fa 100644
--- a/gitinspector/extensions.py
+++ b/gitinspector/extensions.py
@@ -18,6 +18,7 @@
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
+from __future__ import unicode_literals
 from outputable import Outputable
 import terminal
 import textwrap
diff --git a/gitinspector/filtering.py b/gitinspector/filtering.py
index 697053f..b7b8a02 100644
--- a/gitinspector/filtering.py
+++ b/gitinspector/filtering.py
@@ -18,6 +18,7 @@
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
+from __future__ import unicode_literals
 from outputable import Outputable
 import terminal
 import textwrap
@@ -44,7 +45,7 @@ def set_filtered(file_name):
 				return True
 	return False
 
-__filtering_info_text__ = _("The following files were excluded from the statistics due to the"
+__filtering_info_text__ = _("The following files were excluded from the statistics due to the "
                             "specified exclusion patterns")
 
 class Filtering(Outputable):
diff --git a/gitinspector/format.py b/gitinspector/format.py
index f47f6f4..566c0c5 100644
--- a/gitinspector/format.py
+++ b/gitinspector/format.py
@@ -18,6 +18,7 @@
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
+from __future__ import unicode_literals
 import version
 import base64
 import basedir
diff --git a/gitinspector/gitinspector.py b/gitinspector/gitinspector.py
index 8864ef6..fbb6def 100755
--- a/gitinspector/gitinspector.py
+++ b/gitinspector/gitinspector.py
@@ -19,6 +19,7 @@
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
+from __future__ import unicode_literals
 
 import localization
 localization.init()
diff --git a/gitinspector/help.py b/gitinspector/help.py
index 176722c..09df2ea 100644
--- a/gitinspector/help.py
+++ b/gitinspector/help.py
@@ -18,6 +18,7 @@
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
+from __future__ import unicode_literals
 from extensions import __default_extensions__
 from format import __available_formats__
 import sys
diff --git a/gitinspector/interval.py b/gitinspector/interval.py
index 863a869..19da013 100644
--- a/gitinspector/interval.py
+++ b/gitinspector/interval.py
@@ -18,6 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import unicode_literals
+
 __since__ = ""
 
 __until__ = ""
diff --git a/gitinspector/localization.py b/gitinspector/localization.py
index fe21e6b..e2f9294 100644
--- a/gitinspector/localization.py
+++ b/gitinspector/localization.py
@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import unicode_literals
 import gettext
 import locale
 import os
@@ -38,4 +39,4 @@ def init():
 	except IOError:
 		translation = gettext.NullTranslations()
 
-	translation.install()
+	translation.install(True)
diff --git a/gitinspector/missing.py b/gitinspector/missing.py
index d1c9f66..95d2b6a 100644
--- a/gitinspector/missing.py
+++ b/gitinspector/missing.py
@@ -18,6 +18,7 @@
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
+from __future__ import unicode_literals
 from outputable import Outputable
 import interval
 import os
diff --git a/gitinspector/outputable.py b/gitinspector/outputable.py
index 0d8dbb0..c521d21 100644
--- a/gitinspector/outputable.py
+++ b/gitinspector/outputable.py
@@ -18,17 +18,18 @@
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
+from __future__ import unicode_literals
 import format
 
 class Outputable(object):
 	def output_html(self):
-		print(_("HTML output not yet supported in \"") + self.__class__.__name__ + "\".")
+		print(_("HTML output not yet supported in") + " \"" + self.__class__.__name__ + "\".")
 
 	def output_text(self):
-		print(_("Text output not yet supported in \"") + self.__class__.__name__ + "\".")
+		print(_("Text output not yet supported in") + " \"" + self.__class__.__name__ + "\".")
 
 	def output_xml(self):
-		print(_("XML output not yet supported in \"") + self.__class__.__name__ + "\".")
+		print(_("XML output not yet supported in") + " \"" + self.__class__.__name__ + "\".")
 
 def output(outputable):
 	if format.get_selected() == "html":
diff --git a/gitinspector/responsibilities.py b/gitinspector/responsibilities.py
index ba09c6b..1f0a4fc 100644
--- a/gitinspector/responsibilities.py
+++ b/gitinspector/responsibilities.py
@@ -18,6 +18,7 @@
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
+from __future__ import unicode_literals
 from outputable import Outputable
 import blame
 import terminal
diff --git a/gitinspector/timeline.py b/gitinspector/timeline.py
index 8ee7ee4..74dd812 100644
--- a/gitinspector/timeline.py
+++ b/gitinspector/timeline.py
@@ -18,6 +18,7 @@
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
+from __future__ import unicode_literals
 from outputable import Outputable
 import datetime
 import terminal
diff --git a/gitinspector/version.py b/gitinspector/version.py
index 25f78d0..7c2b57b 100644
--- a/gitinspector/version.py
+++ b/gitinspector/version.py
@@ -18,6 +18,7 @@
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
+from __future__ import unicode_literals
 
 import localization
 localization.init()