i18n: configuration fixes

pallets-eco · Apr 3, 2017 · de20eed · de20eed
1 parent 049f0a7
commit de20eed
Show file tree

Hide file tree

Showing 17 changed files with 511 additions and 430 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -59,7 +59,7 @@ deploy:
   user: jirikuncar
   password:
     secure: xzhkM+54+dmI7aFxWdMxTkHcMfOzuAxcGOpBanY367MyETtmNZUQx1VAQh5381UHiQ0+mg433srWrR4V1h0tsSB31KZAPazeh44zxpJRCv9b5Fx+46PmYW6ZpY8+vqUpFrKCcaLX5ZmEf62xXY3cvMbp0ubAURiV6N+hHyuH90w+3xucrSnFOuVHVuI3Eqp5Bz6zxEKscrIaZiT9CPh0F2jBpGZT8qXCYT1N8xeyH0SCszvKsIIoaPitpQDnoSkBfy6VHiNU6Tznseer6uLzrW80ynKu5mZwjT4mGT0j/rBUcbIpAYHajnsHXL27Gu32mli7beOkgd2vEpb14x5JygkPoYoUnSJlwhRUgAkNZVR5teNOcP87wU6ZAdv1jhfuQA/NUUpZucVpzASojAxf2996krT4hjYz7KJ2z5lSOww016EZ5mxyktGF23KXH9zrCWUv24r1K9JOUH+6OuQHFF40q1YiL2ro63raUdLm/Y3DLgeO6oDXZPMI2DFdRFCSpY2sGI6ZBrU89MuCJhju5Y838hOWQS330UcA71MpcsnmSZDsJ9o+Rrty6wowOdMqx4bmrm0G8ILNK4MosO7KwXZUMj/iV4SLUQjhBLhOTS+vLO8sa7PCZssK7z8C+378Y4Q+hrfsctCCGVBgRhuIr5KSLtKeD3bObQ/4VfIdK9E=
-  distributions: "sdist bdist_wheel"
+  distributions: "compile_catalog sdist bdist_wheel"
   on:
     repo: inveniosoftware/flask-security-fork
     tags: true

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,6 +3,7 @@ include AUTHORS
 include CHANGES
 include LICENSE
 include README.rst
+include babel.ini
 include pytest.ini
 include tox.ini
 recursive-exclude tests/__pycache__ *
@@ -15,6 +16,6 @@ recursive-include docs *.rst
 recursive-include docs *.txt
 recursive-include docs Makefile
 recursive-include flask_security/templates *.*
-recursive-include flask_security/translations *
+recursive-include flask_security/translations *.po *.pot *.mo
 recursive-include tests *
 prune scripts
diff --git a/babel.ini b/babel.ini
@@ -0,0 +1,10 @@
+# Extraction from Python source files
+
+[python: **.py]
+encoding = utf-8
+
+# Extraction from Jinja2 templates
+
+[jinja2: **/templates/**.html]
+encoding = utf-8
+extensions = jinja2.ext.autoescape, jinja2.ext.with_
diff --git a/babel/babel.ini b/babel/babel.ini
diff --git a/babel/babel.sh b/babel/babel.sh
diff --git a/babel/security.pot b/babel/security.pot
diff --git a/flask_security/babel.py b/flask_security/babel.py
@@ -1,12 +1,23 @@
+# -*- coding: utf-8 -*-
+"""
+    flask_security.babel
+    ~~~~~~~~~~~~~~~~~~~~
+
+    I18N support for Flask-Security.
+"""
+
+import pkg_resources
+
 from flask_babelex import Domain
-from flask_security import translations
 from wtforms.i18n import messages_path
 
 
 class CustomDomain(Domain):
     def __init__(self):
         super(CustomDomain, self).__init__(
-            translations.__path__[0], domain='security')
+            pkg_resources.resource_filename('flask_security', 'translations'),
+            domain='flask_security'
+        )
 
 domain = CustomDomain()
 
@@ -19,7 +30,7 @@ def __init__(self):
 
 
 class Translations(object):
-    ''' Fixes WTForms translation support and uses wtforms translations '''
+    """Fixes WTForms translation support and uses wtforms translations."""
 
     def gettext(self, string):
         return wtforms_domain.gettext(string)