Merge pull request #230 from open-craft/giovanni/fal-2742-fix-truncated-title

giovannicimolin · web-flow · commit f96d560cb320 · 2022-02-02T12:15:38.000-03:00
fix: Fix quote rendering on LTI 1.1 form
diff --git a/README.rst b/README.rst
@@ -367,6 +367,13 @@ Changelog
 
 Please See the [releases tab](https://github.com/edx/xblock-lti-consumer/releases) for the complete changelog.
 
+3.4.2 - 2022-02-01
+------------------
+
+* Fix LTI 1.1 form rendering so it properly renders quotes present in titles.
+* Migrate LTI 1.1 launch template from Mako to Django template.
+* Internationalize LTI 1.1 launch template.
+
 3.4.1 - 2022-02-01
 ------------------
 
diff --git a/lti_consumer/__init__.py b/lti_consumer/__init__.py
@@ -4,4 +4,4 @@
 from .apps import LTIConsumerApp
 from .lti_xblock import LtiConsumerXBlock
 
-__version__ = '3.4.1'
+__version__ = '3.4.2'
diff --git a/lti_consumer/lti_xblock.py b/lti_consumer/lti_xblock.py
@@ -1063,7 +1063,7 @@ def lti_launch_handler(self, request, suffix=''):  # pylint: disable=unused-argu
         loader = ResourceLoader(__name__)
         context = self._get_context_for_template()
         context.update({'lti_parameters': lti_parameters})
-        template = loader.render_mako_template('/templates/html/lti_launch.html', context)
+        template = loader.render_django_template('/templates/html/lti_launch.html', context)
         return Response(template, content_type='text/html')
 
     @XBlock.handler
diff --git a/lti_consumer/templates/html/lti_launch.html b/lti_consumer/templates/html/lti_launch.html
@@ -1,30 +1,33 @@
+{% load i18n %}
+
 <!DOCTYPE HTML>
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <title>LTI</title>
     </head>
     <body>
-        ## This form will be hidden.
-        ## LTI module JavaScript will trigger a "submit" on the form, and the
-        ## result will be rendered instead.
+        {% comment %}
+            This form will be hidden.
+            LTI module JavaScript will trigger a "submit" on the form, and the
+            result will be rendered instead. 
+        {% endcomment %}
         <form
-            id="lti-${element_id}"
-            action="${launch_url}"
+            id="lti-{{element_id}}"
+            action="{{launch_url}}"
             method="post"
             encType="application/x-www-form-urlencoded"
             style="display:none;"
         >
+            {% for param_name, param_value in lti_parameters.items %}
+                <input name="{{param_name}}" value="{{param_value}}" />
+            {% endfor %}
 
-            % for param_name, param_value in lti_parameters.items():
-                <input name="${param_name}" value="${param_value}" />
-            % endfor
-
-            <input type="submit" value="Press to Launch" />
+            <input type="submit" value="{% trans "Press to Launch" %}" />
         </form>
         <script type="text/javascript">
             (function (d) {
-                var element = d.getElementById("lti-${element_id}");
+                var element = d.getElementById("lti-{{element_id}}");
                 if (element) {
                     element.submit();
                 }
diff --git a/lti_consumer/translations/en/LC_MESSAGES/text.po b/lti_consumer/translations/en/LC_MESSAGES/text.po
diff --git a/lti_consumer/translations/pt_PT/LC_MESSAGES/text.mo b/lti_consumer/translations/pt_PT/LC_MESSAGES/text.mo
