Merge pull request #3110 from pitaj/master

Fixed translator backwards compatibility issue

public/src/modules/translator.js

@@ -296,11 +296,13 @@
 	if (typeof define === 'function' && define.amd) {
 		define('translator', translator);
 
+		var _translator = translator;
+
 		// Expose a global `translator` object for backwards compatibility
 		window.translator = {
 			translate: function() {
 				console.warn('[translator] Global invocation of the translator is now deprecated, please `require` the module instead.');
-				translator.translate.apply(translator, arguments);
+				_translator.translate.apply(_translator, arguments);
 			}
 		}
 	}

public/src/overrides.js

@@ -79,7 +79,7 @@ if ('undefined' !== typeof window) {
 
 	})(jQuery || {fn:{}});
 
-
+	(function(){
 		// FIX FOR #1245 - https://github.com/NodeBB/NodeBB/issues/1245
 		// from http://stackoverflow.com/questions/15931962/bootstrap-dropdown-disappear-with-right-click-on-firefox
 		// obtain a reference to the original handler
@@ -100,4 +100,6 @@ if ('undefined' !== typeof window) {
 					_clearMenus();
 				}
 			});
+	})();
+
 }