diff --git a/install/package.json b/install/package.json index 7a5c0a9e31..48d74e9c6a 100644 --- a/install/package.json +++ b/install/package.json @@ -34,10 +34,10 @@ "@fortawesome/fontawesome-free": "6.5.1", "@isaacs/ttlcache": "1.4.1", "@popperjs/core": "2.11.8", - "ace-builds": "1.32.6", + "ace-builds": "1.32.7", "archiver": "7.0.0", "async": "3.2.5", - "autoprefixer": "10.4.17", + "autoprefixer": "10.4.18", "bcryptjs": "2.4.3", "benchpressjs": "2.5.1", "body-parser": "1.20.2", @@ -88,7 +88,7 @@ "lru-cache": "10.2.0", "mime": "3.0.0", "mkdirp": "3.0.1", - "mongodb": "6.3.0", + "mongodb": "6.4.0", "morgan": "1.10.0", "mousetrap": "1.6.5", "multiparty": "4.2.3", @@ -99,14 +99,14 @@ "nodebb-plugin-emoji": "5.1.13", "nodebb-plugin-emoji-android": "4.0.0", "nodebb-plugin-markdown": "13.0.0-pre.3", - "nodebb-plugin-mentions": "4.3.7", + "nodebb-plugin-mentions": "4.4.0", "nodebb-plugin-ntfy": "1.7.3", "nodebb-plugin-spam-be-gone": "2.2.1", "nodebb-rewards-essentials": "1.0.0", - "nodebb-theme-harmony": "2.0.0-pre.3", + "nodebb-theme-harmony": "2.0.0-pre.4", "nodebb-theme-lavender": "7.1.7", - "nodebb-theme-peace": "2.2.3", - "nodebb-theme-persona": "13.3.10", + "nodebb-theme-peace": "2.2.4", + "nodebb-theme-persona": "13.3.11", "nodebb-widget-essentials": "7.0.15", "nodemailer": "6.9.11", "nprogress": "0.2.0", diff --git a/public/language/ar/admin/settings/post.json b/public/language/ar/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/ar/admin/settings/post.json +++ b/public/language/ar/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index 64daff02e8..9e8a4a1124 100644 --- a/public/language/ar/topic.json +++ b/public/language/ar/topic.json @@ -182,6 +182,8 @@ "sort-by": "ترتيب حسب", "oldest-to-newest": "من الأقدم إلى الأحدث", "newest-to-oldest": "من الأحدث إلى الأقدم", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/bg/admin/settings/post.json b/public/language/bg/admin/settings/post.json index 7f7781c1cf..bda0c46dba 100644 --- a/public/language/bg/admin/settings/post.json +++ b/public/language/bg/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Подредба по подразбиране на публикациите", "sorting.oldest-to-newest": "Първо най-старите", "sorting.newest-to-oldest": "Първо най-новите", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Първо тези с най-много гласове", "sorting.most-posts": "Първо тези с най-много публикации", + "sorting.most-views": "Most Views", "sorting.topic-default": "Подредба по подразбиране на темите", "length": "Дължина на публикациите", "post-queue": "Опашка за публикации", diff --git a/public/language/bg/themes/harmony.json b/public/language/bg/themes/harmony.json index 69b9339a03..cb21cadb9e 100644 --- a/public/language/bg/themes/harmony.json +++ b/public/language/bg/themes/harmony.json @@ -7,7 +7,7 @@ "login-register-to-search": "Впишете се или се регистрирайте, за да можете да търсите.", "settings.title": "Настройки на темата", "settings.enableQuickReply": "Включване на бързите отговори", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Включване на пътечките на страниците", "settings.centerHeaderElements": "Центриране на заглавните елементи", "settings.mobileTopicTeasers": "Показване на резюмета на темите на мобилни устройства", "settings.stickyToolbar": "Статична лента с инструменти", diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json index cb80597328..a9f3ef907d 100644 --- a/public/language/bg/topic.json +++ b/public/language/bg/topic.json @@ -182,6 +182,8 @@ "sort-by": "Подреждане по", "oldest-to-newest": "Първо най-старите", "newest-to-oldest": "Първо най-новите", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Първо тези с най-много гласове", "most-posts": "Първо тези с най-много публикации", "most-views": "Първо тези с най-много преглеждания", diff --git a/public/language/bn/admin/settings/post.json b/public/language/bn/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/bn/admin/settings/post.json +++ b/public/language/bn/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json index 7bc1821a4f..3239dba068 100644 --- a/public/language/bn/topic.json +++ b/public/language/bn/topic.json @@ -182,6 +182,8 @@ "sort-by": "সাজানোর ভিত্তি:", "oldest-to-newest": "পুরাতন থেকে নতুন", "newest-to-oldest": "নতুন থেকে পুরাতন", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/cs/admin/settings/post.json b/public/language/cs/admin/settings/post.json index 7e0611c5f4..b0627af793 100644 --- a/public/language/cs/admin/settings/post.json +++ b/public/language/cs/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Výchozí třídění příspěvků", "sorting.oldest-to-newest": "Od nejstarších po nejnovější", "sorting.newest-to-oldest": "Od nejnovějších po nejstarší", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Dle počtu hlasů", "sorting.most-posts": "Dle počtu příspěvků", + "sorting.most-views": "Most Views", "sorting.topic-default": "Výchozí třídění tématu", "length": "Délka příspěvku", "post-queue": "Příspěvky ve frontě", diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index 0f0107fb9b..924bd61821 100644 --- a/public/language/cs/topic.json +++ b/public/language/cs/topic.json @@ -182,6 +182,8 @@ "sort-by": "Seřadit dle", "oldest-to-newest": "Od nejstarších po nejnovější", "newest-to-oldest": "Od nejnovějších po nejstarší", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "S nejvíce hlasy", "most-posts": "S nejvíce příspěvky", "most-views": "Most Views", diff --git a/public/language/da/admin/settings/post.json b/public/language/da/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/da/admin/settings/post.json +++ b/public/language/da/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/da/topic.json b/public/language/da/topic.json index f4d9ee830f..762268c5c1 100644 --- a/public/language/da/topic.json +++ b/public/language/da/topic.json @@ -182,6 +182,8 @@ "sort-by": "Sorter efter", "oldest-to-newest": "Ældste til nyeste", "newest-to-oldest": "Nyeste til ældste", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/de/admin/settings/post.json b/public/language/de/admin/settings/post.json index 99609e8e57..259e598e81 100644 --- a/public/language/de/admin/settings/post.json +++ b/public/language/de/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Standardmäßige sortierung von Beiträgen", "sorting.oldest-to-newest": "Von Alt bis Neu", "sorting.newest-to-oldest": "Von Neu zu Alt", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Meiste Bewertungen", "sorting.most-posts": "Meiste Beiträge", + "sorting.most-views": "Most Views", "sorting.topic-default": "Standardmäßige Themensortierung", "length": "Beitragslänge", "post-queue": "Beitragswarteschlange", diff --git a/public/language/de/topic.json b/public/language/de/topic.json index 4a1dcfb71e..427da8df01 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -182,6 +182,8 @@ "sort-by": "Sortieren nach", "oldest-to-newest": "Älteste zuerst", "newest-to-oldest": "Neuste zuerst", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Meiste Stimmen", "most-posts": "Meiste Beiträge", "most-views": "Die meisten Ansichten", diff --git a/public/language/el/admin/settings/post.json b/public/language/el/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/el/admin/settings/post.json +++ b/public/language/el/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/el/topic.json b/public/language/el/topic.json index 660bbd65d8..259332bb1e 100644 --- a/public/language/el/topic.json +++ b/public/language/el/topic.json @@ -182,6 +182,8 @@ "sort-by": "Ταξινόμηση κατά", "oldest-to-newest": "Παλαιότερο προς Νεότερο", "newest-to-oldest": "Νεότερο προς Παλαιότερο", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/en-GB/admin/settings/post.json b/public/language/en-GB/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/en-GB/admin/settings/post.json +++ b/public/language/en-GB/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/en-GB/topic.json b/public/language/en-GB/topic.json index 78686a38cb..9027774603 100644 --- a/public/language/en-GB/topic.json +++ b/public/language/en-GB/topic.json @@ -206,6 +206,8 @@ "sort-by": "Sort by", "oldest-to-newest": "Oldest to Newest", "newest-to-oldest": "Newest to Oldest", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/en-US/admin/settings/post.json b/public/language/en-US/admin/settings/post.json index e4d42e7c39..b6324c68bf 100644 --- a/public/language/en-US/admin/settings/post.json +++ b/public/language/en-US/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/en-US/topic.json b/public/language/en-US/topic.json index 609d2a7196..bf9c68ef85 100644 --- a/public/language/en-US/topic.json +++ b/public/language/en-US/topic.json @@ -182,6 +182,8 @@ "sort-by": "Sort by", "oldest-to-newest": "Oldest to Newest", "newest-to-oldest": "Newest to Oldest", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/en-x-pirate/admin/settings/post.json b/public/language/en-x-pirate/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/en-x-pirate/admin/settings/post.json +++ b/public/language/en-x-pirate/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/en-x-pirate/topic.json b/public/language/en-x-pirate/topic.json index 609d2a7196..bf9c68ef85 100644 --- a/public/language/en-x-pirate/topic.json +++ b/public/language/en-x-pirate/topic.json @@ -182,6 +182,8 @@ "sort-by": "Sort by", "oldest-to-newest": "Oldest to Newest", "newest-to-oldest": "Newest to Oldest", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/es/admin/settings/post.json b/public/language/es/admin/settings/post.json index 88d1a965f0..0021ecaa0b 100644 --- a/public/language/es/admin/settings/post.json +++ b/public/language/es/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Ordenamiento de Respuestas por Defecto", "sorting.oldest-to-newest": "De más Antiguo a más Nuevo", "sorting.newest-to-oldest": "De más Nuevo a Más Antiguo", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Más Votado", "sorting.most-posts": "Más Respondido", + "sorting.most-views": "Most Views", "sorting.topic-default": "Ordenamiento de Temas por defecto", "length": "Longitud de la entrada", "post-queue": "Post Queue", diff --git a/public/language/es/topic.json b/public/language/es/topic.json index e06a07cbd1..b33f6779ab 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -182,6 +182,8 @@ "sort-by": "Ordenar", "oldest-to-newest": "Más antiguo a más nuevo", "newest-to-oldest": "Más nuevo a más antiguo", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Mayor número de Votos", "most-posts": "Mayor número de Posts", "most-views": "Most Views", diff --git a/public/language/et/admin/settings/post.json b/public/language/et/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/et/admin/settings/post.json +++ b/public/language/et/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/et/topic.json b/public/language/et/topic.json index f3c910297d..09babe327e 100644 --- a/public/language/et/topic.json +++ b/public/language/et/topic.json @@ -182,6 +182,8 @@ "sort-by": "Sorteeri", "oldest-to-newest": "Vanematest uuemateni", "newest-to-oldest": "Uuematest vanemateni", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/fa-IR/admin/settings/post.json b/public/language/fa-IR/admin/settings/post.json index 318ba8cade..fc3fa1827f 100644 --- a/public/language/fa-IR/admin/settings/post.json +++ b/public/language/fa-IR/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "مرتب‌سازی پیش‌فرض پست", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "بیشترین رای‌ها", "sorting.most-posts": "بیشترین پست", + "sorting.most-views": "Most Views", "sorting.topic-default": "مرتب‌سازی پیش‌فرض موضوع", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/fa-IR/topic.json b/public/language/fa-IR/topic.json index 47891b64ff..8d2d8fe1f7 100644 --- a/public/language/fa-IR/topic.json +++ b/public/language/fa-IR/topic.json @@ -182,6 +182,8 @@ "sort-by": "مرتب‌سازی بر اساس", "oldest-to-newest": "قدیمی‌ترین به جدید‌ترین", "newest-to-oldest": "جدید‌ترین به قدیمی‌ترین", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "بیشترین رای ها", "most-posts": "بیشترین پست", "most-views": "بیشترین بازدید‌ها", diff --git a/public/language/fi/admin/settings/post.json b/public/language/fi/admin/settings/post.json index 51c9c6966d..b74db5f2d4 100644 --- a/public/language/fi/admin/settings/post.json +++ b/public/language/fi/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Oletusarvoinen viestijärjestys", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Oletusarvoinen aihejärjestys", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index cdcdb5da4f..de6477012b 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -182,6 +182,8 @@ "sort-by": "Järjestysperuste", "oldest-to-newest": "Vanhimmasta uusimpaan", "newest-to-oldest": "Uusimmasta vanhimpaan", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Eniten ääniä", "most-posts": "Eniten viestejä", "most-views": "Eniten näyttöjä", diff --git a/public/language/fr/admin/settings/post.json b/public/language/fr/admin/settings/post.json index bb49cb1b25..cdf8f11baa 100644 --- a/public/language/fr/admin/settings/post.json +++ b/public/language/fr/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Tri des messages par défaut", "sorting.oldest-to-newest": "Du plus ancien au plus récent", "sorting.newest-to-oldest": "Du plus récent au plus ancien", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Avec le plus de votes", "sorting.most-posts": "Avec le plus de messages", + "sorting.most-views": "Most Views", "sorting.topic-default": "Tri des sujets par défaut", "length": "Longueur de message", "post-queue": "File d'attente", diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index 7467950197..dd2c1b51a2 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -182,6 +182,8 @@ "sort-by": "Trier", "oldest-to-newest": "Du plus ancien au plus récent", "newest-to-oldest": "Du plus récent au plus ancien", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Les plus votés", "most-posts": "Meilleurs messages", "most-views": "Les plus vus", diff --git a/public/language/gl/admin/settings/post.json b/public/language/gl/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/gl/admin/settings/post.json +++ b/public/language/gl/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json index 51af2a16ca..c9cebef125 100644 --- a/public/language/gl/topic.json +++ b/public/language/gl/topic.json @@ -182,6 +182,8 @@ "sort-by": "Ordenar por", "oldest-to-newest": "Máis antigo a máis novo", "newest-to-oldest": "Máis novo a máis antigo", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/he/admin/settings/post.json b/public/language/he/admin/settings/post.json index d2b7abe9c6..5c2f14a0ef 100644 --- a/public/language/he/admin/settings/post.json +++ b/public/language/he/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "מיון ברירת מחדל של פוסטים", "sorting.oldest-to-newest": "מישן לחדש", "sorting.newest-to-oldest": "מחדש לישן", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "רוב ההצבעות", "sorting.most-posts": "הכי הרבה פוסטים", + "sorting.most-views": "Most Views", "sorting.topic-default": "מיון ברירת מחדל של נושאים", "length": "אורך פוסט", "post-queue": "תור פוסטים", diff --git a/public/language/he/topic.json b/public/language/he/topic.json index 4c490b87ec..98f60636e8 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -182,6 +182,8 @@ "sort-by": "מיון לפי", "oldest-to-newest": "מהישן לחדש", "newest-to-oldest": "מהחדש לישן", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "הכי הרבה הצבעות", "most-posts": "הכי הרבה פוסטים", "most-views": "הכי הרבה צפיות", diff --git a/public/language/hr/admin/settings/post.json b/public/language/hr/admin/settings/post.json index 243b4f4f9b..269e829aa7 100644 --- a/public/language/hr/admin/settings/post.json +++ b/public/language/hr/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Zadano sortiranje objava", "sorting.oldest-to-newest": "Starije prema Novijem", "sorting.newest-to-oldest": "Novije prema Starijem", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Najviše glasova", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Uobičajeno sortiranje tema", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/hr/topic.json b/public/language/hr/topic.json index be920947be..47980b35be 100644 --- a/public/language/hr/topic.json +++ b/public/language/hr/topic.json @@ -182,6 +182,8 @@ "sort-by": "Sortitaj po", "oldest-to-newest": "Starije prema Novom", "newest-to-oldest": "Novije prema Starom", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/hu/admin/settings/post.json b/public/language/hu/admin/settings/post.json index d4cb8f57ab..4fc9580d9f 100644 --- a/public/language/hu/admin/settings/post.json +++ b/public/language/hu/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Alapértelmezett rendezés", "sorting.oldest-to-newest": "Régebbitől az újabb felé", "sorting.newest-to-oldest": "Újabbtól a régebbi felé", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Legtöbb szavazat", "sorting.most-posts": "Legtöbb hozzászólás", + "sorting.most-views": "Most Views", "sorting.topic-default": "Alapértelmezett témekör rendezés", "length": "Hozzászólás hossza", "post-queue": "Hozzászólás várólista", diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index eca5576b13..3a9c408503 100644 --- a/public/language/hu/topic.json +++ b/public/language/hu/topic.json @@ -182,6 +182,8 @@ "sort-by": "Rendezés", "oldest-to-newest": "Régebbiek elől", "newest-to-oldest": "Újabbak elől", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Legtöbb szavazat", "most-posts": "Legtöbb bejegyzés", "most-views": "Legtöbb Megtekintés", diff --git a/public/language/hy/admin/settings/post.json b/public/language/hy/admin/settings/post.json index c30a06218a..1927be37e5 100644 --- a/public/language/hy/admin/settings/post.json +++ b/public/language/hy/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Գրառումների հիմնական տեսակավորում", "sorting.oldest-to-newest": "Ամենահնից նորագույնը", "sorting.newest-to-oldest": "Նորից հինը", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Ամենաշատ գրառումները", + "sorting.most-views": "Most Views", "sorting.topic-default": "Թեմայի կանխադրված տեսակավորում", "length": "Գրառման երկարությունը", "post-queue": "Գրառման հերթ", diff --git a/public/language/hy/topic.json b/public/language/hy/topic.json index 367e768637..3d0d1cbd25 100644 --- a/public/language/hy/topic.json +++ b/public/language/hy/topic.json @@ -182,6 +182,8 @@ "sort-by": "Դասավորել…", "oldest-to-newest": "Հնից դեպի նոր", "newest-to-oldest": "Նորից դեպի հին", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Առավելագույն ձայներ", "most-posts": "Ամենաշատ գրառումները", "most-views": "Ամենաշատ դիտումները", diff --git a/public/language/id/admin/settings/post.json b/public/language/id/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/id/admin/settings/post.json +++ b/public/language/id/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/id/topic.json b/public/language/id/topic.json index f87f800561..d0993adf2c 100644 --- a/public/language/id/topic.json +++ b/public/language/id/topic.json @@ -182,6 +182,8 @@ "sort-by": "Urutkan berdasakan", "oldest-to-newest": "Terlama ke Terbaru", "newest-to-oldest": "Terbaru ke Terlama", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/it/admin/settings/post.json b/public/language/it/admin/settings/post.json index a588c7fe30..1aa3640d00 100644 --- a/public/language/it/admin/settings/post.json +++ b/public/language/it/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Ordinamento post predefinito", "sorting.oldest-to-newest": "Dal meno recente al più recente", "sorting.newest-to-oldest": "Dal più recente al meno recente", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Più Voti", "sorting.most-posts": "Più post", + "sorting.most-views": "Most Views", "sorting.topic-default": "Ordinamento Discussione Predefinito", "length": "Lunghezza post", "post-queue": "Coda post", diff --git a/public/language/it/topic.json b/public/language/it/topic.json index 7d599e7d5f..2d353d298c 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -182,6 +182,8 @@ "sort-by": "Ordina per", "oldest-to-newest": "Da Vecchi a Nuovi", "newest-to-oldest": "Da Nuovi a Vecchi", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Più Voti", "most-posts": "Più Post", "most-views": "Più visualizzazioni", diff --git a/public/language/ja/admin/settings/post.json b/public/language/ja/admin/settings/post.json index 4ac8aa58eb..782dd694ab 100644 --- a/public/language/ja/admin/settings/post.json +++ b/public/language/ja/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "標準のポスト並び順", "sorting.oldest-to-newest": "新しい順に", "sorting.newest-to-oldest": "新しいものから古いものへ", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "最も多い評価", "sorting.most-posts": "最大投稿", + "sorting.most-views": "Most Views", "sorting.topic-default": "デフォルトのスレッドの並び順", "length": "投稿の長さ", "post-queue": "Post Queue", diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json index 8b8ec8220d..08ff45a526 100644 --- a/public/language/ja/topic.json +++ b/public/language/ja/topic.json @@ -182,6 +182,8 @@ "sort-by": "並び替え", "oldest-to-newest": "古いものから新しい順", "newest-to-oldest": "新しいものから古い順", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "最高評価", "most-posts": "最大投稿", "most-views": "Most Views", diff --git a/public/language/ko/admin/settings/post.json b/public/language/ko/admin/settings/post.json index 5b27f3891c..e39ec0ae85 100644 --- a/public/language/ko/admin/settings/post.json +++ b/public/language/ko/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "기본 게시물 정렬", "sorting.oldest-to-newest": "오래된 순", "sorting.newest-to-oldest": "최신 순", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "최다 투표 순", "sorting.most-posts": "최다 게시물 순", + "sorting.most-views": "Most Views", "sorting.topic-default": "기본 토픽 정렬", "length": "게시물 길이", "post-queue": "게시물 대기열", diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json index d60af43f0d..e6093ba750 100644 --- a/public/language/ko/topic.json +++ b/public/language/ko/topic.json @@ -182,6 +182,8 @@ "sort-by": "정렬 기준", "oldest-to-newest": "오래된 순", "newest-to-oldest": "최신 순", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "가장 많은 투표", "most-posts": "가장 많은 게시물", "most-views": "가장 많은 조회수", diff --git a/public/language/lt/admin/settings/post.json b/public/language/lt/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/lt/admin/settings/post.json +++ b/public/language/lt/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json index dba3d0e40b..16534631c1 100644 --- a/public/language/lt/topic.json +++ b/public/language/lt/topic.json @@ -182,6 +182,8 @@ "sort-by": "Rūšiuoti pagal", "oldest-to-newest": "Nuo seniausių iki naujausių", "newest-to-oldest": "Nuo naujausių iki seniausių", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Daugiausiai Balsų", "most-posts": "Daugiausiai Įrašų", "most-views": "Most Views", diff --git a/public/language/lv/admin/settings/post.json b/public/language/lv/admin/settings/post.json index b9731c6f80..5286caf702 100644 --- a/public/language/lv/admin/settings/post.json +++ b/public/language/lv/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Noklusējuma rakstu kārtošana", "sorting.oldest-to-newest": "No vecākā līdz jaunākam", "sorting.newest-to-oldest": "No jaunākā līdz vecākam", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Visvairāk balsojumu", "sorting.most-posts": "Visvairāk rakstu", + "sorting.most-views": "Most Views", "sorting.topic-default": "Noklusējuma tematu kārtošana", "length": "Raksta garums", "post-queue": "Post Queue", diff --git a/public/language/lv/topic.json b/public/language/lv/topic.json index ce756e32d1..cf24cdebbe 100644 --- a/public/language/lv/topic.json +++ b/public/language/lv/topic.json @@ -182,6 +182,8 @@ "sort-by": "Kārtot", "oldest-to-newest": "No vecākā līdz jaunākam", "newest-to-oldest": "No jaunākā līdz vecākam", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Pēc visvairāk balsojumu", "most-posts": "Pēc visvairāk rakstu", "most-views": "Most Views", diff --git a/public/language/ms/admin/settings/post.json b/public/language/ms/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/ms/admin/settings/post.json +++ b/public/language/ms/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json index c7447ddc19..6c00d3eca9 100644 --- a/public/language/ms/topic.json +++ b/public/language/ms/topic.json @@ -182,6 +182,8 @@ "sort-by": "Susun ikut", "oldest-to-newest": "Lama ke Baru", "newest-to-oldest": "Baru ke Lama", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/nb/admin/settings/post.json b/public/language/nb/admin/settings/post.json index 93140ebb23..5b6aa90662 100644 --- a/public/language/nb/admin/settings/post.json +++ b/public/language/nb/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Standard trådsortering", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index cf94412757..534e88072e 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -182,6 +182,8 @@ "sort-by": "Sorter etter", "oldest-to-newest": "Eldste til nyeste", "newest-to-oldest": "Nyeste til eldste", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Flest stemmer", "most-posts": "Flest innlegg", "most-views": "Flest visninger", diff --git a/public/language/nl/admin/settings/post.json b/public/language/nl/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/nl/admin/settings/post.json +++ b/public/language/nl/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index 68dc65ad52..67ad9f78b1 100644 --- a/public/language/nl/topic.json +++ b/public/language/nl/topic.json @@ -182,6 +182,8 @@ "sort-by": "Sorteer op", "oldest-to-newest": "Oudste berichten bovenaan", "newest-to-oldest": "Meest recente berichten bovenaan", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Meeste stemmen", "most-posts": "Meeste berichten", "most-views": "Most Views", diff --git a/public/language/pl/admin/settings/post.json b/public/language/pl/admin/settings/post.json index e974aafec3..4b9335de79 100644 --- a/public/language/pl/admin/settings/post.json +++ b/public/language/pl/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Domyślne sortowanie postów", "sorting.oldest-to-newest": "Od najstarszych do najnowszych", "sorting.newest-to-oldest": "Od najnowszych do najstarszych", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Najwięcej głosów", "sorting.most-posts": "Najwięcej postów", + "sorting.most-views": "Most Views", "sorting.topic-default": "Domyślne sortowanie tematów", "length": "Długość postu", "post-queue": "Kolejka postów", diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index 7988d61407..a54d668e71 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -182,6 +182,8 @@ "sort-by": "Sortuj według", "oldest-to-newest": "Najpierw najstarsze", "newest-to-oldest": "Najpierw najnowsze", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Najwięcej głosów", "most-posts": "Najwięcej postów", "most-views": "Najwięcej wyświetleń", diff --git a/public/language/pt-BR/admin/settings/post.json b/public/language/pt-BR/admin/settings/post.json index b295b0f9ad..a1bb47bd03 100644 --- a/public/language/pt-BR/admin/settings/post.json +++ b/public/language/pt-BR/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Ordenação Padrão de Posts", "sorting.oldest-to-newest": "Do Mais Antigo para o Mais Recente", "sorting.newest-to-oldest": "Do Mais Recente para o Mais Antigo", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Mais Votados", "sorting.most-posts": "Mais postados", + "sorting.most-views": "Most Views", "sorting.topic-default": "Ordenação Padrão de Tópicos", "length": "Tamanho do Post", "post-queue": "Fila de Posts", diff --git a/public/language/pt-BR/topic.json b/public/language/pt-BR/topic.json index 26e65f9d94..5413887db1 100644 --- a/public/language/pt-BR/topic.json +++ b/public/language/pt-BR/topic.json @@ -182,6 +182,8 @@ "sort-by": "Ordenar por", "oldest-to-newest": "Mais Antigo para Mais Recente", "newest-to-oldest": "Mais Recente para Mais Antigo", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Mais Votados", "most-posts": "Mais Postagens", "most-views": "Most Views", diff --git a/public/language/pt-PT/admin/settings/post.json b/public/language/pt-PT/admin/settings/post.json index 9c8ed3da74..c24f6978b7 100644 --- a/public/language/pt-PT/admin/settings/post.json +++ b/public/language/pt-PT/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Ordenação Predefinida das Publicações", "sorting.oldest-to-newest": "Mais antigo para mais recente", "sorting.newest-to-oldest": "Mais recente para mais antigo", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Mais votos", "sorting.most-posts": "Mais publicações", + "sorting.most-views": "Most Views", "sorting.topic-default": "Ordenação Predefinida dos Tópicos", "length": "Comprimento da Publicação", "post-queue": "Fila de Espera para Publicações", diff --git a/public/language/pt-PT/topic.json b/public/language/pt-PT/topic.json index d9e498eee0..68fa758481 100644 --- a/public/language/pt-PT/topic.json +++ b/public/language/pt-PT/topic.json @@ -182,6 +182,8 @@ "sort-by": "Dispor por", "oldest-to-newest": "Do mais antigo para o mais recente", "newest-to-oldest": "Mais recente para mais antigo", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Mais votos", "most-posts": "Mais publicações", "most-views": "Most Views", diff --git a/public/language/ro/admin/settings/post.json b/public/language/ro/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/ro/admin/settings/post.json +++ b/public/language/ro/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json index ab684b1030..c27e166051 100644 --- a/public/language/ro/topic.json +++ b/public/language/ro/topic.json @@ -182,6 +182,8 @@ "sort-by": "Sortează de la", "oldest-to-newest": "Vechi la Noi", "newest-to-oldest": "Noi la Vechi", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/ru/admin/settings/post.json b/public/language/ru/admin/settings/post.json index 3f08482a79..cc80f8805f 100644 --- a/public/language/ru/admin/settings/post.json +++ b/public/language/ru/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Стандартная сортировка сообщений", "sorting.oldest-to-newest": "Сначала старые", "sorting.newest-to-oldest": "Сначала новые", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "По количеству голосов", "sorting.most-posts": "По количеству сообщений", + "sorting.most-views": "Most Views", "sorting.topic-default": "Стандартная сортировка тем", "length": "Длина сообщения", "post-queue": "Очередь на публикацию", diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index f6f0e56c9b..c086826cfc 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -182,6 +182,8 @@ "sort-by": "Сортировка", "oldest-to-newest": "Сначала старые", "newest-to-oldest": "Сначала новые", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "По количеству голосов", "most-posts": "По количеству сообщений", "most-views": "Наиболее Просматриваемые", diff --git a/public/language/rw/admin/settings/post.json b/public/language/rw/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/rw/admin/settings/post.json +++ b/public/language/rw/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json index dd03f73e7e..078607af9d 100644 --- a/public/language/rw/topic.json +++ b/public/language/rw/topic.json @@ -182,6 +182,8 @@ "sort-by": "Ubigaragaze Ukurikije", "oldest-to-newest": "Ibya Kera Ujya ku bya Vuba", "newest-to-oldest": "Ibya Vuba Ujya ku bya Kera", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/sc/admin/settings/post.json b/public/language/sc/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/sc/admin/settings/post.json +++ b/public/language/sc/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json index f8a036b91e..0c7da34603 100644 --- a/public/language/sc/topic.json +++ b/public/language/sc/topic.json @@ -182,6 +182,8 @@ "sort-by": "Sort by", "oldest-to-newest": "Oldest to Newest", "newest-to-oldest": "Newest to Oldest", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/sk/admin/settings/post.json b/public/language/sk/admin/settings/post.json index a9d0b790a0..3613cefc74 100644 --- a/public/language/sk/admin/settings/post.json +++ b/public/language/sk/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Predvolené triedenie príspevkov", "sorting.oldest-to-newest": "Od najstarších po najnovšie", "sorting.newest-to-oldest": "Od najnovších po najstaršie", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Podľa počtu hlasov", "sorting.most-posts": "Podľa počtu príspevkov", + "sorting.most-views": "Most Views", "sorting.topic-default": "Predvolené zoradenie tém", "length": "Dĺžka príspevku", "post-queue": "Post Queue", diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json index 19c50d38fb..ae5a31da54 100644 --- a/public/language/sk/topic.json +++ b/public/language/sk/topic.json @@ -182,6 +182,8 @@ "sort-by": "Zoradiť podľa", "oldest-to-newest": "Od najstarších po najnovšie", "newest-to-oldest": "Od najnovších po najstaršie", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "S najviac hlasmi", "most-posts": "S najviac príspevkami", "most-views": "Most Views", diff --git a/public/language/sl/admin/settings/post.json b/public/language/sl/admin/settings/post.json index 22fe7287c5..75d858edcc 100644 --- a/public/language/sl/admin/settings/post.json +++ b/public/language/sl/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Privzeto razvrščanje objav", "sorting.oldest-to-newest": "Najstarejše do najnovejše", "sorting.newest-to-oldest": "Najnovejše do najstarejše", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Največ glasov", "sorting.most-posts": "Največ objav", + "sorting.most-views": "Most Views", "sorting.topic-default": "Privzeto razvrščanje tem", "length": "Dolžina objave", "post-queue": "Čakalna vrsta objav", diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json index aa9c733452..08864fb58e 100644 --- a/public/language/sl/topic.json +++ b/public/language/sl/topic.json @@ -182,6 +182,8 @@ "sort-by": "Razvrsti po", "oldest-to-newest": "Od starejšega do novejšega", "newest-to-oldest": "Od novejšega do starejšega", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Največ glasov", "most-posts": "Največ objav", "most-views": "Največ ogledov", diff --git a/public/language/sq-AL/admin/settings/post.json b/public/language/sq-AL/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/sq-AL/admin/settings/post.json +++ b/public/language/sq-AL/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/sq-AL/topic.json b/public/language/sq-AL/topic.json index 60b085a41c..04cdeac337 100644 --- a/public/language/sq-AL/topic.json +++ b/public/language/sq-AL/topic.json @@ -182,6 +182,8 @@ "sort-by": "Rendit sipas", "oldest-to-newest": "Nga më e vjetra tek më e reja", "newest-to-oldest": "Nga më e reja tek më e vjetra", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Më të votuarat", "most-posts": "Të gjitha postimet", "most-views": "Më të shikuarat", diff --git a/public/language/sr/admin/settings/post.json b/public/language/sr/admin/settings/post.json index ae1433efe6..297d8e6703 100644 --- a/public/language/sr/admin/settings/post.json +++ b/public/language/sr/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Uobičajeno sortiranje postova", "sorting.oldest-to-newest": "Od starijih ka novijim", "sorting.newest-to-oldest": "Od novijih ka starijim", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Najviše glasova", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Uobičajeno sortiranje tema", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json index d8af7e11e1..4a87f40845 100644 --- a/public/language/sr/topic.json +++ b/public/language/sr/topic.json @@ -182,6 +182,8 @@ "sort-by": "Сортирај", "oldest-to-newest": "Од старијих ка новијим", "newest-to-oldest": "Од новијих ка старијим", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Највише гласова", "most-posts": "Највише порука", "most-views": "Највише прегледа", diff --git a/public/language/sv/admin/settings/post.json b/public/language/sv/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/sv/admin/settings/post.json +++ b/public/language/sv/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index 49a20d1abb..62ca0b117b 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -182,6 +182,8 @@ "sort-by": "Sortera på", "oldest-to-newest": "Äldst till nyaste", "newest-to-oldest": "Nyaste till äldst", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Flest röster", "most-posts": "Flest inlägg", "most-views": "Most Views", diff --git a/public/language/th/admin/settings/post.json b/public/language/th/admin/settings/post.json index c93c901455..e000f6b10b 100644 --- a/public/language/th/admin/settings/post.json +++ b/public/language/th/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", + "sorting.most-views": "Most Views", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/th/topic.json b/public/language/th/topic.json index b5bb04833d..b20dd2603f 100644 --- a/public/language/th/topic.json +++ b/public/language/th/topic.json @@ -182,6 +182,8 @@ "sort-by": "เรียงตาม", "oldest-to-newest": "เก่าสุดไปยังใหม่สุด", "newest-to-oldest": "ใหม่สุดไปยังเก่าสุด", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Most Votes", "most-posts": "Most Posts", "most-views": "Most Views", diff --git a/public/language/tr/admin/settings/post.json b/public/language/tr/admin/settings/post.json index 09cc14c3f1..01162a2a95 100644 --- a/public/language/tr/admin/settings/post.json +++ b/public/language/tr/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Varsayılan İleti Sıralaması", "sorting.oldest-to-newest": "En Eskiden En Yeniye", "sorting.newest-to-oldest": "En Yeniden En Eskiye", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "En Çok Oylanan", "sorting.most-posts": "En çok yazılanlar", + "sorting.most-views": "Most Views", "sorting.topic-default": "Varsayılan Konu Sıralaması", "length": "İleti Uzunluğu", "post-queue": "İleti Kuyruğu", diff --git a/public/language/tr/admin/settings/user.json b/public/language/tr/admin/settings/user.json index 7061d9ad63..4a2d1720ee 100644 --- a/public/language/tr/admin/settings/user.json +++ b/public/language/tr/admin/settings/user.json @@ -79,7 +79,7 @@ "follow-replied-topics": "Cevap verdiğim konuları takip et", "default-notification-settings": "Varsayılan bildirim ayarları", "categoryWatchState": "Varsayılan kategori izlenme durumu", - "categoryWatchState.tracking": "Tracking", + "categoryWatchState.tracking": "İzleniyor", "categoryWatchState.notwatching": "Takip edilmiyor", "categoryWatchState.ignoring": "Yok sayılıyor", "restrictions-new": "Yeni kullanıcı kısıtlamaları", diff --git a/public/language/tr/category.json b/public/language/tr/category.json index 1473237eea..cb38c05ace 100644 --- a/public/language/tr/category.json +++ b/public/language/tr/category.json @@ -4,21 +4,21 @@ "new-topic-button": "Yeni Başlık", "guest-login-post": "Giriş Yap", "no-topics": " Bu kategoride hiç konu yok.
Yeni bir konu oluşturmak istemez misiniz?", - "browsing": "gözden geçiriliyor", + "browsing": "göz gezdiriyor", "no-replies": "Kimse yanıtlamadı", "no-new-posts": "Yeni ileti yok", "watch": "Takip et", "ignore": "Yok say", "watching": "Takip ediliyor", - "tracking": "Tracking", + "tracking": "İzleniyor", "not-watching": "Takip edilmiyor", "ignoring": "Yok sayılıyor", - "watching.description": "Notify me of new topics.
Show topics in unread & recent", - "tracking.description": "Shows topics in unread & recent", + "watching.description": "Yeni bir başlık oluşturulunca bana bildir.
Bu kategorideki konuları, okunmamış konular ve güncel konular arasında göster", + "tracking.description": "Bu kategorideki konuları, okunmamış konular ve güncel konular arasında göster", "not-watching.description": "Bu kategorideki konuları, okunmamış konular arasında gösterme; ama güncel konular arasında göster", - "ignoring.description": "Do not show topics in unread & recent", + "ignoring.description": "Bu kategorideki konuları, okunmamış konular ve güncel konular arasında gösterme", "watching.message": "Bu kategori ve alt kategorilerindeki güncellemeleri artık takip ediyorsunuz", - "tracking.message": "You are now tracking updates from this category and all subcategories", + "tracking.message": "Artık bu kategori ve tüm alt kategorilerini izliyorsunuz ", "notwatching.message": "Bu kategori ve alt kategorilerindeki güncellemeleri artık takip etmiyorsunuz", "ignoring.message": "Bu kategori ve alt kategorilerindeki güncellemeleri artık yok sayıyorsunuz", "watched-categories": "Takip edilen kategoriler", diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index 60cd7ba8ab..16bcde79fc 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -15,7 +15,7 @@ "replies-to-this-post": "%1 Cevap", "one-reply-to-this-post": "1 Cevap", "last-reply-time": "Son cevap", - "reply-options": "Reply options", + "reply-options": "Cevaplama Seçenekleri", "reply-as-topic": "Yeni başlık oluşturarak cevapla", "guest-login-reply": "Cevaplamak için giriş yapın", "login-to-view": "🔒 Görüntülemek için giriş yap!", @@ -35,7 +35,7 @@ "pinned": "Sabitlendi", "pinned-with-expiry": "%1 tarihine kadar sabitlendi", "scheduled": "Konu Zamanlandı", - "deleted": "Deleted", + "deleted": "Silindi", "moved": "Taşındı", "moved-from": "Şuradan taşındı: %1", "copy-code": "Kodu kopyala", @@ -45,7 +45,7 @@ "wrote-ago": " yazdı", "wrote-on": " tarihinde yazdı", "replied-to-user-ago": "%3 başlığına cevap verdi", - "replied-to-user-on": "replied to %3 on ", + "replied-to-user-on": "%3 başlığına tarihinde cevap verdi", "user-locked-topic-ago": "%1 , %2 bu başlığı kilitledi", "user-locked-topic-on": "%1 , %2 tarihinde bu başlığı kilitledi", "user-unlocked-topic-ago": "%1 , %2 bu başlığın kilidini kaldırdı", @@ -73,7 +73,7 @@ "view-flag-report": "Şikayet raporunu görüntüle", "resolve-flag": "Şikayeti Çözümle", "merged-message": "Bu başlık %2 ile birleştirildi", - "forked-message": "This topic was forked from %2", + "forked-message": "Bu başlık %2 başlığından bölünerek ayırıldı", "deleted-message": "Bu başlık silindi. Sadece başlık düzenleme yetkisi olan kullanıcılar görebilir.", "following-topic.message": "Artık bir kullanıcı bu konuya yeni ileti gönderdiğinde siz de bildirim alacaksınız.", "not-following-topic.message": "Bu konuyu \"Okunmamış\" listesinde göreceksiniz, ama bir kullanıcı yeni bir ileti yazdığında bildirim gelmeyecek.", @@ -182,6 +182,8 @@ "sort-by": "Sırala", "oldest-to-newest": "En eskiden en yeniye", "newest-to-oldest": "En yeniden en eskiye", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "En çok oylanan", "most-posts": "En çok ileti yazılan", "most-views": "Çok Görüntülenen", @@ -206,13 +208,13 @@ "last-post": "Son ileti", "go-to-my-next-post": "Diğer iletime git", "no-more-next-post": "Bu başlıkta başka bir iletiniz bulunmamaktadır.", - "open-composer": "Open composer", + "open-composer": "Yazı alanını aç", "post-quick-reply": "Hızlı Yanıt Gönder", "navigator.index": "Post %1 of %2", "navigator.unread": "%1 Okunmamış", - "upvote-post": "Upvote post", - "downvote-post": "Downvote post", - "post-tools": "Post tools", - "unread-posts-link": "Unread posts link", - "thumb-image": "Topic thumbnail image" + "upvote-post": "İletiye artı oy ver", + "downvote-post": "İletiye eksi oy ver", + "post-tools": "İleti araçları", + "unread-posts-link": "Okunmamış iletilerin bağlantısı", + "thumb-image": "Başlık önizleme görüntüsü" } \ No newline at end of file diff --git a/public/language/tr/user.json b/public/language/tr/user.json index 43485e34e0..ca6dd6e33e 100644 --- a/public/language/tr/user.json +++ b/public/language/tr/user.json @@ -1,5 +1,5 @@ { - "user-menu": "User menu", + "user-menu": "Kullanıcı menüsü", "banned": "Yasaklı", "muted": "Sessiz", "offline": "Çevrimdışı", diff --git a/public/language/uk/admin/settings/post.json b/public/language/uk/admin/settings/post.json index b255b3183f..bf77a95074 100644 --- a/public/language/uk/admin/settings/post.json +++ b/public/language/uk/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Типове сортування постів", "sorting.oldest-to-newest": "Старі > Нові", "sorting.newest-to-oldest": "Нові > Старі", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Кількість голосів", "sorting.most-posts": "Кількість постів", + "sorting.most-views": "Most Views", "sorting.topic-default": "Типове сортування тем", "length": "Довжина посту", "post-queue": "Post Queue", diff --git a/public/language/uk/topic.json b/public/language/uk/topic.json index 4e8447bb30..5caddfef49 100644 --- a/public/language/uk/topic.json +++ b/public/language/uk/topic.json @@ -182,6 +182,8 @@ "sort-by": "Сортувати за", "oldest-to-newest": "Старі > Нові", "newest-to-oldest": "Нові > Старі", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Найбільше Голосів", "most-posts": "Найбільше Постів", "most-views": "Most Views", diff --git a/public/language/vi/admin/settings/post.json b/public/language/vi/admin/settings/post.json index 2eb0403bd9..6c8b908d96 100644 --- a/public/language/vi/admin/settings/post.json +++ b/public/language/vi/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "Sắp Xếp Bài Đăng Mặc Định", "sorting.oldest-to-newest": "Cũ nhất đến Mới nhất", "sorting.newest-to-oldest": "Mới nhất đến Cũ nhất", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "Nhiều Bình Chọn", "sorting.most-posts": "Nhiều Bài Đăng", + "sorting.most-views": "Most Views", "sorting.topic-default": "Sắp Xếp Chủ Đề Mặc Định", "length": "Độ Dài Bài Đăng", "post-queue": "Xếp Hàng Bài Đăng", diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json index 331e3794ad..84b7d27226 100644 --- a/public/language/vi/topic.json +++ b/public/language/vi/topic.json @@ -182,6 +182,8 @@ "sort-by": "Sắp xếp theo", "oldest-to-newest": "Cũ đến mới", "newest-to-oldest": "Mới đến cũ", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "Nhiều Bình Chọn", "most-posts": "Nhiều Bài Đăng", "most-views": "Xem Nhiều", diff --git a/public/language/zh-CN/admin/settings/post.json b/public/language/zh-CN/admin/settings/post.json index d70b1a78fc..b123295c1e 100644 --- a/public/language/zh-CN/admin/settings/post.json +++ b/public/language/zh-CN/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "默认帖子排序", "sorting.oldest-to-newest": "从旧到新", "sorting.newest-to-oldest": "从新到旧", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "最多点赞", "sorting.most-posts": "最多回复", + "sorting.most-views": "Most Views", "sorting.topic-default": "默认主题排序", "length": "帖子字数", "post-queue": "发帖队列", diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json index 4bd2cb34d2..3ccd7422bc 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -182,6 +182,8 @@ "sort-by": "排序", "oldest-to-newest": "从旧到新", "newest-to-oldest": "从新到旧", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "最多赞同", "most-posts": "回复最多", "most-views": "最多浏览", diff --git a/public/language/zh-TW/admin/settings/post.json b/public/language/zh-TW/admin/settings/post.json index 244d966e3b..7703c04881 100644 --- a/public/language/zh-TW/admin/settings/post.json +++ b/public/language/zh-TW/admin/settings/post.json @@ -4,8 +4,11 @@ "sorting.post-default": "預設貼文排序", "sorting.oldest-to-newest": "從舊到新", "sorting.newest-to-oldest": "從新到舊", + "sorting.recently-replied": "Recently Replied", + "sorting.recently-created": "Recently Created", "sorting.most-votes": "最多點贊", "sorting.most-posts": "最多回覆", + "sorting.most-views": "Most Views", "sorting.topic-default": "預設主題排序", "length": "貼文字數", "post-queue": "貼文隊列", diff --git a/public/language/zh-TW/topic.json b/public/language/zh-TW/topic.json index ded9f8959f..c78a0ab60d 100644 --- a/public/language/zh-TW/topic.json +++ b/public/language/zh-TW/topic.json @@ -182,6 +182,8 @@ "sort-by": "排序", "oldest-to-newest": "從舊到新", "newest-to-oldest": "從新到舊", + "recently-replied": "Recently Replied", + "recently-created": "Recently Created", "most-votes": "最多點贊", "most-posts": "回覆最多", "most-views": "Most Views", diff --git a/src/api/categories.js b/src/api/categories.js index c825d4fa2e..9a43a81526 100644 --- a/src/api/categories.js +++ b/src/api/categories.js @@ -124,7 +124,7 @@ categoriesAPI.getTopics = async (caller, data) => { } const infScrollTopicsPerPage = 20; - const sort = data.sort || data.categoryTopicSort || meta.config.categoryTopicSort || 'newest_to_oldest'; + const sort = data.sort || data.categoryTopicSort || meta.config.categoryTopicSort || 'recently_replied'; let start = Math.max(0, parseInt(data.after || 0, 10)); diff --git a/src/categories/topics.js b/src/categories/topics.js index 67695ec4c0..1a2a259f3d 100644 --- a/src/categories/topics.js +++ b/src/categories/topics.js @@ -27,10 +27,9 @@ module.exports = function (Categories) { }; Categories.getTopicIds = async function (data) { - const [pinnedTids, set, direction] = await Promise.all([ + const [pinnedTids, set] = await Promise.all([ Categories.getPinnedTids({ ...data, start: 0, stop: -1 }), Categories.buildTopicsSortedSet(data), - Categories.getSortedSetRangeDirection(data.sort), ]); const totalPinnedCount = pinnedTids.length; @@ -62,12 +61,11 @@ module.exports = function (Categories) { const stop = data.stop === -1 ? data.stop : start + normalTidsToGet - 1; let normalTids; - const reverse = direction === 'highest-to-lowest'; if (Array.isArray(set)) { const weights = set.map((s, index) => (index ? 0 : 1)); - normalTids = await db[reverse ? 'getSortedSetRevIntersect' : 'getSortedSetIntersect']({ sets: set, start: start, stop: stop, weights: weights }); + normalTids = await db.getSortedSetRevIntersect({ sets: set, start: start, stop: stop, weights: weights }); } else { - normalTids = await db[reverse ? 'getSortedSetRevRange' : 'getSortedSetRange'](set, start, stop); + normalTids = await db.getSortedSetRevRange(set, start, stop); } normalTids = normalTids.filter(tid => !pinnedTids.includes(tid)); return pinnedTidsOnPage.concat(normalTids); @@ -92,16 +90,16 @@ module.exports = function (Categories) { Categories.buildTopicsSortedSet = async function (data) { const { cid } = data; - let set = `cid:${cid}:tids`; - const sort = data.sort || (data.settings && data.settings.categoryTopicSort) || meta.config.categoryTopicSort || 'newest_to_oldest'; + const sort = data.sort || (data.settings && data.settings.categoryTopicSort) || meta.config.categoryTopicSort || 'recently_replied'; + const sortToSet = { + recently_replied: `cid:${cid}:tids`, + recently_created: `cid:${cid}:tids:create`, + most_posts: `cid:${cid}:tids:posts`, + most_votes: `cid:${cid}:tids:votes`, + most_views: `cid:${cid}:tids:views`, + }; - if (sort === 'most_posts') { - set = `cid:${cid}:tids:posts`; - } else if (sort === 'most_votes') { - set = `cid:${cid}:tids:votes`; - } else if (sort === 'most_views') { - set = `cid:${cid}:tids:views`; - } + let set = sortToSet.hasOwnProperty(sort) ? sortToSet[sort] : `cid:${cid}:tids`; if (data.tag) { if (Array.isArray(data.tag)) { @@ -123,7 +121,8 @@ module.exports = function (Categories) { }; Categories.getSortedSetRangeDirection = async function (sort) { - sort = sort || 'newest_to_oldest'; + console.warn('[deprecated] Will be removed in 4.x'); + sort = sort || 'recently_replied'; const direction = ['newest_to_oldest', 'most_posts', 'most_votes', 'most_views'].includes(sort) ? 'highest-to-lowest' : 'lowest-to-highest'; const result = await plugins.hooks.fire('filter:categories.getSortedSetRangeDirection', { sort: sort, diff --git a/src/controllers/api.js b/src/controllers/api.js index 30be616d8e..22574a9ce6 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -69,7 +69,7 @@ apiController.loadConfig = async function (req) { uid: req.uid, 'cache-buster': meta.config['cache-buster'] || '', topicPostSort: meta.config.topicPostSort || 'oldest_to_newest', - categoryTopicSort: meta.config.categoryTopicSort || 'newest_to_oldest', + categoryTopicSort: meta.config.categoryTopicSort || 'recently_replied', csrf_token: req.uid >= 0 ? generateToken(req) : false, searchEnabled: plugins.hooks.hasListeners('filter:search.query'), searchDefaultInQuick: meta.config.searchDefaultInQuick || 'titles', diff --git a/src/controllers/category.js b/src/controllers/category.js index 2f0f7d85ad..487ea21cce 100644 --- a/src/controllers/category.js +++ b/src/controllers/category.js @@ -20,7 +20,9 @@ const categoryController = module.exports; const url = nconf.get('url'); const relative_path = nconf.get('relative_path'); -const validSorts = ['newest_to_oldest', 'oldest_to_newest', 'most_posts', 'most_votes', 'most_views']; +const validSorts = [ + 'recently_replied', 'recently_created', 'most_posts', 'most_votes', 'most_views', +]; categoryController.get = async function (req, res, next) { const cid = req.params.category_id; diff --git a/src/database/mongo/hash.js b/src/database/mongo/hash.js index c6616a3049..b428d9926b 100644 --- a/src/database/mongo/hash.js +++ b/src/database/mongo/hash.js @@ -125,20 +125,20 @@ module.exports = function (module) { } const cachedData = {}; const unCachedKeys = cache.getUnCachedKeys(keys, cachedData); - let data = []; + if (unCachedKeys.length >= 1) { - data = await module.client.collection('objects').find( + let data = await module.client.collection('objects').find( { _key: unCachedKeys.length === 1 ? unCachedKeys[0] : { $in: unCachedKeys } }, { projection: { _id: 0 } } ).toArray(); data = data.map(helpers.deserializeData); - } - const map = helpers.toMap(data); - unCachedKeys.forEach((key) => { - cachedData[key] = map[key] || null; - cache.set(key, cachedData[key]); - }); + const map = helpers.toMap(data); + unCachedKeys.forEach((key) => { + cachedData[key] = map[key] || null; + cache.set(key, cachedData[key]); + }); + } if (!Array.isArray(fields) || !fields.length) { return keys.map(key => (cachedData[key] ? { ...cachedData[key] } : null)); diff --git a/src/topics/delete.js b/src/topics/delete.js index 75472ffc69..5190afd1ff 100644 --- a/src/topics/delete.js +++ b/src/topics/delete.js @@ -110,6 +110,7 @@ module.exports = function (Topics) { db.sortedSetsRemove([ `cid:${topicData.cid}:tids`, `cid:${topicData.cid}:tids:pinned`, + `cid:${topicData.cid}:tids:create`, `cid:${topicData.cid}:tids:posts`, `cid:${topicData.cid}:tids:lastposttime`, `cid:${topicData.cid}:tids:votes`, diff --git a/src/topics/scheduled.js b/src/topics/scheduled.js index 240a7f89e4..9ba4908322 100644 --- a/src/topics/scheduled.js +++ b/src/topics/scheduled.js @@ -60,6 +60,7 @@ Scheduled.pin = async function (tid, topicData) { db.sortedSetAdd(`cid:${topicData.cid}:tids:pinned`, Date.now(), tid), db.sortedSetsRemove([ `cid:${topicData.cid}:tids`, + `cid:${topicData.cid}:tids:create`, `cid:${topicData.cid}:tids:posts`, `cid:${topicData.cid}:tids:votes`, `cid:${topicData.cid}:tids:views`, @@ -98,6 +99,7 @@ function unpin(tid, topicData) { db.sortedSetRemove(`cid:${topicData.cid}:tids:pinned`, tid), db.sortedSetAddBulk([ [`cid:${topicData.cid}:tids`, topicData.lastposttime, tid], + [`cid:${topicData.cid}:tids:create`, topicData.timestamp, tid], [`cid:${topicData.cid}:tids:posts`, topicData.postcount, tid], [`cid:${topicData.cid}:tids:votes`, parseInt(topicData.votes, 10) || 0, tid], [`cid:${topicData.cid}:tids:views`, topicData.viewcount, tid], diff --git a/src/topics/suggested.js b/src/topics/suggested.js index db59759a87..2d6f7db99c 100644 --- a/src/topics/suggested.js +++ b/src/topics/suggested.js @@ -65,7 +65,7 @@ module.exports = function (Topics) { const cid = await Topics.getTopicField(tid, 'cid'); const tids = cutoff === 0 ? await db.getSortedSetRevRange(`cid:${cid}:tids:lastposttime`, 0, 9) : - await db.getSortedSetRevRangeByScore(`cid:${cid}:tids:lastposttime`, 0, 9, '+inf', Date.now() - cutoff); + await db.getSortedSetRevRangeByScore(`cid:${cid}:tids:lastposttime`, 0, 10, '+inf', Date.now() - cutoff); return _.shuffle(tids.map(Number).filter(_tid => _tid !== tid)); } }; diff --git a/src/topics/tools.js b/src/topics/tools.js index be38f97209..cadeb95563 100644 --- a/src/topics/tools.js +++ b/src/topics/tools.js @@ -171,6 +171,7 @@ module.exports = function (Topics) { promises.push(db.sortedSetAdd(`cid:${topicData.cid}:tids:pinned`, Date.now(), tid)); promises.push(db.sortedSetsRemove([ `cid:${topicData.cid}:tids`, + `cid:${topicData.cid}:tids:create`, `cid:${topicData.cid}:tids:posts`, `cid:${topicData.cid}:tids:votes`, `cid:${topicData.cid}:tids:views`, @@ -180,6 +181,7 @@ module.exports = function (Topics) { promises.push(Topics.deleteTopicField(tid, 'pinExpiry')); promises.push(db.sortedSetAddBulk([ [`cid:${topicData.cid}:tids`, topicData.lastposttime, tid], + [`cid:${topicData.cid}:tids:create`, topicData.timestamp, tid], [`cid:${topicData.cid}:tids:posts`, topicData.postcount, tid], [`cid:${topicData.cid}:tids:votes`, parseInt(topicData.votes, 10) || 0, tid], [`cid:${topicData.cid}:tids:views`, topicData.viewcount, tid], @@ -242,6 +244,7 @@ module.exports = function (Topics) { const tags = await Topics.getTopicTags(tid); await db.sortedSetsRemove([ `cid:${topicData.cid}:tids`, + `cid:${topicData.cid}:tids:create`, `cid:${topicData.cid}:tids:pinned`, `cid:${topicData.cid}:tids:posts`, `cid:${topicData.cid}:tids:votes`, @@ -264,6 +267,7 @@ module.exports = function (Topics) { bulk.push([`cid:${cid}:tids:pinned`, Date.now(), tid]); } else { bulk.push([`cid:${cid}:tids`, topicData.lastposttime, tid]); + bulk.push([`cid:${cid}:tids:create`, topicData.timestamp, tid]); bulk.push([`cid:${cid}:tids:posts`, topicData.postcount, tid]); bulk.push([`cid:${cid}:tids:votes`, votes, tid]); bulk.push([`cid:${cid}:tids:views`, topicData.viewcount, tid]); diff --git a/src/upgrades/3.7.0/category-tid-created-zset.js b/src/upgrades/3.7.0/category-tid-created-zset.js new file mode 100644 index 0000000000..b7cb483a95 --- /dev/null +++ b/src/upgrades/3.7.0/category-tid-created-zset.js @@ -0,0 +1,31 @@ +'use strict'; + + +const db = require('../../database'); + +module.exports = { + name: 'New sorted set cid::tids:create', + timestamp: Date.UTC(2024, 2, 4), + method: async function () { + const { progress } = this; + const batch = require('../../batch'); + await batch.processSortedSet('topics:tid', async (tids) => { + let topicData = await db.getObjectsFields( + tids.map(tid => `topic:${tid}`), + ['tid', 'cid', 'timestamp'] + ); + topicData = topicData.filter(Boolean); + topicData.forEach((t) => { + t.timestamp = t.timestamp || Date.now(); + }); + + await db.sortedSetAddBulk( + topicData.map(t => ([`cid:${t.cid}:tids:create`, t.timestamp, t.tid])) + ); + + progress.incr(tids.length); + }, { + progress: this.progress, + }); + }, +}; diff --git a/src/upgrades/3.7.0/change-category-sort-settings.js b/src/upgrades/3.7.0/change-category-sort-settings.js new file mode 100644 index 0000000000..a5095dc775 --- /dev/null +++ b/src/upgrades/3.7.0/change-category-sort-settings.js @@ -0,0 +1,37 @@ +'use strict'; + + +const db = require('../../database'); +const batch = require('../../batch'); + +module.exports = { + name: 'Change category sort settings', + timestamp: Date.UTC(2024, 2, 4), + method: async function () { + const { progress } = this; + + const currentSort = await db.getObjectField('config', 'categoryTopicSort'); + if (currentSort === 'oldest_to_newest' || currentSort === 'newest_to_oldest') { + await db.setObjectField('config', 'categoryTopicSort', 'recently_replied'); + } + + await batch.processSortedSet('users:joindate', async (uids) => { + progress.incr(uids.length); + const usersSettings = await db.getObjects(uids.map(uid => `user:${uid}:settings`)); + const bulkSet = []; + usersSettings.forEach((userSetting, i) => { + if (userSetting && ( + userSetting.categoryTopicSort === 'newest_to_oldest' || + userSetting.categoryTopicSort === 'oldest_to_newest')) { + bulkSet.push([ + `user:${uids[i]}:settings`, { categoryTopicSort: 'recently_replied' }, + ]); + } + }); + await db.setObjectBulk(bulkSet); + }, { + batch: 500, + progress: progress, + }); + }, +}; diff --git a/src/user/settings.js b/src/user/settings.js index 27d999b7cf..5390f37580 100644 --- a/src/user/settings.js +++ b/src/user/settings.js @@ -72,7 +72,7 @@ module.exports = function (User) { settings.userLang = settings.userLang || meta.config.defaultLang || 'en-GB'; settings.acpLang = settings.acpLang || settings.userLang; settings.topicPostSort = getSetting(settings, 'topicPostSort', 'oldest_to_newest'); - settings.categoryTopicSort = getSetting(settings, 'categoryTopicSort', 'newest_to_oldest'); + settings.categoryTopicSort = getSetting(settings, 'categoryTopicSort', 'recently_replied'); settings.followTopicsOnCreate = parseInt(getSetting(settings, 'followTopicsOnCreate', 1), 10) === 1; settings.followTopicsOnReply = parseInt(getSetting(settings, 'followTopicsOnReply', 0), 10) === 1; settings.upvoteNotifFreq = getSetting(settings, 'upvoteNotifFreq', 'all'); diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl index bd99f75a4a..d361597946 100644 --- a/src/views/admin/settings/post.tpl +++ b/src/views/admin/settings/post.tpl @@ -18,9 +18,11 @@