Commit a84bca23 by Anton Stupak

Merge pull request #3246 from edx/anton/i18n-lti

LTI i18n 
parents adbb9f95 31e91529
...@@ -42,7 +42,6 @@ import hashlib ...@@ -42,7 +42,6 @@ import hashlib
import base64 import base64
import urllib import urllib
import textwrap import textwrap
import json
from lxml import etree from lxml import etree
from webob import Response from webob import Response
import mock import mock
...@@ -226,8 +225,11 @@ class LTIModule(LTIFields, XModule): ...@@ -226,8 +225,11 @@ class LTIModule(LTIFields, XModule):
try: try:
param_name, param_value = [p.strip() for p in custom_parameter.split('=', 1)] param_name, param_value = [p.strip() for p in custom_parameter.split('=', 1)]
except ValueError: except ValueError:
raise LTIError('Could not parse custom parameter: {0!r}. \ _ = self.runtime.service(self, "i18n").ugettext
Should be "x=y" string.'.format(custom_parameter)) msg = _('Could not parse custom parameter: {custom_parameter}. Should be "x=y" string.').format(
custom_parameter="{0!r}".format(custom_parameter)
)
raise LTIError(msg)
# LTI specs: 'custom_' should be prepended before each custom parameter, as pointed in link above. # LTI specs: 'custom_' should be prepended before each custom parameter, as pointed in link above.
if param_name not in PARAMETERS: if param_name not in PARAMETERS:
...@@ -655,8 +657,12 @@ oauth_consumer_key="", oauth_signature="frVp4JuvT1mVXlxktiAUjQ7%2F1cw%3D"'} ...@@ -655,8 +657,12 @@ oauth_consumer_key="", oauth_signature="frVp4JuvT1mVXlxktiAUjQ7%2F1cw%3D"'}
try: try:
lti_id, key, secret = [i.strip() for i in lti_passport.split(':')] lti_id, key, secret = [i.strip() for i in lti_passport.split(':')]
except ValueError: except ValueError:
raise LTIError('Could not parse LTI passport: {0!r}. \ _ = self.runtime.service(self, "i18n").ugettext
Should be "id:key:secret" string.'.format(lti_passport)) msg = _('Could not parse LTI passport: {lti_passport}. Should be "id:key:secret" string.').format(
lti_passport='{0!r}'.format(lti_passport)
)
raise LTIError(msg)
if lti_id == self.lti_id.strip(): if lti_id == self.lti_id.strip():
return key, secret return key, secret
return '', '' return '', ''
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<input name="${param_name}" value="${param_value}" /> <input name="${param_name}" value="${param_value}" />
%endfor %endfor
<input type="submit" value="Press to Launch" /> <input type="submit" value="${_('Press to Launch')}" />
</form> </form>
<script type="text/javascript"> <script type="text/javascript">
(function (d) { (function (d) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment