Merge branch 'patch-1' of https://github.com/manolino/NodeBB into manolino-patch-1

public/src/overrides.js

@@ -111,6 +111,11 @@ if ('undefined' !== typeof window) {
 			prompt = bootbox.prompt,
 			confirm = bootbox.confirm;
 			
+		var translator;
+		require(['translator'], function(_translator) {
+			translator = _translator;
+		});
+
 		function translate(modal) {
 			var header = modal.find('.modal-header'),
 				footer = modal.find('.modal-footer');