Merge branch '2375-demo-theme-development' into 2618-nested-resources

ckan · Aug 7, 2012 · 1ec5a2b · 1ec5a2b
2 parents a995360 + 5b028ea
commit 1ec5a2b
Show file tree

Hide file tree

Showing 49 changed files with 1,942 additions and 481 deletions.
diff --git a/ckan/controllers/api.py b/ckan/controllers/api.py
@@ -762,6 +762,7 @@ def i18n_js_translations(self, lang):
         ckan_path = os.path.join(os.path.dirname(__file__), '..')
         source = os.path.abspath(os.path.join(ckan_path, 'public',
                                     'base', 'i18n', '%s.js' % lang))
+        response.headers['Content-Type'] = CONTENT_TYPES['json']
         if not os.path.exists(source):
             return '{}'
         f = open(source, 'r')