equal
deleted
inserted
replaced
557 }, |
557 }, |
558 |
558 |
559 translate : function(s) { |
559 translate : function(s) { |
560 var c = this.settings.language, o; |
560 var c = this.settings.language, o; |
561 |
561 |
|
562 if (!s) |
|
563 return s; |
|
564 |
562 o = tinymce.EditorManager.i18n[c + '.' + s] || s.replace(/{\#([^}]+)\}/g, function(a, b) { |
565 o = tinymce.EditorManager.i18n[c + '.' + s] || s.replace(/{\#([^}]+)\}/g, function(a, b) { |
563 return tinymce.EditorManager.i18n[c + '.' + b] || '{#' + b + '}'; |
566 return tinymce.EditorManager.i18n[c + '.' + b] || '{#' + b + '}'; |
564 }); |
567 }); |
565 |
568 |
566 o = o.replace(/{\$lang_([^}]+)\}/g, function(a, b) { |
569 o = o.replace(/{\$lang_([^}]+)\}/g, function(a, b) { |