Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add better formatting for multilingual titles #1164

Merged
merged 1 commit into from
May 24, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions lti_tool/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from exercise.viewbase import ExerciseBaseView
from exercise.models import LearningObject, BaseExercise
from exercise.views import ExerciseView, SubmissionView
from lib.localization_syntax import pick_localized
from lib.viewbase import BaseTemplateView, BaseRedirectView, BaseMixin
from authorization.permissions import ACCESS
from .utils import get_tool_conf, get_launch_data_storage, get_launch_url
Expand Down Expand Up @@ -257,7 +258,7 @@ def post(self, request, *args, **kwargs):
lineitem_exists = bool([li for li in lineitems if li['tag'] == str(e.id)])
if e.max_points > 0 and not lineitem_exists:
li = LineItem()
li.set_tag(str(e.id)).set_score_maximum(e.max_points).set_label(str(e))
li.set_tag(str(e.id)).set_score_maximum(e.max_points).set_label(pick_localized(str(e), 'en'))
ags.find_or_create_lineitem(li)

# Send activity settings
Expand All @@ -268,7 +269,7 @@ def post(self, request, *args, **kwargs):
"course_slug": kwargs['course_slug'],
"instance_slug": kwargs['instance_slug']
})
.set_title("{}: {}".format(self.course.name, self.instance.instance_name)))
.set_title("{}: {}".format(pick_localized(self.course.name, 'en'), pick_localized(self.instance.instance_name, 'en'))))
return HttpResponse(deep_link.output_response_form([resource]))

# Get list of modules in course
Expand All @@ -291,7 +292,7 @@ def post(self, request, *args, **kwargs):
lineitem_exists = bool([li for li in lineitems if li['tag'] == str(e.id)])
if e.max_points > 0 and not lineitem_exists:
li = LineItem()
li.set_tag(str(e.id)).set_score_maximum(e.max_points).set_label(str(e))
li.set_tag(str(e.id)).set_score_maximum(e.max_points).set_label(pick_localized(str(e), 'en'))
ags.find_or_create_lineitem(li)

# Send activity settings
Expand All @@ -303,7 +304,7 @@ def post(self, request, *args, **kwargs):
"instance_slug": kwargs['instance_slug'],
"module_slug": kwargs['module_slug']
})
.set_title(str(self.module)))
.set_title(pick_localized(str(self.module), 'en')))
return HttpResponse(deep_link.output_response_form([resource]))

# Get list of exercises in module
Expand All @@ -329,15 +330,15 @@ def post(self, request, *args, **kwargs):
for e in children:
if e.max_points > 0:
li = LineItem()
li.set_tag(str(e.id)).set_score_maximum(e.max_points).set_label(str(e))
li.set_tag(str(e.id)).set_score_maximum(e.max_points).set_label(pick_localized(str(e), 'en'))
ags.find_or_create_lineitem(li)
else:
try:
if self.exercise.max_points > 0:
li = LineItem()
(li.set_tag(str(self.exercise.id))
.set_score_maximum(self.exercise.max_points)
.set_label(str(self.exercise)))
.set_label(pick_localized(str(self.exercise), 'en')))
ags.find_or_create_lineitem(li)
except AttributeError as e:
logger.info("Importing LTI exercise with no max_points attribute")
Expand All @@ -352,5 +353,5 @@ def post(self, request, *args, **kwargs):
"module_slug": kwargs['module_slug'],
"exercise_path": kwargs['exercise_path']
})
.set_title(str(self.exercise)))
.set_title(pick_localized(str(self.exercise), 'en')))
return HttpResponse(deep_link.output_response_form([resource]))