From: Marcin Koziej <marcin@lolownia.org>
Date: Mon, 21 May 2012 09:39:49 +0000 (+0200)
Subject: Merge branch 'mass_edit'
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/c4599df2f08c95fd317967746a3325c3b168acdd?hp=a65e6811fed4529789f3c72e2f4d56b81fb71526

Merge branch 'mass_edit'
---

diff --git a/apps/catalogue/tests/files/chunk1.xml b/apps/catalogue/tests/files/chunk1.xml
index 8497f606..6a75580a 100755
--- 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 ccbeefbb..ff225a03 100755
--- 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 1a74c7b9..919b0b96 100755
--- 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 }}