The old-style chinese language codes used in django 1.4 series are now deprecated, as discussed here:  https://code.djangoproject.com/ticket/18419.
Although majority of browsers still use the old-style language codes, some new browsers such as IE11 in Windows 8.1 start to use the new-style names instead of old-style ones which makes the current chinese translations of edX can't work properly under these browsers.
As there is no easy way for edX to change a higher version of django, I think we could do some mapping here so that the users who use IE11 in Windows 8.1 or other browsers that use the new-style names can view correct translations.
Also, this fix will make users who use one of the language codes:  zh-hk ,  zh-sg  and  zh-mo  can see the correct translations.

Add metrics around old ORA requests

Fix a decode error in course_about.html and make some string translatable

Emit datadog events for all course enrollments, not just those outside of verified courses

Actually push json parsing all the way down to the bottom of the GradingService get and post methods

Fixed nested bullets to enable PDF

Fixes LMS-2474 by ensuring that readElts reads always reads an element

Improve inline discussion UI

Updating ora2 requirements

1. Add space between threads
2. Change Show/Hide to Expand/Collapse and visually separate it
3. Limit a thread to 700px high and scroll if longer

Co-authored-by: marco <marcotuts@gmail.com>

The strings in share links should be in unicode, otherwise when the name of a course is non-ascii, it will generate a decode error.
And some of these strings is actually translatable, so they should be collected into mako.po.

4 levels of bullets don’t work with latex

DOC-250

Converting XModule module to JS.

Add in metric tracking to xqueue.

Part of the process for removing CoffeeScript from
edx-platform dependencies. Covering XModule with JavaScript
Jasmine unit tests.

Added comment to getUserMedia call in photocapture.js

Doc: update xblock publish() function signature

Update captions logic on front-end.

Changed wording for setting up ORA question.

ORA-351

Covers external grading and certificates.

Watch for asset changes.

Adam/merge release to master

Added note about pages being publicly viewable

Conflicts:
	requirements/edx/edx-private.txt

Upgrade JSdraw input.

Translation fix in studio: For better translation in unit.html

Make paver respect NO_PREREQ_INSTALL