Merge remote-tracking branch 'ykhadilkar-rei/Release-1.19' into inven…

…tory Conflicts: ckanext/datajson/plugin.py
GSA · May 29, 2014 · 5d8dff8 · 5d8dff8
2 parents 04ccc5a + e1ec19d
commit 5d8dff8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ckanext/datajson/plugin.py b/ckanext/datajson/plugin.py
@@ -298,7 +298,7 @@ def write_zip(data, error=None, zip_name='data'):
 
     #Write the data file
     if data:
-        zf.writestr('data.json', json.dumps(data).encode('utf8'))
+        zf.writestr('datajson.txt', json.dumps(data, ensure_ascii=False).encode('utf8'))
 
     #Write the error log
     if error: