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

Merge pull request #9061 from edx/peter-fogg/i18n-cleanup

Browse Source 
Convert to named arguments for localized strings.
This commit is contained in:
Peter Fogg
2015-07-24 16:08:40 -04:00
parent 09b352cca3 4b0c3be75c
commit 454a0adab1
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/djangoapps/student/views.py
View File

@@ -663,8 +663,8 @@ def dashboard(request):
)
if 'notlive' in request.GET:
redirect_message = _("The course you are looking for does not start until {0}.").format(
request.GET['notlive']
redirect_message = _("The course you are looking for does not start until {date}.").format(
date=request.GET['notlive']
)
else:
redirect_message = ''

16
lms/djangoapps/teams/views.py
View File

@@ -313,8 +313,12 @@ class TeamsListView(ExpandableFieldViewMixin, GenericAPIView):
)
else:
return Response({
'developer_message': "unsupported order_by value {}".format(order_by_input),
'user_message': _(u"The ordering {} is not supported").format(order_by_input),
'developer_message': "unsupported order_by value {ordering}".format(ordering=order_by_input),
# Translators: 'ordering' is a string describing a way
# of ordering a list. For example, {ordering} may be
# 'name', indicating that the user wants to sort the
# list by lower case name.
'user_message': _(u"The ordering {ordering} is not supported").format(ordering=order_by_input),
}, status=status.HTTP_400_BAD_REQUEST)
queryset = queryset.order_by(order_by_field)
@@ -557,8 +561,12 @@ class TopicListView(GenericAPIView):
topics = get_ordered_topics(course_module, ordering)
else:
return Response({
'developer_message': "unsupported order_by value {}".format(ordering),
'user_message': _(u"The ordering {} is not supported").format(ordering),
'developer_message': "unsupported order_by value {ordering}".format(ordering=ordering),
# Translators: 'ordering' is a string describing a way
# of ordering a list. For example, {ordering} may be
# 'name', indicating that the user wants to sort the
# list by lower case name.
'user_message': _(u"The ordering {ordering} is not supported").format(ordering=ordering),
}, status=status.HTTP_400_BAD_REQUEST)
page = self.paginate_queryset(topics)