File tree Expand file tree Collapse file tree 2 files changed +9
-2
lines changed
cms/djangoapps/contentstore Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change 25
25
from common .djangoapps .util .json_request import JsonResponse
26
26
from openedx .core .djangoapps .contentserver .caching import del_cached_content
27
27
from openedx .core .djangoapps .site_configuration import helpers as configuration_helpers
28
+ from openedx .core .djangoapps .user_api .models import UserPreference
28
29
from openedx_filters .content_authoring .filters import LMSPageURLRequested
29
30
from xmodule .contentstore .content import StaticContent # lint-amnesty, pylint: disable=wrong-import-order
30
31
from xmodule .contentstore .django import contentstore # lint-amnesty, pylint: disable=wrong-import-order
@@ -194,7 +195,9 @@ def _assets_json(request, course_key):
194
195
'''
195
196
request_options = _parse_request_to_dictionary (request )
196
197
197
- filter_parameters = {}
198
+ filter_parameters = {
199
+ 'user_language' : UserPreference .get_value (request .user , 'pref-lang' ) or 'en' ,
200
+ }
198
201
199
202
if request_options ['requested_asset_type' ]:
200
203
filters_are_invalid_error = _get_error_if_invalid_parameters (request_options ['requested_asset_type' ])
Original file line number Diff line number Diff line change @@ -311,7 +311,9 @@ def _get_all_content_for_course(self,
311
311
md5: An md5 hash of the asset content
312
312
'''
313
313
query = query_for_course (course_key , 'asset' if not get_thumbnails else 'thumbnail' )
314
+ user_language = 'en'
314
315
if filter_params :
316
+ user_language = filter_params .pop ('user_language' , 'en' )
315
317
query .update (filter_params )
316
318
317
319
# Count total matching documents
@@ -335,7 +337,9 @@ def _get_all_content_for_course(self,
335
337
'thumbnail_location' : 1 ,
336
338
'md5' : 1
337
339
})
338
- cursor = cursor .sort ('displayname' , sort ['displayname' ]).collation ({'locale' : 'en' , 'strength' : 2 })
340
+ cursor = cursor .sort ('displayname' , sort ['displayname' ]).collation (
341
+ {'locale' : user_language , 'strength' : 2 }
342
+ )
339
343
else :
340
344
# Apply simple sorting
341
345
sort_list = list (sort .items ())
You can’t perform that action at this time.
0 commit comments