From 45addcf5eccc4f195d7480471977689bda17803a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Wed, 29 Mar 2023 10:55:17 -0400
Subject: [PATCH] refactor: simple load new posts

---
 public/language/en-GB/recent.json | 15 +------------
 public/src/modules/topicList.js   | 35 +++----------------------------
 2 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/public/language/en-GB/recent.json b/public/language/en-GB/recent.json
index 835dfce296..c7642ab40b 100644
--- a/public/language/en-GB/recent.json
+++ b/public/language/en-GB/recent.json
@@ -7,18 +7,5 @@
 	"alltime": "All Time",
 	"no_recent_topics": "There are no recent topics.",
 	"no_popular_topics": "There are no popular 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."
-
+	"load-new-posts": "Load new posts"
 }
\ No newline at end of file
diff --git a/public/src/modules/topicList.js b/public/src/modules/topicList.js
index 55b8d5e740..5d1ea52a62 100644
--- a/public/src/modules/topicList.js
+++ b/public/src/modules/topicList.js
@@ -78,9 +78,6 @@ define('topicList', [
 	}
 
 	TopicList.watchForNewPosts = function () {
-		$('#new-topics-alert').on('click', function () {
-			$(this).addClass('hide');
-		});
 		newPostCount = 0;
 		newTopicCount = 0;
 		TopicList.removeListeners();
@@ -150,36 +147,10 @@ define('topicList', [
 	}
 
 	function updateAlertText() {
-		let text = '';
-
-		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 (newTopicCount > 0 || newPostCount > 0) {
+			$('#new-topics-alert').removeClass('hide').fadeIn('slow');
+			$('#category-no-topics').addClass('hide');
 		}
-
-		text += ' [[recent:click-here-to-reload]]';
-
-		$('#new-topics-alert').translateText(text).removeClass('hide').fadeIn('slow');
-		$('#category-no-topics').addClass('hide');
 	}
 
 	TopicList.loadMoreTopics = function (direction) {