fix missing brushsettings translation

we need to initialize gettext before importing brushsettings.py

diff --git a/gui/brushsettingswindow.py b/gui/brushsettingswindow.py
index 1ba17e9..021694a 100644 (file)
--- a/gui/brushsettingswindow.py
+++ b/gui/brushsettingswindow.py
@@ -10,7 +10,7 @@
 from gettext import gettext as _
 import gtk
 import functionwindow
-from lib import brushsettings
+from brushlib import brushsettings
 from lib import command
 
 class Window(gtk.Window):

diff --git a/gui/functionwindow.py b/gui/functionwindow.py
index 31b8be1..9a0c2d2 100644 (file)
--- a/gui/functionwindow.py
+++ b/gui/functionwindow.py
@@ -9,7 +9,7 @@
 "window to model a single brush property function"
 from gettext import gettext as _
 import gtk
-from lib import brushsettings
+from brushlib import brushsettings
 
 class Window(gtk.Window):
     def __init__(self, app, setting, adj):

diff --git a/gui/main.py b/gui/main.py
index dc35e89..ce4c8bc 100644 (file)
--- a/gui/main.py
+++ b/gui/main.py
@@ -12,16 +12,13 @@ from gui import application
 from optparse import OptionParser
 
 # main entry, called from the "mypaint" script
-def main(datapath, confpath, localepath):
+def main(datapath, confpath):
 
     parser = OptionParser('usage: %prog [options] [FILE]')
     parser.add_option('-c', '--config', metavar='DIR', default=confpath,
                     help='use this config directory instead of ~/.mypaint/')
     options, args = parser.parse_args()
 
-    gettext.bindtextdomain("mypaint", localepath)
-    gettext.textdomain("mypaint")
-
     print 'confpath =', options.config
     app = application.Application(datapath, options.config, args)
 

diff --git a/lib/__init__.py b/lib/__init__.py
index ba103bc..e69de29 100644 (file)
--- a/lib/__init__.py
+++ b/lib/__init__.py
@@ -1 +0,0 @@
-from brushlib import brushsettings

diff --git a/mypaint.py b/mypaint.py
index 1899909..aeafa44 100644 (file)
--- a/mypaint.py
+++ b/mypaint.py
@@ -80,6 +80,14 @@ if __name__ == '__main__':
         psyco_opt()
     except ImportError:
         pass
-    paths = get_paths()
+
+    datapath, confpath, localepath = get_paths()
+
+    # must be done before importing any translated python modules
+    # (to get global strings translated, especially brushsettings.py)
+    import gettext
+    gettext.bindtextdomain("mypaint", localepath)
+    gettext.textdomain("mypaint")
+
     from gui import main
-    main.main(*paths)
+    main.main(datapath, confpath)