Merge pull request #3 from EnTeQuAk/master

Tests, cleanups, management command for compile and makemessages

Author: graingert

.travis.yml

@@ -1,9 +1,15 @@
 language: python
 python: 2.7
 env:
+  - TOX_ENV=py33-master
   - TOX_ENV=py33-1.7.x
   - TOX_ENV=py33-1.6.x
   - TOX_ENV=py33-1.5.x
+  - TOX_ENV=pypy-master
+  - TOX_ENV=pypy-1.7.x
+  - TOX_ENV=pypy-1.6.x
+  - TOX_ENV=pypy-1.5.x
+  - TOX_ENV=py27-master
   - TOX_ENV=py27-1.7.x
   - TOX_ENV=py27-1.6.x
   - TOX_ENV=py27-1.5.x

AUTHORS

@@ -10,6 +10,7 @@ Contributors:
 - Thomas Grainger <tagrain@gmail.com>
 - Christopher Grebs <cg@webshox.org>
 
+
 django-babel was previously developed under the Copyright of Edgewall Software.
 The following copyright notice holds true for releases before 2013: "Copyright
 (c) 2007 - 2011 by Edgewall Software"

CHANGELOG.rst

@@ -0,0 +1,33 @@
+Changelog
+=========
+
+0.4 - `master`_
+---------------
+
+.. note:: This version is not yet released and is under active development.
+
+* Initial testing infrastructure
+* Add management command `babel` with `makemessages` and `compilemessages`
+  labels. Mimics django's `makemessages` and `compilemessages` commands.
+
+
+0.3.1 - 2013-12-11
+------------------
+
+* fix relative import in template tags
+
+
+0.3.0 - 2013-12-11
+------------------
+
+* Rename package to django_babel
+
+
+0.2.3 - 2013-12-11
+------------------
+
+* Rename package on PyPI
+* Use GitHub as source control
+
+
+.. _`master`: https://github.com/graingert/django-babel

CHANGES.rst

@@ -47,6 +47,7 @@ def extract_django(fileobj, keywords, comment_tags, options):
                             None,
                             smart_unicode(u''.join(singular)),
                             [])
+
                     intrans = False
                     inplural = False
                     singular = []

django_babel/extract.py

@@ -0,0 +1,93 @@
+#-*- coding: utf-8 -*-
+import os
+from distutils.dist import Distribution
+from optparse import make_option
+from subprocess import call
+
+from django.core.management.base import LabelCommand, CommandError
+from django.conf import settings
+
+
+class Command(LabelCommand):
+
+    args = '[makemessages] [compilemessages]'
+
+    option_list = LabelCommand.option_list + (
+        make_option(
+            '--locale', '-l',
+            default=None, dest='locale', action='append',
+            help='Creates or updates the message files for the given locale(s)'
+                 ' (e.g pt_BR). Can be used multiple times.'),
+        make_option('--domain', '-d',
+            default='django', dest='domain',
+            help='The domain of the message files (default: "django").'),
+        make_option('--mapping-file', '-F',
+            default=None, dest='mapping_file',
+            help='Mapping file')
+    )
+
+    def handle_label(self, command, **options):
+        if command not in ('makemessages', 'compilemessages'):
+            raise CommandError(
+                "You must either apply 'makemessages' or 'compilemessages'"
+            )
+
+        if command == 'makemessages':
+            self.handle_makemessages(**options)
+        if command == 'compilemessages':
+            self.handle_compilemessages(**options)
+
+    def handle_makemessages(self, **options):
+        locale_paths = list(settings.LOCALE_PATHS)
+        domain = options.pop('domain')
+        locales = options.pop('locale')
+
+        # support for mapping file specification via setup.cfg
+        # TODO: Try to support all possible options.
+        distribution = Distribution()
+        distribution.parse_config_files(distribution.find_config_files())
+
+        mapping_file = options.pop('mapping_file', None)
+        has_extract = 'extract_messages' in distribution.command_options
+        if mapping_file is None and has_extract:
+            opts = distribution.command_options['extract_messages']
+            try:
+                mapping_file = opts['mapping_file'][1]
+            except (IndexError, KeyError):
+                mapping_file = None
+
+        for path in locale_paths:
+            potfile = os.path.join(path, '%s.pot' % domain)
+            if not os.path.exists(potfile):
+                continue
+
+            cmd = ['pybabel', 'extract', '-o', potfile]
+
+            if mapping_file is not None:
+                cmd.extend(['-F', mapping_file])
+
+            cmd.append(os.path.dirname(os.path.relpath(path)))
+
+            call(cmd)
+
+            for locale in locales:
+                cmd = ['pybabel', 'update', '-D', domain,
+                       '-i', potfile,
+                       '-d', os.path.relpath(path),
+                       '-l', locale]
+                call(cmd)
+
+    def handle_compilemessages(self, **options):
+        locale_paths = list(settings.LOCALE_PATHS)
+        domain = options.pop('domain')
+        locales = options.pop('locale')
+
+        for path in locale_paths:
+            for locale in locales:
+                po_file = os.path.join(
+                    path, locale, 'LC_MESSAGES', domain + '.po'
+                )
+                if os.path.exists(po_file):
+                    cmd = ['pybabel', 'compile', '-D', domain,
+                           '-d', path, '-l', locale]
+                    call(cmd)

django_babel/management/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # django-babel documentation build configuration file, created by

django_babel/management/commands/__init__.py

@@ -0,0 +1,18 @@
+[pytest]
+addopts=-vs --pep8 --flakes
+timeout=5
+norecursedirs=.tox
+pep8ignore =
+    *.py E128
+    docs/conf.py ALL
+    tests/*.py ALL
+flakes-ignore =
+    docs/conf.py ALL
+    tests/*.py ALL
+
+[flake8]
+ignore = E128
+exclude = .tox,.git,docs/conf.py,tests/*.py
+
+[wheel]
+universal = 1