localization issues

bin/uberwriter

@@ -20,16 +20,22 @@
 import sys
 import os
 
+import gettext
 import locale
-locale.textdomain('uberwriter')
 
 # Add project root directory (enable symlink and trunk execution)
 PROJECT_ROOT_DIRECTORY = os.path.abspath(
     os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
 
+# L10n
+
+gettext.textdomain('uberwriter')
+gettext.bindtextdomain('uberwriter', PROJECT_ROOT_DIRECTORY + '/po')
+print(PROJECT_ROOT_DIRECTORY + '/po')
+
 python_path = []
 if os.path.abspath(__file__).startswith('/opt'):
-    locale.bindtextdomain('uberwriter', '/opt/extras.ubuntu.com/uberwriter/share/locale')
+    gettext.bindtextdomain('uberwriter', '/opt/extras.ubuntu.com/uberwriter/share/locale')
     syspath = sys.path[:] # copy to avoid infinite loop in pending objects
     for path in syspath:
         opt_path = path.replace('/usr', '/opt/extras.ubuntu.com/uberwriter')

uberwriter/FormatShortcuts.py

@@ -22,7 +22,7 @@ from gi.repository import Gtk, Gdk # pylint: disable=E0611
 from gi.repository import Pango # pylint: disable=E0611
 
 gettext.textdomain('uberwriter')
-gettext.bindtextdomain('uberwriter', 'po')
+#gettext.bindtextdomain('uberwriter', 'po')
 _ = gettext.gettext
 
 

uberwriter/UberwriterAdvancedExportDialog.py

@@ -20,7 +20,7 @@ import subprocess
 import gettext
 
 gettext.textdomain('uberwriter')
-gettext.bindtextdomain('uberwriter', 'po')
+#gettext.bindtextdomain('uberwriter', 'po')
 _ = gettext.gettext
 
 import logging

uberwriter/UberwriterInlinePreview.py

@@ -34,7 +34,7 @@ from .FixTable import FixTable
 from .MarkupBuffer import MarkupBuffer
 
 gettext.textdomain('uberwriter')
-gettext.bindtextdomain('uberwriter', 'po')
+#gettext.bindtextdomain('uberwriter', 'po')
 _ = gettext.gettext
 
 import logging

uberwriter/UberwriterWindow.py

@@ -15,6 +15,7 @@
 ### END LICENSE
 
 import gettext
+import locale
 import subprocess
 import os
 import codecs
@@ -47,14 +48,12 @@ logger = logging.getLogger('uberwriter')
 
 # Spellcheck
 
-import locale
-
 from uberwriter_lib.gtkspellcheck import SpellChecker
 
 # L10n
 
 gettext.textdomain('uberwriter')
-gettext.bindtextdomain('uberwriter', 'po')
+#gettext.bindtextdomain('uberwriter', 'po')
 _ = gettext.gettext
 
 try:

uberwriter/__init__.py

@@ -20,7 +20,7 @@ import os
 
 import gettext
 gettext.textdomain('uberwriter')
-gettext.bindtextdomain('uberwriter', 'po')
+#gettext.bindtextdomain('uberwriter', 'po')
 _ = gettext.gettext
 
 import gi

uberwriter_lib/helpers.py

@@ -25,6 +25,9 @@ from . Builder import Builder
 
 import locale
 import gettext
+
+
+
 locale.textdomain('uberwriter')
 locale.bindtextdomain('uberwriter', 'po')
 _ = gettext.gettext