Release 3

[packages/calibre.git] / calibre-locales.patch

diff --git a/calibre-locales.patch b/calibre-locales.patch
index 4476da566a5a5b21de020b316c2538878ac383dd..6e6b41d9db32677eac697c387a9ab69f974b75f9 100644 (file)
--- 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
-@@ -49,20 +49,20 @@
+--- calibre/src/calibre/utils/localization.py.old      2012-10-28 22:07:25.481983550 +0100
++++ calibre/src/calibre/utils/localization.py  2012-10-28 22:12:17.250402847 +0100
+@@ -73,20 +73,20 @@ def get_lang():
          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
@@ -13,7 +13,7 @@
 -        if lang in available_translations():
 -            hlang = lang
 -        else:
--            xlang = lang.split('_')[0]
+-            xlang = lang.split('_')[0].lower()
 -            if xlang in available_translations():
 -                hlang = xlang
 -    return hlang
@@ -33,7 +33,7 @@
  
  def set_translators():
      # To test different translations invoke as
-@@ -84,18 +84,12 @@
+@@ -110,18 +110,12 @@ def set_translators():
                  buf = cStringIO.StringIO(buf.getvalue())
  
          if mpath is not None:
@@ -56,8 +56,8 @@
 +            if os.path.exists(isof):
 +                iso639 = open(isof, 'rb')
  
-         t = None
          if buf is not None:
+             t = GNUTranslations(buf)
 --- 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
 @@ -5,10 +5,10 @@
@@ -115,11 +115,18 @@
              iscpo = {'bn':'bn_IN', 'zh_HK':'zh_CN'}.get(locale, locale)
              iso639 = self.j(self.d(self.SRC), 'setup', 'iso_639',
                      '%s.po'%iscpo)
-@@ -155,16 +156,6 @@
+@@ -155,7 +156,6 @@
                  self.warn('No ISO 639 translations for locale:', locale)
  
          self.write_stats()
 -        self.freeze_locales()
+ 
+     def check_iso639(self, path):
+         from calibre.utils.localization import langnames_to_langcodes
+@@ -165,15 +166,6 @@
+                             os.path.basename(path), msgstr, msgid, rmap[msgstr]))
+                     # raise SystemExit(1)
+                 rmap[msgstr] = msgid
 -
 -    def freeze_locales(self):
 -        zf = self.DEST + '.zip'