diff --git a/public/language/en_GB/recent.json b/public/language/en_GB/recent.json index ff6400f27a..f01670e47c 100644 --- a/public/language/en_GB/recent.json +++ b/public/language/en_GB/recent.json @@ -5,5 +5,19 @@ "month": "Month", "year": "Year", "alltime": "All Time", - "no_recent_topics": "There are no recent topics." + "no_recent_topics": "There are no recent topics.", + + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + + "click-here-to-reload": "Click here to reload." + } \ No newline at end of file diff --git a/public/src/client/recent.js b/public/src/client/recent.js index 5b6a4d7527..fed290296b 100644 --- a/public/src/client/recent.js +++ b/public/src/client/recent.js @@ -50,23 +50,36 @@ define('forum/recent', ['forum/infinitescroll'], function(infinitescroll) { }; Recent.updateAlertText = function() { - var text = 'There'; + var text = ''; - if (newTopicCount > 1) { - text += ' are ' + newTopicCount + ' new topics'; - } else if (newTopicCount === 1) { - text += ' is a new topic'; + if (newTopicCount === 0) { + if (newPostCount === 1) { + text = '[[recent:there-is-a-new-post]]'; + } else if (newPostCount > 1) { + text = '[[recent:there-are-new-posts, ' + newPostCount + ']]'; + } + } + else if (newTopicCount === 1) { + if (newPostCount === 0) { + text = '[[recent:there-is-a-new-topic]]'; + } else if (newPostCount === 1) { + text = '[[recent:there-is-a-new-topic-and-a-new-post]]'; + } else if (newPostCount > 1) { + text = '[[recent:there-is-a-new-topic-and-new-posts, ' + newPostCount +']]'; + } + } else if (newTopicCount > 1) { + if (newPostCount === 0) { + text = '[[recent:there-are-new-topics, ' + newTopicCount + ']]'; + } else if (newPostCount === 1) { + text = '[[recent:there-are-new-topics-and-a-new-post, ' + newTopicCount + ']]'; + } else if (newPostCount > 1) { + text = '[[recent:there-are-new-topics-and-new-posts, ' + newTopicCount + ', ' + newPostCount +']]'; + } } - if (newPostCount > 1) { - text += (newTopicCount?' and ':' are ') + newPostCount + ' new posts'; - } else if(newPostCount === 1) { - text += (newTopicCount?' and ':' is ') + ' a new post'; - } + text += ' [[recent:click-here-to-reload]]'; - text += '. Click here to reload.'; - - $('#new-topics-alert').html(text).removeClass('hide').fadeIn('slow'); + $('#new-topics-alert').translateText(text).removeClass('hide').fadeIn('slow'); $('#category-no-topics').addClass('hide'); };