Merge branch 'mass_edit'

diff --git a/apps/catalogue/tests/files/chunk1.xml b/apps/catalogue/tests/files/chunk1.xml
index 8497f60..6a75580 100755 (executable)
--- a/apps/catalogue/tests/files/chunk1.xml
+++ b/apps/catalogue/tests/files/chunk1.xml
@@ -20,6 +20,7 @@
 <dc:type xml:lang="pl" xmlns:dc="http://purl.org/dc/elements/1.1/">text</dc:type>
 <dc:type xml:lang="en" xmlns:dc="http://purl.org/dc/elements/1.1/">text</dc:type>
 <dc:date xml:lang="pl" xmlns:dc="http://purl.org/dc/elements/1.1/">2007-09-06</dc:date>
+<dc:language xml:lang="pl" xmlns:dc="http://purl.org/dc/elements/1.1/">pol</dc:language>
 
 </rdf:Description>
 </rdf:RDF>

diff --git a/apps/catalogue/tests/files/expected.xml b/apps/catalogue/tests/files/expected.xml
index ccbeefb..ff225a0 100755 (executable)
--- a/apps/catalogue/tests/files/expected.xml
+++ b/apps/catalogue/tests/files/expected.xml
@@ -20,6 +20,7 @@
 <dc:type xml:lang="pl" xmlns:dc="http://purl.org/dc/elements/1.1/">text</dc:type>
 <dc:type xml:lang="en" xmlns:dc="http://purl.org/dc/elements/1.1/">text</dc:type>
 <dc:date xml:lang="pl" xmlns:dc="http://purl.org/dc/elements/1.1/">2007-09-06</dc:date>
+<dc:language xml:lang="pl" xmlns:dc="http://purl.org/dc/elements/1.1/">pol</dc:language>
 
 </rdf:Description>
 </rdf:RDF>

diff --git a/apps/wiki/templates/admin/wiki/theme/change_list.html b/apps/wiki/templates/admin/wiki/theme/change_list.html
index 1a74c7b..919b0b9 100755 (executable)
--- a/apps/wiki/templates/admin/wiki/theme/change_list.html
+++ b/apps/wiki/templates/admin/wiki/theme/change_list.html
@@ -1,4 +1,5 @@
 {% extends "admin/change_list.html" %}
+{% load i18n %}
 
 {% block extrahead %}
 {{ block.super }}