Merge branch 'MDL-82309' of https://github.com/paulholden/moodle

abgreeve · Jul 18, 2024 · 13bf674 · 13bf674
2 parents ac308a0 + c8d32c2
commit 13bf674
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/comment/comment.js b/comment/comment.js
@@ -100,9 +100,9 @@ M.core_comment = {
                             var newcomment = Y.Node.create(result.html);
                             container.appendChild(newcomment);
                             var ids = result.ids;
-                            var linkText = Y.one('#comment-link-text-' + cid);
-                            if (linkText) {
-                                linkText.set('innerHTML', M.util.get_string('commentscount', 'moodle', obj.count));
+                            var linkTextCount = Y.one('#comment-link-text-' + cid + ' .comment-link-count');
+                            if (linkTextCount) {
+                                linkTextCount.set('innerHTML', obj.count);
                             }
                             for(var i in ids) {
                                 var attributes = {
@@ -249,9 +249,9 @@ M.core_comment = {
                     scope: scope,
                     params: params,
                     callback: async function(id, ret, args) {
-                        var linkText = Y.one('#comment-link-text-' + scope.client_id);
-                        if (ret.count && linkText) {
-                            linkText.set('innerHTML', M.util.get_string('commentscount', 'moodle', ret.count));
+                        var linkTextCount = Y.one('#comment-link-text-' + scope.client_id + ' .comment-link-count');
+                        if (linkTextCount) {
+                            linkTextCount.set('innerHTML', ret.count);
                         }
                         var container = Y.one('#comment-list-'+scope.client_id);
                         var pagination = Y.one('#comment-pagination-'+scope.client_id);
@@ -284,10 +284,10 @@ M.core_comment = {
                     params = {'commentid': id};
                 function remove_dom(type, anim, cmt) {
                     cmt.remove();
-                    var linkText = Y.one('#comment-link-text-' + cid),
+                    var linkTextCount = Y.one('#comment-link-text-' + cid + ' .comment-link-count'),
                         comments = Y.all('#comment-list-' + cid + ' li');
-                    if (linkText && comments) {
-                        linkText.set('innerHTML', M.util.get_string('commentscount', 'moodle', comments.size()));
+                    if (linkTextCount) {
+                        linkTextCount.set('innerHTML', comments.size());
                     }
                 }
                 this.request({

diff --git a/comment/lib.php b/comment/lib.php
@@ -263,7 +263,6 @@ public static function init(moodle_page $page = null) {
         $page->requires->strings_for_js(array(
                 'addcomment',
                 'comments',
-                'commentscount',
                 'commentsrequirelogin',
                 'deletecommentbyon'
             ),
@@ -454,7 +453,7 @@ public function output($return = true) {
                 // comments open and closed
                 $countstring = '';
                 if ($this->displaytotalcount) {
-                    $countstring = '('.$this->count().')';
+                    $countstring = '(' . html_writer::span($this->count(), 'comment-link-count') . ')';
                 }
                 $collapsedimage= 't/collapsed';
                 if (right_to_left()) {

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
@@ -280,7 +280,6 @@
 $string['comebacklater'] = 'Please come back later.';
 $string['commentincontext'] = 'Find this comment in context';
 $string['comments'] = 'Comments';
-$string['commentscount'] = 'Comments ({$a})';
 $string['commentsnotenabled'] = 'Comments feature is not enabled';
 $string['commentsrequirelogin'] = 'You need to log in to view the comments.';
 $string['comparelanguage'] = 'Compare and edit current language';
@@ -2519,6 +2518,7 @@
 * -word - don\'t include results containing this word.';
 
 // Deprecated since Moodle 4.5.
+$string['commentscount'] = 'Comments ({$a})';
 $string['datechanged'] = 'Date changed';
 $string['registrationcontactno'] = 'No, I do not want to be contacted by other people';
 $string['registrationcontactyes'] = 'Yes, provide a form for other Moodlers to contact me';