Make loading of translator automatic.

src/libprs500/__init__.py

@@ -96,4 +96,4 @@ def set_translator():
             t = GNUTranslations(buf)
             t.install(unicode=True)
         
-    
+set_translator()   

src/libprs500/ebooks/lrf/any/convert_from.py

@@ -123,9 +123,6 @@ def process_file(path, options, logger=None):
     
 
 def main(args=sys.argv, logger=None):
-    from libprs500 import set_translator
-    set_translator()
-    
     parser = option_parser('''\
 any2lrf myfile
 

src/libprs500/ebooks/lrf/html/convert_from.py

@@ -1754,8 +1754,6 @@ def option_parser():
                     '''%prog converts mybook.html to mybook.lrf''')
 
 def main(args=sys.argv):
-    from libprs500 import set_translator
-    set_translator()        
     try:
         parser = option_parser()
         options, args = parser.parse_args(args)    

src/libprs500/ebooks/lrf/lit/convert_from.py

@@ -96,9 +96,6 @@ def process_file(path, options, logger=None):
 
 
 def main(args=sys.argv, logger=None):
-    from libprs500 import set_translator
-    set_translator()
-    
     parser = option_parser()
     options, args = parser.parse_args(args)
     if len(args) != 2:            

src/libprs500/ebooks/lrf/meta.py

@@ -596,13 +596,13 @@ def option_parser():
     parser.add_option('--author-sort', action='store', type='string', default=None,
                       dest='author_reading', help=_('Set sort key for the author'))
     parser.add_option("-c", "--category", action="store", type="string", \
-                    dest="category", help=_("The category this book belongs"+\
+                    dest="category", help=_("The category this book belongs"
                     " to. E.g.: History"))
     parser.add_option("--thumbnail", action="store", type="string", \
-                    dest="thumbnail", help=_("Path to a graphic that will be"+\
+                    dest="thumbnail", help=_("Path to a graphic that will be"
                     " set as this files' thumbnail"))
     parser.add_option("--comment", action="store", type="string", \
-                    dest="comment", help=_("Path to a txt file containing the "+\
+                    dest="comment", help=_("Path to a txt file containing the "
                     "comment to be stored in the lrf file."))
     parser.add_option("--get-thumbnail", action="store_true", \
                     dest="get_thumbnail", default=False, \
@@ -616,9 +616,6 @@ def option_parser():
 
 
 def main(args=sys.argv):
-    from libprs500 import set_translator
-    set_translator()
-    
     import os.path
     parser = option_parser()
     options, args = parser.parse_args(args)

src/libprs500/ebooks/lrf/pdf/convert_from.py

@@ -77,9 +77,6 @@ def process_file(path, options, logger=None):
 
 
 def main(args=sys.argv, logger=None):
-    from libprs500 import set_translator
-    set_translator()
-    
     parser = option_parser()
     options, args = parser.parse_args(args)
     if len(args) != 2:            

src/libprs500/ebooks/lrf/rtf/convert_from.py

@@ -100,9 +100,6 @@ def process_file(path, options, logger=None):
         shutil.rmtree(tdir)
 
 def main(args=sys.argv, logger=None):
-    from libprs500 import set_translator
-    set_translator()
-    
     parser = option_parser()
     options, args = parser.parse_args(args)
     if len(args) != 2:

src/libprs500/ebooks/lrf/txt/convert_from.py

@@ -93,9 +93,6 @@ def process_file(path, options, logger=None):
         print open(htmlfile.name, 'rb').read()        
 
 def main(args=sys.argv, logger=None):
-    from libprs500 import set_translator
-    set_translator()
-    
     parser = option_parser()    
     options, args = parser.parse_args(args)
     if len(args) != 2:

src/libprs500/ebooks/lrf/web/convert_from.py

@@ -147,9 +147,6 @@ def process_profile(args, options, logger=None):
     
 
 def main(args=sys.argv, logger=None):
-    from libprs500 import set_translator
-    set_translator()
-    
     parser = option_parser()
     options, args = parser.parse_args(args)
     if len(args) > 2:

src/libprs500/ebooks/metadata/isbndb.py

@@ -130,9 +130,6 @@ def create_books(opts, args, logger=None):
     return [ISBNDBMetadata(book) for book in fetch_metadata(url)]
 
 def main(args=sys.argv):
-    from libprs500 import set_translator
-    set_translator()
-    
     parser = option_parser()
     opts, args = parser.parse_args(args)
     if len(args) != 2:

src/libprs500/ebooks/metadata/pdf.py

@@ -46,9 +46,6 @@ def get_metadata(stream):
         
             
 def main(args=sys.argv):
-    from libprs500 import set_translator
-    set_translator()
-    
     if len(args) != 2:
         print >>sys.stderr, 'Usage: pdf-meta file.pdf'
         print >>sys.stderr, 'No filename specified.'

src/libprs500/ebooks/metadata/rtf.py

@@ -174,9 +174,6 @@ def set_metadata(stream, options):
     
 
 def main(args=sys.argv):
-    from libprs500 import set_translator
-    set_translator()
-    
     parser = get_parser('rtf')
     options, args = parser.parse_args(args)
     if len(args) != 2:

src/libprs500/gui2/__init__.py

@@ -22,7 +22,7 @@ from PyQt4.QtGui import QFileDialog, QMessageBox, QPixmap, QFileIconProvider, \
 ORG_NAME = 'KovidsBrain'
 APP_UID  = 'libprs500'
 from libprs500 import __author__, islinux
-from libprs500.gui2.translations import translations
+
 NONE = QVariant() #: Null value to return from the data function of item models
 
 BOOK_EXTENSIONS = ['lrf', 'lrx', 'rar', 'zip', 'rtf', 'lit', 'txt', 'htm', 
@@ -298,17 +298,3 @@ def pixmap_to_data(pixmap, format='JPEG'):
     buf.open(QBuffer.WriteOnly)
     pixmap.save(buf, format)
     return str(ba.data())
-
-def set_translator(app):
-    locale = QLocale.system().language()
-    locale = 'test'
-    if translations.has_key(locale):
-        data = translations[locale]
-        t = QTranslator()
-        open('yay.qm', 'wb').write(data)
-        t.load('yay.qm')
-        print t.isEmpty()
-        app.installTranslator(t)
-        os.unlink('yay.qm')
-    
-            

src/libprs500/gui2/lrf_renderer/main.py

@@ -282,8 +282,6 @@ def normalize_settings(parser, opts):
     
 
 def main(args=sys.argv, logger=None):
-    from libprs500 import set_translator
-    set_translator()
     parser = option_parser()
     opts, args = parser.parse_args(args)
     if hasattr(opts, 'help'):

src/libprs500/gui2/main.py

@@ -20,7 +20,7 @@ from PyQt4.QtGui import QPixmap, QColor, QPainter, QMenu, QIcon, QMessageBox, \
                         QToolButton, QDialog
 from PyQt4.QtSvg import QSvgRenderer
 
-from libprs500 import __version__, __appname__, islinux, set_translator
+from libprs500 import __version__, __appname__, islinux
 from libprs500.ptempfile import PersistentTemporaryFile
 from libprs500.ebooks.metadata.meta import get_metadata
 from libprs500.ebooks.lrf.web.convert_from import main as web2lrf
@@ -716,7 +716,6 @@ class Main(MainWindow, Ui_MainWindow):
     
 
 def main(args=sys.argv):
-    set_translator()
     from PyQt4.Qt import QApplication
     pid = os.fork() if islinux else -1
     if pid <= 0:
@@ -726,7 +725,7 @@ def main(args=sys.argv):
         initialize_file_icon_provider()
         try:
             main = Main()
-        except DatabaseLocked, err:
+        except DatabaseLocked:
             QMessageBox.critical(None, 'Cannot Start '+__appname__, 
             'Another program is using the database. Perhaps %s is already running?'%(__appname__,))
             return 1