Merge pull request #3875 from louyihua/translation-fix

i18n: Make values that has 'display_name' be displayed localized in editor

common/lib/xmodule/xmodule/x_module.py

@@ -756,8 +756,11 @@ class XModuleDescriptor(XModuleMixin, HTMLSnippet, ResourceTemplates, XBlock):
         Can be limited by extending `non_editable_metadata_fields`.
         """
         def jsonify_value(field, json_choice):
-            if isinstance(json_choice, dict) and 'value' in json_choice:
+            if isinstance(json_choice, dict):
                 json_choice = dict(json_choice)  # make a copy so below doesn't change the original
+                if 'display_name' in json_choice:
+                    json_choice['display_name'] = get_text(json_choice['display_name'])
+                if 'value' in json_choice:
                     json_choice['value'] = field.to_json(json_choice['value'])
             else:
                 json_choice = field.to_json(json_choice)