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

fixed conflict between Annotator and internationalitation

common/static/js/vendor/ova/annotator-full.js

@@ -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)) {