diff --git a/htdocs/js/jquery.quickreply.js b/htdocs/js/jquery.quickreply.js index 2e79b2dc2b..4c5e92898f 100644 --- a/htdocs/js/jquery.quickreply.js +++ b/htdocs/js/jquery.quickreply.js @@ -123,8 +123,20 @@ jQuery(document).ready(function($) { $readLink .ajaxtip() // init - .ajaxtip("success", data.message) // success message - .text($readLink.text().replace(/\d+/, data.count)) // replace count + .ajaxtip("success", data.message); // success message + + var commentText = ''; + if ( data.count == 1 ) { + commentText = $readLink.data('sing'); + } + else if ( data.count == 2 ) { + commentText = $readLink.data('dual'); + } + else { + commentText = $readLink.data('plur').replace(/\d+/, data.count); + } + + $readLink.text(commentText); // replace count }); } diff --git a/styles/core2.s2 b/styles/core2.s2 index 7e9c6010f8..dbc081aaff 100644 --- a/styles/core2.s2 +++ b/styles/core2.s2 @@ -6120,11 +6120,14 @@ function CommentInfo::print_readlink { var string text_screened = get_plural_phrase($.screened_count, "text_read_comments_screened"); var string text_both = $text_visible + $*text_default_separator + $text_screened; var string text_total = get_plural_phrase($.count, $p.view == "read" ? "text_read_comments_friends" : "text_read_comments"); + var string text_sing = get_plural_phrase(1, $p.view == "read" ? "text_read_comments_friends" : "text_read_comments"); + var string text_dual = get_plural_phrase(2, $p.view == "read" ? "text_read_comments_friends" : "text_read_comments"); + var string text_plur = get_plural_phrase(3, $p.view == "read" ? "text_read_comments_friends" : "text_read_comments"); if ($.screened) { # show visible count and screened count - print safe """"""+ $text_both + """"""; + print safe """"""+ $text_both + """"""; } else { - print safe """"""+ $text_total + """"""; + print safe """"""+ $text_total + """"""; } } diff --git a/styles/database/layout.s2 b/styles/database/layout.s2 index 5540d17994..1e4726f120 100644 --- a/styles/database/layout.s2 +++ b/styles/database/layout.s2 @@ -472,10 +472,13 @@ function CommentInfo::print_readlink { var string text_screened = get_plural_phrase($.screened_count, "text_read_comments_screened"); var string text_both = $text_visible + $*text_default_separator + $text_screened; var string text_total = get_plural_phrase($.count, $p.view == "read" ? "text_read_comments_friends" : "text_read_comments"); + var string text_sing = get_plural_phrase(1, $p.view == "read" ? "text_read_comments_friends" : "text_read_comments"); + var string text_dual = get_plural_phrase(2, $p.view == "read" ? "text_read_comments_friends" : "text_read_comments"); + var string text_plur = get_plural_phrase(3, $p.view == "read" ? "text_read_comments_friends" : "text_read_comments"); if ($.screened) { if ($*entry_interaction_links == "text") { - print safe """"""+ $text_visible + $*text_default_separator + $text_screened + """"""; + print safe """"""+ $text_visible + $*text_default_separator + $text_screened + """"""; } else { print safe """$.count """ + """ + $.screened_count """ @@ -483,7 +486,7 @@ function CommentInfo::print_readlink { } } else { if ($*entry_interaction_links == "text") { - print safe """"""+ $text_total + """"""; + print safe """"""+ $text_total + """"""; } else { print safe """$.count """; }