Fixes #3537 using elgg.echo() for i18n of word count

diff --git a/mod/tinymce/views/default/js/tinymce.php b/mod/tinymce/views/default/js/tinymce.php
index d195cc871c397fe5037875a319815eccd41e1253..55e0c7ae137b7a1bf33c47280201e09bb1401c3c 100644 (file)
--- a/mod/tinymce/views/default/js/tinymce.php
+++ b/mod/tinymce/views/default/js/tinymce.php
@@ -56,13 +56,13 @@ elgg.tinymce.init = function() {
                        //show the number of words
                        ed.onLoadContent.add(function(ed, o) {
                                var strip = (tinyMCE.activeEditor.getContent()).replace(/(<([^>]+)>)/ig,"");
-                               var text = " <?php echo elgg_echo('tinymce:word_count'); ?>" + strip.split(' ').length + ' ';
+                               var text = elgg.echo('tinymce:word_count') + strip.split(' ').length + ' ';
                                tinymce.DOM.setHTML(tinymce.DOM.get(tinyMCE.activeEditor.id + '_path_row'), text);
                        });
        
                        ed.onKeyUp.add(function(ed, e) {
                                var strip = (tinyMCE.activeEditor.getContent()).replace(/(&lt;([^&gt;]+)&gt;)/ig,"");
-                               var text = " <?php echo elgg_echo('tinymce:word_count'); ?>" + strip.split(' ').length + ' ';
+                               var text = elgg.echo('tinymce:word_count') + strip.split(' ').length + ' ';
                                tinymce.DOM.setHTML(tinymce.DOM.get(tinyMCE.activeEditor.id + '_path_row'), text);
                        });
                },

diff --git a/mod/tinymce/views/default/tinymce/css.php b/mod/tinymce/views/default/tinymce/css.php
index 5d008024fa84e9c69cbfc7aba27f8ac45b41f6d2..b12cae82c858343d8f401c18d101639a76610d4c 100644 (file)
--- a/mod/tinymce/views/default/tinymce/css.php
+++ b/mod/tinymce/views/default/tinymce/css.php
@@ -26,3 +26,6 @@
        -moz-border-radius: 4px;
        border-radius: 4px;
 }
+.mceLast .mceStatusbar {
+       padding-left: 5px;
+}