Merge branch 'master' into api

weblate/html/translation-download.html

@@ -2,6 +2,7 @@
 
 <li><a href="{% url 'download_translation' project=object.subproject.project.slug subproject=object.subproject.slug lang=object.language.code %}" title="{% trans "Download for an offline translation." %}">{% trans "Download original translation file" %}</a></li>
 <li><a href="{% url 'download_translation_format' project=object.subproject.project.slug subproject=object.subproject.slug lang=object.language.code fmt='xliff'%}" title="{% trans "Download for an offline translation." %}">{% trans "Download translation as XLIFF" %}</a></li>
+<li><a href="{% url 'download_translation_format' project=object.subproject.project.slug subproject=object.subproject.slug lang=object.language.code fmt='xliff12'%}" title="{% trans "Download for an offline translation." %}">{% trans "Download translation as XLIFF 1.2" %}</a></li>
 <li><a href="{% url 'download_translation_format' project=object.subproject.project.slug subproject=object.subproject.slug lang=object.language.code fmt='po'%}" title="{% trans "Download for an offline translation." %}">{% trans "Download translation as Gettext PO" %}</a></li>
 {% if object.supports_language_pack %}
 <li><a href="{% url 'download_language_pack' project=object.subproject.project.slug subproject=object.subproject.slug lang=object.language.code %}" title="{% trans "Download for using within an application." %}">{% trans "Download compiled translation" %}</a></li>

weblate/trans/exporters.py

@@ -24,6 +24,7 @@ from django.http import HttpResponse
 
 from translate.misc.multistring import multistring
 from translate.storage.po import pofile
+from translate.storage.poxliff import PoXliffFile
 from translate.storage.xliff import xlifffile
 from translate.storage.tbx import tbxfile
 
@@ -140,12 +141,23 @@ class PoExporter(BaseExporter):
 
 
 @register_exporter
-class XliffExporter(BaseExporter):
+class PoXliffExporter(BaseExporter):
     name = 'xliff'
     content_type = 'application/x-xliff+xml'
     extension = 'xlf'
     has_lang = True
 
+    def get_storage(self):
+        return PoXliffFile()
+
+
+@register_exporter
+class XliffExporter(BaseExporter):
+    name = 'xliff12'
+    content_type = 'application/x-xliff+xml'
+    extension = 'xlf'
+    has_lang = True
+
     def get_storage(self):
         return xlifffile()
 

weblate/trans/mixins.py

@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import unicode_literals
+
 import os
 
 from django.core.urlresolvers import reverse

weblate/trans/tests/test_files.py

@@ -398,6 +398,12 @@ class ExportTest(ViewTestCase):
             response, 'Orangutan has %d banana'
         )
 
+    def test_export_xliff(self):
+        response = self.export_format('xliff12')
+        self.assertContains(
+            response, 'Orangutan has %d banana'
+        )
+
     def test_export_invalid(self):
         response = self.export_format('invalid')
         self.assertEqual(response.status_code, 404)

weblate/urls.py

@@ -191,7 +191,7 @@ urlpatterns = [
         name='download_translation',
     ),
     url(
-        r'^download/' + TRANSLATION + '(?P<fmt>[a-z]+)/$',
+        r'^download/' + TRANSLATION + '(?P<fmt>[a-z0-9]+)/$',
         weblate.trans.views.files.download_translation_format,
         name='download_translation_format',
     ),