fix i18n bug in button.coffee

mycolorway · Dec 15, 2014 · 5ed6f83 · 5ed6f83
1 parent a43ff58
commit 5ed6f83
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/lib/simditor.js b/lib/simditor.js
@@ -2530,9 +2530,13 @@ Button = (function(_super) {
   Button.prototype.command = function(param) {};
 
   Button.prototype._t = function() {
-    var args, _ref;
+    var args, result, _ref;
     args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-    return (_ref = this.editor)._t.apply(_ref, args);
+    result = Button.__super__._t.apply(this, args);
+    if (!result) {
+      result = (_ref = this.editor)._t.apply(_ref, args);
+    }
+    return result;
   };
 
   return Button;

diff --git a/site/assets/scripts/simditor.js b/site/assets/scripts/simditor.js
@@ -2530,9 +2530,13 @@ Button = (function(_super) {
   Button.prototype.command = function(param) {};
 
   Button.prototype._t = function() {
-    var args, _ref;
+    var args, result, _ref;
     args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-    return (_ref = this.editor)._t.apply(_ref, args);
+    result = Button.__super__._t.apply(this, args);
+    if (!result) {
+      result = (_ref = this.editor)._t.apply(_ref, args);
+    }
+    return result;
   };
 
   return Button;

diff --git a/src/buttons/button.coffee b/src/buttons/button.coffee
@@ -151,7 +151,9 @@ class Button extends SimpleModule
   command: (param) ->
 
   _t: (args...) ->
-    @editor._t args...
+    result = super args...
+    result = @editor._t args... unless result
+    result
 
 
 Simditor.Button = Button