Merge 1d2c5e7 into 530288d

orcid_hub/__init__.py

@@ -135,6 +135,7 @@ def default(self, o):
         return super().default(o)
 
 
+app.config["JSON_AS_ASCII"] = False
 app.json_encoder = JSONEncoder
 
 

orcid_hub/utils.py

@@ -2517,7 +2517,7 @@ def dump_yaml(data):
     """Dump the objects into YAML representation."""
     yaml.add_representer(datetime, SafeRepresenterWithISODate.represent_datetime, Dumper=Dumper)
     yaml.add_representer(defaultdict, SafeRepresenter.represent_dict)
-    return yaml.dump(data)
+    return yaml.dump(data, allow_unicode=True)
 
 
 def enqueue_user_records(user):

orcid_hub/views.py

@@ -1128,8 +1128,13 @@ def _export_tablib(self, export_type, return_url):
 
         try:
             try:
-                ds.yaml = yaml.safe_dump(json.loads(ds.json.replace("]\\", "]").replace("\\n", " ")))
-                response_data = ds.export(format=export_type)
+                if export_type == 'json':
+                    response_data = json.dumps(json.loads(ds.json), ensure_ascii=False)
+                elif export_type == 'yaml':
+                    response_data = yaml.safe_dump(json.loads(ds.json.replace("]\\", "]").replace("\\n", " ")),
+                                                   allow_unicode=True)
+                else:
+                    response_data = ds.export(format=export_type)
             except AttributeError:
                 response_data = getattr(ds, export_type)
         except (AttributeError, tablib.UnsupportedFormat):
@@ -1618,7 +1623,7 @@ class AffiliationRecordAdmin(CompositeRecordModelView):
         "start_date",
         "end_date",
         "city",
-        "state",
+        "region",
         "country",
         "disambiguated_id",
         "disambiguation_source",