Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2493 from danielcebrian/daniel-branch-fix

Browse Source 
fixed conflict between Annotator and internationalitation
This commit is contained in:
Diana Huang
2014-02-11 13:32:57 -05:00
parent 2e28279b57 1a62379a43
commit 770df00921
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
common/static/js/vendor/ova/annotator-full.js vendored
View File

@@ -121,25 +121,14 @@ getNodePosition = function(node) {
*/
// Generated by CoffeeScript 1.6.3
var $, Util, gettext, _gettext, _ref, _t;
var $, Util, gettext_annotator, _ref, _t;
gettext = null;
if (typeof Gettext !== "undefined" && Gettext !== null) {
_gettext = new Gettext({
domain: "annotator"
});
gettext = function(msgid) {
return _gettext.gettext(msgid);
};
} else {
gettext = function(msgid) {
return msgid;
};
}
gettext_annotator = function(msgid) {
return msgid;
};
_t = function(msgid) {
return gettext(msgid);
return gettext_annotator(msgid);
};
if (!(typeof jQuery !== "undefined" && jQuery !== null ? (_ref = jQuery.fn) != null ? _ref.jquery : void 0 : void 0)) {