From: lisu <lisu@pld-linux.org>
Date: Tue, 24 Jan 2012 20:05:16 +0000 (+0000)
Subject: - try to fix locales
X-Git-Tag: auto/th/calibre-0_8_36-1~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcalibre.git;a=commitdiff_plain;h=88d8b68634a10882e095d939560210e0b6199567

- try to fix locales

Changed files:
    calibre-locales.patch -> 1.9
---

diff --git a/calibre-locales.patch b/calibre-locales.patch
index 4476da5..a15bd92 100644
--- a/calibre-locales.patch
+++ b/calibre-locales.patch
@@ -1,11 +1,11 @@
---- calibre/src/calibre/utils/localization.py~	2012-01-13 05:32:13.000000000 +0100
-+++ calibre/src/calibre/utils/localization.py	2012-01-17 09:35:01.311333439 +0100
+--- calibre/src/calibre/utils/localization.py~  2012-01-20 05:44:58.000000000 +0100
++++ calibre/src/calibre/utils/localization.py   2012-01-24 20:40:09.619382280 +0100
 @@ -49,20 +49,20 @@
          lang = 'en'
      return lang
- 
-+    def messages_path(lang):
-+        return ('/usr/share/locale/%s/LC_MESSAGES'%lang)
+
++def messages_path(lang):
++    return ('/usr/share/locale/%s/LC_MESSAGES'%lang)
 +
  def get_lc_messages_path(lang):
      hlang = None
@@ -27,15 +27,15 @@
 +        xlang = lang.split('_')[0]
 +        if xlang in available_translations():
 +            hlang = xlang
-+        if hlang is not None:
-+            return messages_path(hlang)
-+        return None
- 
++    if hlang is not None:
++            if hlang is not None:
++    return None
+
  def set_translators():
      # To test different translations invoke as
 @@ -84,18 +84,12 @@
                  buf = cStringIO.StringIO(buf.getvalue())
- 
+
          if mpath is not None:
 -            from zipfile import ZipFile
 -            with ZipFile(P('localization/locales.zip',
@@ -53,13 +53,13 @@
 +                buf = open(os.path.join(mpath, 'calibre.mo'), 'rb')
 +            mpath = mpath.replace(os.sep+'nds'+os.sep, os.sep+'de'+os.sep)
 +            isof = os.path.join(mpath, 'calibre_iso639.mo')
-+            if os.path.exists(isof):
++            isof = os.path.join(mpath, 'calibre_iso639.mo')
 +                iso639 = open(isof, 'rb')
- 
+
          t = None
          if buf is not None:
---- calibre/src/calibre/translations/dynamic.py.orig    2012-01-13 05:32:13.000000000 +0100
-+++ calibre/src/calibre/translations/dynamic.py 2012-01-17 09:37:53.594649557 +0100
+--- calibre/src/calibre/translations/dynamic.py.orig    2012-01-20 05:44:58.000000000 +0100
++++ calibre/src/calibre/translations/dynamic.py 2012-01-24 20:58:25.892606042 +0100
 @@ -5,10 +5,10 @@
  __license__   = 'GPL v3'
  __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'