Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3875 from louyihua/translation-fix

Browse Source 
i18n: Make values that has 'display_name' be displayed localized in editor
This commit is contained in:
Andy Armstrong
2014-05-28 10:59:04 -04:00
parent 58198b91d4 f048a58408
commit 9148d2e1ff
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/lib/xmodule/xmodule/x_module.py
View File

@@ -756,9 +756,12 @@ 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
json_choice['value'] = field.to_json(json_choice['value'])
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)
return json_choice