[Pymoul-svn] SF.net SVN: pymoul: [148] pymoul/trunk

[<ti...@us...>]

Revision: 148
          http://pymoul.svn.sourceforge.net/pymoul/?rev=148&view=rev
Author:   tiran
Date:     2007-02-06 08:53:36 -0800 (Tue, 06 Feb 2007)

Log Message:
-----------
Do not remove build dir
Fixed some typos in i18n code

Modified Paths:
--------------
    pymoul/trunk/build.bat
    pymoul/trunk/installer.bat
    pymoul/trunk/setup.py
    pymoul/trunk/src/moul/qt/i18n/__init__.py

Modified: pymoul/trunk/build.bat
===================================================================
--- pymoul/trunk/build.bat	2007-02-06 16:48:27 UTC (rev 147)
+++ pymoul/trunk/build.bat	2007-02-06 16:53:36 UTC (rev 148)
@@ -1,5 +1,4 @@
 @echo off
-rd /S /Q build
 cls
 set PYTHONPATH=src
 python setup.py py2exe

Modified: pymoul/trunk/installer.bat
===================================================================
--- pymoul/trunk/installer.bat	2007-02-06 16:48:27 UTC (rev 147)
+++ pymoul/trunk/installer.bat	2007-02-06 16:53:36 UTC (rev 148)
@@ -1,5 +1,4 @@
 @echo off
-rd /S /Q build
 cls
 set PYTHONPATH=src
 set INNOSETUP=yes

Modified: pymoul/trunk/setup.py
===================================================================
--- pymoul/trunk/setup.py	2007-02-06 16:48:27 UTC (rev 147)
+++ pymoul/trunk/setup.py	2007-02-06 16:53:36 UTC (rev 148)
@@ -60,7 +60,7 @@
     install_requires = ["pytz>=2006p",],
     data_files = [
         ('docs', list(glob('*.txt'))),
-        ('i18', list(glob('src/moul/qt/i18n/pymoul_*.*'))),
+        ('i18n', list(glob('src/moul/qt/i18n/pymoul_*.qm'))),
         ],
     package_dir = {'' : 'src'},
     packages = find_packages('src', exclude="moul.qt"),

Modified: pymoul/trunk/src/moul/qt/i18n/__init__.py
===================================================================
--- pymoul/trunk/src/moul/qt/i18n/__init__.py	2007-02-06 16:48:27 UTC (rev 147)
+++ pymoul/trunk/src/moul/qt/i18n/__init__.py	2007-02-06 16:53:36 UTC (rev 148)
@@ -56,12 +56,11 @@
     @rtype: str or None
     """
     if __FROZEN__:
-        basedir = os.path.dirname(sys.prefix)
-        qm = os.path.join(basedir, 'i18n', '%s.qm')
+        qm = os.path.join(sys.prefix, 'i18n', '%s.qm' % name)
         if os.path.isfile(qm):
             return open(qm, 'rb').read()
         else:
-            return None
+            LOG.debug("QM file not found: %s" % qm)
     else:
         return TRANSLATIONS.get(name, None)
 
@@ -92,5 +91,6 @@
         LOG.info("Loading translation %s" % longname)
 
     if qm is not None:
+        #LOG.debug("len(qm) %i" % len(qm))
         translator.load(qm, len(qm))
         app.installTranslator(translator)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.