Permalink
Browse files

i18n: small fix

  • Loading branch information...
1 parent f853d75 commit dc9f23dbcb9ce9d761674b58bd53a8d667ab42cc @frost-nzcr4 frost-nzcr4 committed Mar 17, 2011
Showing with 2 additions and 11 deletions.
  1. +1 −10 jquery.wysiwyg.js
  2. +1 −1 plugins/wysiwyg.i18n.js
View
@@ -610,10 +610,6 @@
className = control.className || control.command || name || "empty",
tooltip = control.tooltip || control.command || name || "";
- if ($.wysiwyg.i18n) {
- tooltip = $.wysiwyg.i18n.t(tooltip, "controls");
- }
-
return $('<li role="menuitem" unselectable="on">' + (className) + "</li>")
.addClass(className)
.attr("title", tooltip)
@@ -636,10 +632,6 @@
var self = this.self,
tooltip = control.tooltip || control.command || name || "";
- if ($.wysiwyg.i18n) {
- tooltip = $.wysiwyg.i18n.t(tooltip, "controls");
- }
-
if (control.callback) {
$(window).bind("trigger-" + name + ".wysiwyg", control.callback);
}
@@ -1043,6 +1035,7 @@
growHandler,
saveHandler;
+ self.ui.appendControls();
self.element.append(self.ui.toolbar)
.append($("<div><!-- --></div>")
.css({
@@ -1066,8 +1059,6 @@
$(self.editorDoc).trigger("initFrame.wysiwyg");
- self.ui.appendControls();
-
$(self.editorDoc).bind("click.wysiwyg", function (event) {
self.ui.checkTargets(event.target ? event.target : event.srcElement);
});
@@ -27,7 +27,7 @@
}
if (!lang) {
- lang = this.defaults.lang;
+ lang = Wysiwyg.options.i18n;
}
if ((lang !== this.defaults.wysiwygLang) && (undefined === $.wysiwyg.i18n.lang[lang])) {

0 comments on commit dc9f23d

Please sign in to comment.