Uh oh!
There was an error while loading. Please reload this page.
Ensure window.Urls has correct language code & browser lang is respected - #2637
Merged
rtibbles merged 2 commits intoDec 7, 2020
Merged
Conversation
rtibbles
requested changes
Dec 7, 2020
rtibbles
left a comment
Member
There was a problem hiding this comment.
Looks good, but I've not tested.
Can clean up this from base.html:
{% if not debug %}
<script src={% static 'django_js_reverse/js/reverse.js' %}></script>
{% else %}
<script src="{% url 'js_reverse' %}" type="text/javascript"></script>
{% endif %}
As it is now redundant with your work.
Can also remove this line: https://github.com/learningequality/studio/blob/develop/Makefile#L54 as it is no longer needed.
Codecov Report
@@ Coverage Diff @@## develop #2637 +/- ##
===========================================
+ Coverage 84.56% 84.98% +0.41%
===========================================
Files 296 294 -2 Lines 15093 15019 -74 ===========================================
Hits 12764 12764 + Misses 2329 2255 -74
Continue to review full report at Codecov.
|
rtibbles
approved these changes
Dec 7, 2020
rtibbles
left a comment
Member
There was a problem hiding this comment.
Changes made, manual test checks out.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Please remove any unused sections
Description
Imports and modifies logic here: https://github.com/learningequality/kolibri/blob/release-v0.14.x/kolibri/core/kolibri_plugin.py#L36 and inserts it into the context processor which exposes a dict w/
I18N_URLSkey returning the properly generated and minified JS code that setswindow.Urlsto the currently used i18n lang code.Also helps ensure that browser language code is respected.
Issue Addressed (if applicable)
Fixes#2627
Steps to Test
Set your browser's language to a non-English language of your choice.
Navigate the site's sections:
You should never have your URL default back to
enas you navigate.