From d5578c990651e65ccbf67ed417c61835285c0c02 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 15 Jun 2020 14:09:44 -0400 Subject: [PATCH 01/13] fix: tests breaking due to #8406 --- test/posts.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/posts.js b/test/posts.js index 15a8e76f48..936c32dd9d 100644 --- a/test/posts.js +++ b/test/posts.js @@ -591,10 +591,12 @@ describe('Post\'s', function () { }); it('should allow registered-users group to view diffs', function (done) { - socketPosts.getDiffs({ uid: 1 }, { pid: 1 }, function (err, timestamps) { + socketPosts.getDiffs({ uid: 1 }, { pid: 1 }, function (err, data) { assert.ifError(err); - assert.equal(true, Array.isArray(timestamps)); - assert.strictEqual(1, timestamps.length); + assert.strictEqual('boolean', typeof data.editable); + assert.strictEqual(false, data.editable); + assert.equal(true, Array.isArray(data.timestamps)); + assert.strictEqual(1, data.timestamps.length); done(); }); }); From d5af976915c8900d5e27f42c2242b2b9c93eafe0 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 15 Jun 2020 14:22:59 -0400 Subject: [PATCH 02/13] feat: #8408 flags' quick assignment --- public/language/en-GB/flags.json | 1 + public/src/client/flags/detail.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/public/language/en-GB/flags.json b/public/language/en-GB/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/en-GB/flags.json +++ b/public/language/en-GB/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/src/client/flags/detail.js b/public/src/client/flags/detail.js index cdb1e4fc89..b847b4391f 100644 --- a/public/src/client/flags/detail.js +++ b/public/src/client/flags/detail.js @@ -13,6 +13,10 @@ define('forum/flags/detail', ['forum/flags/list', 'components', 'translator', 'b var uid = $(this).parents('[data-uid]').attr('data-uid'); switch (action) { + case 'assign': + $('#assignee').val(app.user.uid); + // falls through + case 'update': socket.emit('flags.update', { flagId: ajaxify.data.flagId, From 225cac1855daf72f1b8079633d5c1851c5f7a5fa Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 15 Jun 2020 14:24:55 -0400 Subject: [PATCH 03/13] fix(deps): bump persona/vanilla, closes #8408 --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index 3698e38071..6d47b2a836 100644 --- a/install/package.json +++ b/install/package.json @@ -90,9 +90,9 @@ "nodebb-plugin-spam-be-gone": "0.7.1", "nodebb-rewards-essentials": "0.1.3", "nodebb-theme-lavender": "5.0.11", - "nodebb-theme-persona": "10.1.51", + "nodebb-theme-persona": "10.1.52", "nodebb-theme-slick": "1.2.29", - "nodebb-theme-vanilla": "11.1.26", + "nodebb-theme-vanilla": "11.1.27", "nodebb-widget-essentials": "4.1.0", "nodemailer": "^6.4.6", "passport": "^0.4.1", From cdf81159df44dcec7e46489e2126ec016f679afb Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Mon, 15 Jun 2020 18:42:49 +0000 Subject: [PATCH 04/13] Latest translations and fallbacks --- public/language/ar/flags.json | 1 + public/language/ar/topic.json | 3 +++ public/language/bg/flags.json | 1 + public/language/bg/topic.json | 3 +++ public/language/bn/flags.json | 1 + public/language/bn/topic.json | 3 +++ public/language/cs/flags.json | 1 + public/language/cs/topic.json | 3 +++ public/language/da/flags.json | 1 + public/language/da/topic.json | 3 +++ public/language/de/flags.json | 1 + public/language/de/topic.json | 3 +++ public/language/el/flags.json | 1 + public/language/el/topic.json | 3 +++ public/language/en-US/flags.json | 1 + public/language/en-US/topic.json | 3 +++ public/language/en-x-pirate/flags.json | 1 + public/language/en-x-pirate/topic.json | 3 +++ public/language/es/flags.json | 1 + public/language/es/topic.json | 3 +++ public/language/et/flags.json | 1 + public/language/et/topic.json | 3 +++ public/language/fa-IR/flags.json | 1 + public/language/fa-IR/topic.json | 3 +++ public/language/fi/flags.json | 1 + public/language/fi/topic.json | 3 +++ public/language/fr/flags.json | 1 + public/language/fr/global.json | 2 +- public/language/fr/topic.json | 3 +++ public/language/gl/flags.json | 1 + public/language/gl/topic.json | 3 +++ public/language/he/flags.json | 1 + public/language/he/topic.json | 3 +++ public/language/hr/flags.json | 1 + public/language/hr/topic.json | 3 +++ public/language/hu/flags.json | 1 + public/language/hu/topic.json | 3 +++ public/language/id/flags.json | 1 + public/language/id/topic.json | 3 +++ public/language/it/flags.json | 1 + public/language/it/topic.json | 3 +++ public/language/ja/flags.json | 1 + public/language/ja/topic.json | 3 +++ public/language/ko/flags.json | 1 + public/language/ko/topic.json | 3 +++ public/language/lt/flags.json | 1 + public/language/lt/topic.json | 3 +++ public/language/lv/flags.json | 1 + public/language/lv/topic.json | 3 +++ public/language/ms/flags.json | 1 + public/language/ms/topic.json | 3 +++ public/language/nb/flags.json | 1 + public/language/nb/topic.json | 3 +++ public/language/nl/flags.json | 1 + public/language/nl/topic.json | 3 +++ public/language/pl/flags.json | 1 + public/language/pl/topic.json | 3 +++ public/language/pt-BR/flags.json | 1 + public/language/pt-BR/topic.json | 3 +++ public/language/pt-PT/flags.json | 1 + public/language/pt-PT/topic.json | 3 +++ public/language/ro/flags.json | 1 + public/language/ro/topic.json | 3 +++ public/language/ru/flags.json | 1 + public/language/ru/topic.json | 3 +++ public/language/rw/flags.json | 1 + public/language/rw/topic.json | 3 +++ public/language/sc/flags.json | 1 + public/language/sc/topic.json | 3 +++ public/language/sk/flags.json | 1 + public/language/sk/topic.json | 3 +++ public/language/sl/flags.json | 1 + public/language/sl/topic.json | 3 +++ public/language/sr/flags.json | 1 + public/language/sr/topic.json | 3 +++ public/language/sv/flags.json | 1 + public/language/sv/topic.json | 3 +++ public/language/th/flags.json | 1 + public/language/th/topic.json | 3 +++ public/language/tr/admin/manage/users.json | 6 +++--- public/language/tr/admin/settings/advanced.json | 2 +- public/language/tr/flags.json | 1 + public/language/tr/global.json | 2 +- public/language/tr/topic.json | 13 ++++++++----- public/language/tr/user.json | 8 ++++---- public/language/uk/topic.json | 3 +++ public/language/vi/flags.json | 1 + public/language/vi/topic.json | 3 +++ public/language/zh-CN/flags.json | 1 + public/language/zh-CN/topic.json | 3 +++ public/language/zh-TW/flags.json | 1 + public/language/zh-TW/topic.json | 3 +++ 92 files changed, 190 insertions(+), 15 deletions(-) diff --git a/public/language/ar/flags.json b/public/language/ar/flags.json index ad2bd5b252..83661216d5 100644 --- a/public/language/ar/flags.json +++ b/public/language/ar/flags.json @@ -32,6 +32,7 @@ "view-profile": "مشاهدة الملف الشخصي", "start-new-chat": "بدء محادثه جديده", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "حذف المشاركة", "purge-post": "Purge Post", "restore-post": "استرجاع المشاركة", diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index 2cae87b648..c148eeedc9 100644 --- a/public/language/ar/topic.json +++ b/public/language/ar/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/bg/flags.json b/public/language/bg/flags.json index acc0879d50..6bab4143b4 100644 --- a/public/language/bg/flags.json +++ b/public/language/bg/flags.json @@ -32,6 +32,7 @@ "view-profile": "Преглед на профила", "start-new-chat": "Започване на нов разговор", "go-to-target": "Преглед на целта на доклада", + "assign-to-me": "Assign To Me", "delete-post": "Изтриване на публикацията", "purge-post": "Изчистване на публикацията", "restore-post": "Възстановяване на публикацията", diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json index 35774bd54f..095221a9a6 100644 --- a/public/language/bg/topic.json +++ b/public/language/bg/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Тази публикация има %1 варианта.", "diffs.current-revision": "текуща версия", "diffs.original-revision": "оригинална версия", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 по-късно", "timeago_earlier": "%1 по-рано" } \ No newline at end of file diff --git a/public/language/bn/flags.json b/public/language/bn/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/bn/flags.json +++ b/public/language/bn/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json index e347e02bc1..ec950ff39e 100644 --- a/public/language/bn/topic.json +++ b/public/language/bn/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/cs/flags.json b/public/language/cs/flags.json index c780e8095d..9ee580e597 100644 --- a/public/language/cs/flags.json +++ b/public/language/cs/flags.json @@ -32,6 +32,7 @@ "view-profile": "Zobrazit profil", "start-new-chat": "Začít novou konverzaci", "go-to-target": "Zobrazit cílové označení", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index b77f694bc1..300b5b92f6 100644 --- a/public/language/cs/topic.json +++ b/public/language/cs/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Tento příspěvek má %1 změn.", "diffs.current-revision": "aktuální revize", "diffs.original-revision": "originální revize", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 později", "timeago_earlier": "%1 dříve" } \ No newline at end of file diff --git a/public/language/da/flags.json b/public/language/da/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/da/flags.json +++ b/public/language/da/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/da/topic.json b/public/language/da/topic.json index ff02404fff..7052f6cdf8 100644 --- a/public/language/da/topic.json +++ b/public/language/da/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/de/flags.json b/public/language/de/flags.json index 8eaf073b8f..a7834d988f 100644 --- a/public/language/de/flags.json +++ b/public/language/de/flags.json @@ -32,6 +32,7 @@ "view-profile": "Profil ansehen", "start-new-chat": "Neuen Chat beginnen", "go-to-target": "Meldungsziel ansehen", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/de/topic.json b/public/language/de/topic.json index ded786d03e..b15d97b5db 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Dieser Beitrag ha %1 Revisionen.", "diffs.current-revision": "Aktuelle Revision", "diffs.original-revision": "Ursprüngliche Revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 später", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/el/flags.json b/public/language/el/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/el/flags.json +++ b/public/language/el/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/el/topic.json b/public/language/el/topic.json index ef903a7e48..5ffde07295 100644 --- a/public/language/el/topic.json +++ b/public/language/el/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/en-US/flags.json b/public/language/en-US/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/en-US/flags.json +++ b/public/language/en-US/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/en-US/topic.json b/public/language/en-US/topic.json index d9a3ba9251..add804e10c 100644 --- a/public/language/en-US/topic.json +++ b/public/language/en-US/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/en-x-pirate/flags.json b/public/language/en-x-pirate/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/en-x-pirate/flags.json +++ b/public/language/en-x-pirate/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/en-x-pirate/topic.json b/public/language/en-x-pirate/topic.json index d9a3ba9251..add804e10c 100644 --- a/public/language/en-x-pirate/topic.json +++ b/public/language/en-x-pirate/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/es/flags.json b/public/language/es/flags.json index a91a35ed93..b339d0ba53 100644 --- a/public/language/es/flags.json +++ b/public/language/es/flags.json @@ -32,6 +32,7 @@ "view-profile": "Ver perfil", "start-new-chat": "Empezar nuevo chat", "go-to-target": "Ver objetivo marcado", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/es/topic.json b/public/language/es/topic.json index c379d5b1c9..9e759a09d9 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Este post ha tenido %1 revisión(es).", "diffs.current-revision": "revisión actual", "diffs.original-revision": "revisión original", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 después", "timeago_earlier": "%1 antes" } \ No newline at end of file diff --git a/public/language/et/flags.json b/public/language/et/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/et/flags.json +++ b/public/language/et/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/et/topic.json b/public/language/et/topic.json index 06ec75cf7f..c20b41d93f 100644 --- a/public/language/et/topic.json +++ b/public/language/et/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/fa-IR/flags.json b/public/language/fa-IR/flags.json index 203807dfeb..429cc12b9c 100644 --- a/public/language/fa-IR/flags.json +++ b/public/language/fa-IR/flags.json @@ -32,6 +32,7 @@ "view-profile": "نمایش پروفایل", "start-new-chat": "شروع چت جدید", "go-to-target": "مشاهده محتوای گزارش شده", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/fa-IR/topic.json b/public/language/fa-IR/topic.json index 7fe8080bf9..2d58f2f682 100644 --- a/public/language/fa-IR/topic.json +++ b/public/language/fa-IR/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "این پست %1 نسخه دارد.", "diffs.current-revision": "نسخه فعلی", "diffs.original-revision": "نسخه اصلی", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/fi/flags.json b/public/language/fi/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/fi/flags.json +++ b/public/language/fi/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index 8b84a7e264..817c1835df 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Tästä viestistä on %1 versiota", "diffs.current-revision": "nykyinen versio", "diffs.original-revision": "alkuperäinen versio", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 myöhempi", "timeago_earlier": "%1 aiempi" } \ No newline at end of file diff --git a/public/language/fr/flags.json b/public/language/fr/flags.json index 12de8b62c0..b580cb0fa0 100644 --- a/public/language/fr/flags.json +++ b/public/language/fr/flags.json @@ -32,6 +32,7 @@ "view-profile": "Voir le profil", "start-new-chat": "Démarrer un nouveau Chat", "go-to-target": "Voir le signalement cible", + "assign-to-me": "Me l'assigner", "delete-post": "Supprimer les messages", "purge-post": "Supprimer définitivement", "restore-post": "Restaurer les messages", diff --git a/public/language/fr/global.json b/public/language/fr/global.json index 57055bee26..4d1a21c843 100644 --- a/public/language/fr/global.json +++ b/public/language/fr/global.json @@ -30,7 +30,7 @@ "header.unread": "Non lus", "header.tags": "Mots-clés", "header.popular": "Populaire", - "header.top": "Top", + "header.top": "Haut", "header.users": "Utilisateurs", "header.groups": "Groupes", "header.chats": "Discussions", diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index 10778d13c4..4c7c7dcf71 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Cet article a %1 révisions.", "diffs.current-revision": "Révision en cours", "diffs.original-revision": "Révision originale", + "diffs.restore": "Restaurer cette révision", + "diffs.restore-description": "Une nouvelle révision sera ajoutée à l'historique des modifications de ce message.", + "diffs.post-restored": "Restauration avec succès dans une révision antérieure", "timeago_later": "%1", "timeago_earlier": "il y a %1" } \ No newline at end of file diff --git a/public/language/gl/flags.json b/public/language/gl/flags.json index 52250c1ef2..783a6b03f2 100644 --- a/public/language/gl/flags.json +++ b/public/language/gl/flags.json @@ -32,6 +32,7 @@ "view-profile": "Ver perfil", "start-new-chat": "Comezar novo chat", "go-to-target": "Ver contido marcado", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json index 72afedbc15..a83055e20f 100644 --- a/public/language/gl/topic.json +++ b/public/language/gl/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/he/flags.json b/public/language/he/flags.json index 6f3760b830..cb05e6d082 100644 --- a/public/language/he/flags.json +++ b/public/language/he/flags.json @@ -32,6 +32,7 @@ "view-profile": "צפה בפרופיל", "start-new-chat": "התחל שיחה חדשה", "go-to-target": "צפה במטרת הסימון", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/he/topic.json b/public/language/he/topic.json index 2b815e7d44..8d5ed235e6 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "לפוסט זה יש %1גרסאות", "diffs.current-revision": "גירסה נוכחית", "diffs.original-revision": "גירסה מקורית", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "אחרי %1:", "timeago_earlier": "לפני %1 " } \ No newline at end of file diff --git a/public/language/hr/flags.json b/public/language/hr/flags.json index f8305b59f7..d3a988e042 100644 --- a/public/language/hr/flags.json +++ b/public/language/hr/flags.json @@ -32,6 +32,7 @@ "view-profile": "Pogledaj profil", "start-new-chat": "Pokreni novi razgovor", "go-to-target": "Pogledaj metu zastave", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/hr/topic.json b/public/language/hr/topic.json index 2692a0720b..e2f5486e6e 100644 --- a/public/language/hr/topic.json +++ b/public/language/hr/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/hu/flags.json b/public/language/hu/flags.json index fc29212f5d..4bf0096963 100644 --- a/public/language/hu/flags.json +++ b/public/language/hu/flags.json @@ -32,6 +32,7 @@ "view-profile": "Profil megtekintése", "start-new-chat": "Új chat indítása", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index 522bdd1c0e..c375a7b6e2 100644 --- a/public/language/hu/topic.json +++ b/public/language/hu/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/id/flags.json b/public/language/id/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/id/flags.json +++ b/public/language/id/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/id/topic.json b/public/language/id/topic.json index 2581f4f653..31fc4ffaae 100644 --- a/public/language/id/topic.json +++ b/public/language/id/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/it/flags.json b/public/language/it/flags.json index 75546149c9..b70a4fb95c 100644 --- a/public/language/it/flags.json +++ b/public/language/it/flags.json @@ -32,6 +32,7 @@ "view-profile": "Vedi Profilo", "start-new-chat": "Inizia Nuova Chat", "go-to-target": "Visualizza oggetto segnalazione", + "assign-to-me": "Assign To Me", "delete-post": "Elimina post", "purge-post": "Elimina Post", "restore-post": "Ripristina post", diff --git a/public/language/it/topic.json b/public/language/it/topic.json index b7a48af50e..06fbfa93d1 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Questo post ha %1 revisioni.", "diffs.current-revision": "revisione corrente", "diffs.original-revision": "revisione originale", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 successivo", "timeago_earlier": "%1 precedente" } \ No newline at end of file diff --git a/public/language/ja/flags.json b/public/language/ja/flags.json index 3aba386186..97ba818fbc 100644 --- a/public/language/ja/flags.json +++ b/public/language/ja/flags.json @@ -32,6 +32,7 @@ "view-profile": "プロフィールを見る", "start-new-chat": "新しいチャットを開始", "go-to-target": "フラグのターゲットを表示", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json index 2e9d6dea2b..be5734dc92 100644 --- a/public/language/ja/topic.json +++ b/public/language/ja/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "現在のリビジョン", "diffs.original-revision": "元のリビジョン", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/ko/flags.json b/public/language/ko/flags.json index 5bbdb89def..5f669b2624 100644 --- a/public/language/ko/flags.json +++ b/public/language/ko/flags.json @@ -32,6 +32,7 @@ "view-profile": "프로필 보기", "start-new-chat": "새로운 채팅 시작", "go-to-target": "신고된 게시물 바로가기", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json index 2fcacf5153..241d339cc6 100644 --- a/public/language/ko/topic.json +++ b/public/language/ko/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "이 게시글에는 %1번의 수정이 있습니다.", "diffs.current-revision": "현재 리비젼", "diffs.original-revision": "원래의 리비젼", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/lt/flags.json b/public/language/lt/flags.json index 105f338f53..14801c4a6b 100644 --- a/public/language/lt/flags.json +++ b/public/language/lt/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json index f757086e0b..3138b7a0ee 100644 --- a/public/language/lt/topic.json +++ b/public/language/lt/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/lv/flags.json b/public/language/lv/flags.json index 5a656e0bac..8ed143eb7b 100644 --- a/public/language/lv/flags.json +++ b/public/language/lv/flags.json @@ -32,6 +32,7 @@ "view-profile": "Skatīt profilu", "start-new-chat": "Sākt jaunu sarunu", "go-to-target": "Skatīt atzīmēto rakstu", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/lv/topic.json b/public/language/lv/topic.json index aab5ca423c..5456af6c8e 100644 --- a/public/language/lv/topic.json +++ b/public/language/lv/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Šim rakstam ir %1 versijas.", "diffs.current-revision": "pašreizējā versija", "diffs.original-revision": "sākotnējā versija", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/ms/flags.json b/public/language/ms/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/ms/flags.json +++ b/public/language/ms/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json index 2d878fc0fe..386df5fb25 100644 --- a/public/language/ms/topic.json +++ b/public/language/ms/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/nb/flags.json b/public/language/nb/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/nb/flags.json +++ b/public/language/nb/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index 2bed75b37d..aa0e3e5842 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/nl/flags.json b/public/language/nl/flags.json index 976f605e86..a731bbc079 100644 --- a/public/language/nl/flags.json +++ b/public/language/nl/flags.json @@ -32,6 +32,7 @@ "view-profile": "Profiel bekijken", "start-new-chat": "Begin een nieuwe chat", "go-to-target": "Bekijk markering doel", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index f55b18b791..2e73eacd83 100644 --- a/public/language/nl/topic.json +++ b/public/language/nl/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Dit bericht heeft %1 revisies.", "diffs.current-revision": "Huidige revisie", "diffs.original-revision": "Oorspronkelijke revisie", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 eerder" } \ No newline at end of file diff --git a/public/language/pl/flags.json b/public/language/pl/flags.json index 9b75b0e648..ea328fa88c 100644 --- a/public/language/pl/flags.json +++ b/public/language/pl/flags.json @@ -32,6 +32,7 @@ "view-profile": "Zobacz profil", "start-new-chat": "Rozpocznij nowy czat", "go-to-target": "Zobacz cel flagowania", + "assign-to-me": "Assign To Me", "delete-post": "Usuń post", "purge-post": "Wyczyść post", "restore-post": "Przywróć post", diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index ba840e42ea..4b033842e6 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Ten post zawiera %1 zmian.", "diffs.current-revision": "wersja obecna", "diffs.original-revision": "pierwsza zmiana", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 później", "timeago_earlier": "%1 wcześniej" } \ No newline at end of file diff --git a/public/language/pt-BR/flags.json b/public/language/pt-BR/flags.json index 11340c2fba..15ba843ad4 100644 --- a/public/language/pt-BR/flags.json +++ b/public/language/pt-BR/flags.json @@ -32,6 +32,7 @@ "view-profile": "Ver Perfil", "start-new-chat": "Iniciar Novo Chat", "go-to-target": "Ver o Sinalizado", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/pt-BR/topic.json b/public/language/pt-BR/topic.json index 2f4f2bb1d9..610ab99465 100644 --- a/public/language/pt-BR/topic.json +++ b/public/language/pt-BR/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Este post foi revisado %1 vezes.", "diffs.current-revision": "revisão atual", "diffs.original-revision": "revisão original", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 depois", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/pt-PT/flags.json b/public/language/pt-PT/flags.json index a0124d1546..679c0f0017 100644 --- a/public/language/pt-PT/flags.json +++ b/public/language/pt-PT/flags.json @@ -32,6 +32,7 @@ "view-profile": "Ver Perfil", "start-new-chat": "Iniciar Nova Conversa", "go-to-target": "Ver Alvo da Denúncia", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/pt-PT/topic.json b/public/language/pt-PT/topic.json index 60ab60a457..15678e9596 100644 --- a/public/language/pt-PT/topic.json +++ b/public/language/pt-PT/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "revisão atual", "diffs.original-revision": "revisão original", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 depois", "timeago_earlier": "%1 antes" } \ No newline at end of file diff --git a/public/language/ro/flags.json b/public/language/ro/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/ro/flags.json +++ b/public/language/ro/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json index 08d7312700..fe92c386d8 100644 --- a/public/language/ro/topic.json +++ b/public/language/ro/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/ru/flags.json b/public/language/ru/flags.json index 6c12efdf73..16ffca9bf6 100644 --- a/public/language/ru/flags.json +++ b/public/language/ru/flags.json @@ -32,6 +32,7 @@ "view-profile": "Просмотреть профиль", "start-new-chat": "Начать новый чат", "go-to-target": "Показать предмет жалобы", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index b0a30cae4e..a7490dfc67 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "У этого сообщения есть %1версий", "diffs.current-revision": "текущая версия", "diffs.original-revision": "исходная версия", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "через %1", "timeago_earlier": "на %1 раньше" } \ No newline at end of file diff --git a/public/language/rw/flags.json b/public/language/rw/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/rw/flags.json +++ b/public/language/rw/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json index f6a39cd953..c0d5b5c6ac 100644 --- a/public/language/rw/topic.json +++ b/public/language/rw/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/sc/flags.json b/public/language/sc/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/sc/flags.json +++ b/public/language/sc/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json index 0a849305e0..2cf78e277d 100644 --- a/public/language/sc/topic.json +++ b/public/language/sc/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/sk/flags.json b/public/language/sk/flags.json index 5d806b2769..d7369006b9 100644 --- a/public/language/sk/flags.json +++ b/public/language/sk/flags.json @@ -32,6 +32,7 @@ "view-profile": "Zobraziť profil", "start-new-chat": "Začať novú konverzáciu", "go-to-target": "Zobraziť cieľové označenie", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json index a913e34d49..b79955f503 100644 --- a/public/language/sk/topic.json +++ b/public/language/sk/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Tento príspevok má %1 zmien.", "diffs.current-revision": "aktuálna revízia", "diffs.original-revision": "originálna revízia", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/sl/flags.json b/public/language/sl/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/sl/flags.json +++ b/public/language/sl/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json index 2224304f6b..96c02d7800 100644 --- a/public/language/sl/topic.json +++ b/public/language/sl/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "This post has %1 revisions.", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/sr/flags.json b/public/language/sr/flags.json index 1bb26a6712..8a8f48aefb 100644 --- a/public/language/sr/flags.json +++ b/public/language/sr/flags.json @@ -32,6 +32,7 @@ "view-profile": "Погледај профил", "start-new-chat": "Започни ново ћаскање", "go-to-target": "Погледај циљ означавања", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json index 7152057b7d..42afa2fd29 100644 --- a/public/language/sr/topic.json +++ b/public/language/sr/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Ова порука има %1 корекција.", "diffs.current-revision": "тренутна корекција", "diffs.original-revision": "оригинална корекција", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 касније", "timeago_earlier": "%1 раније" } \ No newline at end of file diff --git a/public/language/sv/flags.json b/public/language/sv/flags.json index 0612b51909..4c2f786fbe 100644 --- a/public/language/sv/flags.json +++ b/public/language/sv/flags.json @@ -32,6 +32,7 @@ "view-profile": "Visa profil", "start-new-chat": "Påbörja ny chatt", "go-to-target": "Visa flaggans ämne", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index cec78ed614..0900cbde33 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Detta inlägg har %1 revisioner.", "diffs.current-revision": "Nuvarande revision", "diffs.original-revision": "Ursprunglig revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 senare", "timeago_earlier": "%1 tidigare" } \ No newline at end of file diff --git a/public/language/th/flags.json b/public/language/th/flags.json index 81791d0bce..015580f4bd 100644 --- a/public/language/th/flags.json +++ b/public/language/th/flags.json @@ -32,6 +32,7 @@ "view-profile": "ดูโปรไฟล์", "start-new-chat": "เริ่มแชทใหม่", "go-to-target": "ดูเป้าหมายการปักธง", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/th/topic.json b/public/language/th/topic.json index 89fe2fd596..04cc70124f 100644 --- a/public/language/th/topic.json +++ b/public/language/th/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "โพสนี้มี %1การแก้ไข", "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/tr/admin/manage/users.json b/public/language/tr/admin/manage/users.json index 6a2b6b64dc..6f7290c784 100644 --- a/public/language/tr/admin/manage/users.json +++ b/public/language/tr/admin/manage/users.json @@ -12,9 +12,9 @@ "unban": "Kullanıcı(n/lar)ın Yasağını Kaldır", "reset-lockout": "Kilitlemeyi Sıfırla", "reset-flags": "Bayrakları Sıfırla", - "delete": "Delete User(s)", - "delete-content": "Delete User(s) Content", - "purge": "Delete User(s) and Content", + "delete": " Kullanıcı(ları) Sil", + "delete-content": "Kullanıcı İçeriğini Sil", + "purge": "Kullanıcıyı/ları ve İçeriği Sil", "download-csv": "CSV İndir", "manage-groups": "Grupları Düzenle", "add-group": "Grup ekle", diff --git a/public/language/tr/admin/settings/advanced.json b/public/language/tr/admin/settings/advanced.json index 715594699d..bc3c885013 100644 --- a/public/language/tr/admin/settings/advanced.json +++ b/public/language/tr/admin/settings/advanced.json @@ -20,7 +20,7 @@ "hsts.preload": "HSTS üst bilgisinin ön yüklemesine izin ver", "hsts.help": "Etkinleştirildiğinde, bu site için bir HSTS başlığı ayarlanır. Alt alanları ve önyükleme bayraklarını dahil etmeyi seçebilirsiniz. Kararsızsanız, bu alanı işaretlenmemiş olarak bırakabilirsiniz. Daha fazla bilgi ", "traffic-management": "Trafik Yönetimi", - "traffic.help": "NodeBB uses a module that automatically denies requests in high-traffic situations. You can tune these settings here, although the defaults are a good starting point.", + "traffic.help": "NodeBB, yoğun trafik isteklerini otomatik olarak reddeden bir modül ile donatılmıştır. Varsayıla ayarlar başlangıç için yeterli olsa da, bu ayarları buradan düzenleyebilirsiniz.", "traffic.enable": "Trafik Yönetimini Etkinleştir", "traffic.event-lag": "Olay Döngüsü Gecikme Eşiği (milisaniye cinsinden)", "traffic.event-lag-help": "Bu değeri düşürmek, sayfa yüklemeleri için bekleme sürelerini azaltır, ancak daha fazla kullanıcıya \"aşırı yükleme\" mesajını da gösterir. (Yeniden başlatmak gerekir)", diff --git a/public/language/tr/flags.json b/public/language/tr/flags.json index 5304a1fc32..e9f912b448 100644 --- a/public/language/tr/flags.json +++ b/public/language/tr/flags.json @@ -32,6 +32,7 @@ "view-profile": "Profili Gör", "start-new-chat": "Yeni Sohbet Başlat", "go-to-target": "Şikayet Edilen İçeriği Gör", + "assign-to-me": "Assign To Me", "delete-post": "İletiyi Sil", "purge-post": "İletiyi Temizle", "restore-post": "İletiyi Geri Getir", diff --git a/public/language/tr/global.json b/public/language/tr/global.json index e0e1bdf411..1d8e21964a 100644 --- a/public/language/tr/global.json +++ b/public/language/tr/global.json @@ -30,7 +30,7 @@ "header.unread": "Okunmamış", "header.tags": "Etiketler", "header.popular": "Popüler", - "header.top": "Top", + "header.top": "Zirve", "header.users": "Kullanıcılar", "header.groups": "Gruplar", "header.chats": "Sohbetler", diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index ca916e53dc..5bd05fa39b 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -99,11 +99,11 @@ "fork_pid_count": "%1 ileti(ler) seçildi", "fork_success": "Başlık başarıyla ayrıldı! Yeni başlığı görüntülemek için tıklayınız!", "delete_posts_instruction": "Silmek/temizlemek istediğiniz iletileri seçiniz!", - "merge_topics_instruction": "Click the topics you want to merge or search for them", - "merge-topic-list-title": "List of topics to be merged", - "merge-options": "Merge options", - "merge-select-main-topic": "Select the main topic", - "merge-new-title-for-topic": "New title for topic", + "merge_topics_instruction": "Birleştirmek istediğiniz başlıkları seçiniz veya onları arayınız!", + "merge-topic-list-title": "Birleştirilecek başlık listesi", + "merge-options": "Birleştirme Seçenekleri", + "merge-select-main-topic": "Ana başlığı seçiniz", + "merge-new-title-for-topic": "Konu için yeni başlık", "move_posts_instruction": "Taşımak istediğiniz iletileri seçiniz!", "change_owner_instruction": "Başka kullanıcıya aktarmak istediğiniz iletileri seçiniz!", "composer.title_placeholder": "Başlık ismini buraya giriniz...", @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Bu iletinin %1 revizyonu var.", "diffs.current-revision": "mevcut revizyon", "diffs.original-revision": "orijinal revizyon", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 sonra", "timeago_earlier": "%1 önce" } \ No newline at end of file diff --git a/public/language/tr/user.json b/public/language/tr/user.json index 6d7de89b14..3fd8ed0c8d 100644 --- a/public/language/tr/user.json +++ b/public/language/tr/user.json @@ -13,15 +13,15 @@ "ban_account_confirm": "Hesabı yasaklamak istediğinizden emin misiniz?", "unban_account": "Hesabın Yasağını Kaldır", "delete_account": "Hesabı Sil", - "delete_account_as_admin": "Delete Account", - "delete_content": "Delete Account Content", - "delete_all": "Delete Account and Content", + "delete_account_as_admin": "Hesabı Sil", + "delete_content": "Hesabın İçeriğini Sil", + "delete_all": "Hesabı ve İçeriğini Sil", "delete_account_confirm": "Are you sure you want to anonymize your posts and delete your account?
This action is irreversible and you will not be able to recover any of your data

Enter your password to confirm that you wish to destroy this account.", "delete_this_account_confirm": "Are you sure you want to delete this account while leaving its contents behind?
This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account

", "delete_account_content_confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)?
This action is irreversible and you will not be able to recover any data

", "delete_all_confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)?
This action is irreversible and you will not be able to recover any data

", "account-deleted": "Hesap silindi", - "account-content-deleted": "Account content deleted", + "account-content-deleted": "Hesaba ait içerik silindi", "fullname": "İsim Soyisim", "website": "İnternet Sitesi", "location": "Konum", diff --git a/public/language/uk/topic.json b/public/language/uk/topic.json index 5ff21b471a..9146b9d9c0 100644 --- a/public/language/uk/topic.json +++ b/public/language/uk/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Цей пост має %1 версій.", "diffs.current-revision": "поточна ревізія", "diffs.original-revision": "початкова ревізія", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 пізніше", "timeago_earlier": "%1 раніше" } \ No newline at end of file diff --git a/public/language/vi/flags.json b/public/language/vi/flags.json index 649d3878d1..b3561f9e38 100644 --- a/public/language/vi/flags.json +++ b/public/language/vi/flags.json @@ -32,6 +32,7 @@ "view-profile": "View Profile", "start-new-chat": "Start New Chat", "go-to-target": "View Flag Target", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json index f2057e7d75..70bc813847 100644 --- a/public/language/vi/topic.json +++ b/public/language/vi/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "Bài viết này có %1 sửa đổi", "diffs.current-revision": "Bản sao lưu hiện tại", "diffs.original-revision": "Bản sao lưu gốc", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 sau", "timeago_earlier": "%1 earlier" } \ No newline at end of file diff --git a/public/language/zh-CN/flags.json b/public/language/zh-CN/flags.json index 7e6cc155e6..2a58d70cb4 100644 --- a/public/language/zh-CN/flags.json +++ b/public/language/zh-CN/flags.json @@ -32,6 +32,7 @@ "view-profile": "查看个人资料", "start-new-chat": "开始新会话", "go-to-target": "查看举报目标", + "assign-to-me": "Assign To Me", "delete-post": "Delete Post", "purge-post": "Purge Post", "restore-post": "Restore Post", diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json index 47ca7c2e05..e8954365e9 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "该贴已重新修改", "diffs.current-revision": "当前版本", "diffs.original-revision": "原始版本", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 后", "timeago_earlier": "%1 前" } \ No newline at end of file diff --git a/public/language/zh-TW/flags.json b/public/language/zh-TW/flags.json index 7854e7afb0..2d9dfe4f51 100644 --- a/public/language/zh-TW/flags.json +++ b/public/language/zh-TW/flags.json @@ -32,6 +32,7 @@ "view-profile": "查看個人資料", "start-new-chat": "開始新聊天對話", "go-to-target": "查看舉報目標", + "assign-to-me": "Assign To Me", "delete-post": "刪除貼文", "purge-post": "清除貼文", "restore-post": "恢復貼文", diff --git a/public/language/zh-TW/topic.json b/public/language/zh-TW/topic.json index 39ca3726d0..dc7186389f 100644 --- a/public/language/zh-TW/topic.json +++ b/public/language/zh-TW/topic.json @@ -138,6 +138,9 @@ "diffs.no-revisions-description": "該貼文已重新修改", "diffs.current-revision": "當前版本", "diffs.original-revision": "原始版本", + "diffs.restore": "Restore this revision", + "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.post-restored": "Post successfully restored to earlier revision", "timeago_later": "%1 後", "timeago_earlier": "%1 前" } \ No newline at end of file From b3115ea8132fd5078571c9b50c541825e7a46a06 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 15 Jun 2020 15:43:24 -0400 Subject: [PATCH 05/13] fix: #8410 --- public/src/client/topic/diffs.js | 2 +- src/posts/diffs.js | 2 +- src/socket.io/posts/diffs.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/public/src/client/topic/diffs.js b/public/src/client/topic/diffs.js index 2eccd21191..1eda09efb9 100644 --- a/public/src/client/topic/diffs.js +++ b/public/src/client/topic/diffs.js @@ -44,7 +44,7 @@ define('forum/topic/diffs', ['forum/topic/images', 'benchpress', 'translator'], selectEl.on('change', function () { Diffs.load(pid, this.value, postContainer); - revertEl.prop('disabled', data.timestamps.indexOf(this.value) === -1); + revertEl.prop('disabled', data.timestamps.indexOf(this.value) === 0); }); revertEl.on('click', function () { diff --git a/src/posts/diffs.js b/src/posts/diffs.js index 54999c41b4..f1635a4da4 100644 --- a/src/posts/diffs.js +++ b/src/posts/diffs.js @@ -24,7 +24,7 @@ module.exports = function (Posts) { Diffs.get = async function (pid, since) { const timestamps = await Diffs.list(pid); // Pass those made after `since`, and create keys - const keys = timestamps.filter(t => (parseInt(t, 10) || 0) >= since) + const keys = timestamps.filter(t => (parseInt(t, 10) || 0) > since) .map(t => 'diff:' + pid + '.' + t); return await db.getObjects(keys); }; diff --git a/src/socket.io/posts/diffs.js b/src/socket.io/posts/diffs.js index 837ea4b653..dc69063f14 100644 --- a/src/socket.io/posts/diffs.js +++ b/src/socket.io/posts/diffs.js @@ -10,7 +10,8 @@ module.exports = function (SocketPosts) { const timestamps = await posts.diffs.list(data.pid); const cid = await posts.getCidByPid(data.pid); const canEdit = await privileges.categories.can('edit', cid, socket.uid); - timestamps.unshift(Date.now()); + const postTime = await posts.getPostField(data.pid, 'timestamp'); + timestamps.push(postTime); return { timestamps: timestamps, editable: canEdit, From 2515aa77ba9249544de619a0739b8d002b5ccef9 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 15 Jun 2020 16:33:30 -0400 Subject: [PATCH 06/13] fix: bug where category privs page thought it was on admin --- public/src/admin/manage/privileges.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/admin/manage/privileges.js b/public/src/admin/manage/privileges.js index 553e4427e9..2741b6992d 100644 --- a/public/src/admin/manage/privileges.js +++ b/public/src/admin/manage/privileges.js @@ -11,7 +11,7 @@ define('admin/manage/privileges', [ var cid; Privileges.init = function () { - cid = ajaxify.data.cid || 'admin'; + cid = isNaN(parseInt(ajaxify.data.cid, 10)) ? 'admin' : ajaxify.data.cid; categorySelector.init($('[component="category-selector"]'), function (category) { cid = parseInt(category.cid, 10); From f909ed2541877ecd03a9b2f8d16052722481cfb3 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 15 Jun 2020 17:16:44 -0400 Subject: [PATCH 07/13] feat: show editor in post diffs if available --- public/src/client/topic/diffs.js | 5 +++-- src/posts/diffs.js | 9 ++++----- src/socket.io/posts/diffs.js | 17 +++++++++++++++-- test/posts.js | 6 ++++++ 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/public/src/client/topic/diffs.js b/public/src/client/topic/diffs.js index 1eda09efb9..be6b0364df 100644 --- a/public/src/client/topic/diffs.js +++ b/public/src/client/topic/diffs.js @@ -16,10 +16,11 @@ define('forum/topic/diffs', ['forum/topic/images', 'benchpress', 'translator'], } Benchpress.parse('partials/modals/post_history', { - diffs: data.timestamps.map(function (timestamp) { - timestamp = parseInt(timestamp, 10); + diffs: data.revisions.map(function (revision) { + var timestamp = parseInt(revision.timestamp, 10); return { + username: revision.username, timestamp: timestamp, pretty: new Date(timestamp).toLocaleString(config.userLang.replace('_', '-'), localeStringOpts), }; diff --git a/src/posts/diffs.js b/src/posts/diffs.js index f1635a4da4..eeb44927da 100644 --- a/src/posts/diffs.js +++ b/src/posts/diffs.js @@ -23,6 +23,10 @@ module.exports = function (Posts) { Diffs.get = async function (pid, since) { const timestamps = await Diffs.list(pid); + if (!since) { + since = 0; + } + // Pass those made after `since`, and create keys const keys = timestamps.filter(t => (parseInt(t, 10) || 0) > since) .map(t => 'diff:' + pid + '.' + t); @@ -49,11 +53,6 @@ module.exports = function (Posts) { Diffs.load = async function (pid, since, uid) { const post = await postDiffLoad(pid, since, uid); - - // Clear editor data (as it is outdated for this content) - delete post.edited; - post.editor = null; - post.content = String(post.content || ''); const result = await plugins.fireHook('filter:parse.post', { postData: post }); diff --git a/src/socket.io/posts/diffs.js b/src/socket.io/posts/diffs.js index dc69063f14..8cfa3648c9 100644 --- a/src/socket.io/posts/diffs.js +++ b/src/socket.io/posts/diffs.js @@ -1,6 +1,7 @@ 'use strict'; const posts = require('../../posts'); +const user = require('../../user'); const privileges = require('../../privileges'); const websockets = require('..'); @@ -8,12 +9,24 @@ module.exports = function (SocketPosts) { SocketPosts.getDiffs = async function (socket, data) { await privilegeCheck(data.pid, socket.uid); const timestamps = await posts.diffs.list(data.pid); + const post = await posts.getPostFields(data.pid, ['timestamp', 'uid']); + + const diffs = await posts.diffs.get(data.pid); + const uids = diffs.map(diff => diff.uid || null); + uids.push(post.uid); + let usernames = await user.getUsersFields(uids, ['username']); + usernames = usernames.map(userObj => (userObj.uid ? userObj.username : null)); + const cid = await posts.getCidByPid(data.pid); const canEdit = await privileges.categories.can('edit', cid, socket.uid); - const postTime = await posts.getPostField(data.pid, 'timestamp'); - timestamps.push(postTime); + timestamps.push(post.timestamp); + return { timestamps: timestamps, + revisions: timestamps.map((timestamp, idx) => ({ + timestamp: timestamp, + username: usernames[idx], + })), editable: canEdit, }; }; diff --git a/test/posts.js b/test/posts.js index 936c32dd9d..9bc9fa09ef 100644 --- a/test/posts.js +++ b/test/posts.js @@ -593,10 +593,16 @@ describe('Post\'s', function () { it('should allow registered-users group to view diffs', function (done) { socketPosts.getDiffs({ uid: 1 }, { pid: 1 }, function (err, data) { assert.ifError(err); + assert.strictEqual('boolean', typeof data.editable); assert.strictEqual(false, data.editable); + assert.equal(true, Array.isArray(data.timestamps)); assert.strictEqual(1, data.timestamps.length); + + assert.equal(true, Array.isArray(data.revisions)); + assert.strictEqual(data.timestamps.length, data.revisions.length); + ['timestamp', 'username'].every(prop => Object.keys(data.revisions[0]).includes(prop)); done(); }); }); From 5a367ecbb4a46b576f85590f24a9cf4ffea41bcd Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 15 Jun 2020 17:35:05 -0400 Subject: [PATCH 08/13] fix: remove use of 'hidden' class in navbar toggling --- public/src/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/app.js b/public/src/app.js index 2ec5de1985..25154c282a 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -445,7 +445,7 @@ app.cacheBuster = null; app.toggleNavbar = function (state) { var navbarEl = $('.navbar'); if (navbarEl) { - navbarEl.toggleClass('hidden', !state); + navbarEl[state ? 'show' : 'hide'](); } }; From 7fe9c1a26d92a8fae095a9243003a39e053d4a94 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Tue, 16 Jun 2020 09:05:31 +0000 Subject: [PATCH 09/13] Latest translations and fallbacks --- public/language/bg/flags.json | 2 +- public/language/bg/topic.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/language/bg/flags.json b/public/language/bg/flags.json index 6bab4143b4..1e10757d15 100644 --- a/public/language/bg/flags.json +++ b/public/language/bg/flags.json @@ -32,7 +32,7 @@ "view-profile": "Преглед на профила", "start-new-chat": "Започване на нов разговор", "go-to-target": "Преглед на целта на доклада", - "assign-to-me": "Assign To Me", + "assign-to-me": "Назначаване на мен", "delete-post": "Изтриване на публикацията", "purge-post": "Изчистване на публикацията", "restore-post": "Възстановяване на публикацията", diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json index 095221a9a6..e2bea635a2 100644 --- a/public/language/bg/topic.json +++ b/public/language/bg/topic.json @@ -134,13 +134,13 @@ "stale.reply_anyway": "Отговаряне в тази тема въпреки това", "link_back": "Отговор: [%1](%2)", "diffs.title": "История на редакциите", - "diffs.description": "Тази публикация има %1 варианта. Щракнете върху някоя от версиите по-долу, за да видите съдържанието ѝ в съответния момент.", - "diffs.no-revisions-description": "Тази публикация има %1 варианта.", + "diffs.description": "Тази публикация има %1 версии. Щракнете върху някоя от версиите по-долу, за да видите съдържанието ѝ в съответния момент.", + "diffs.no-revisions-description": "Тази публикация има %1 версии.", "diffs.current-revision": "текуща версия", "diffs.original-revision": "оригинална версия", - "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", - "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.restore": "Възстановяване на тази версия", + "diffs.restore-description": "Към историята на редакциите на тази публикация ще бъде добавена нова версия.", + "diffs.post-restored": "Публикацията е възстановена успешно до по-ранна версия", "timeago_later": "%1 по-късно", "timeago_earlier": "%1 по-рано" } \ No newline at end of file From 35a06a8419d578d0dd4522ac67c74ce27c34d62f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 16 Jun 2020 11:34:44 -0400 Subject: [PATCH 10/13] feat: #8412 breadcrumbs for ip-blacklist/post queue/flags --- public/language/en-GB/flags.json | 1 - src/controllers/globalmods.js | 2 ++ src/controllers/mods.js | 7 +++++++ src/views/admin/manage/ip-blacklist.tpl | 4 +++- src/views/admin/manage/post-queue.tpl | 2 ++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/public/language/en-GB/flags.json b/public/language/en-GB/flags.json index b3561f9e38..fb8708fc16 100644 --- a/public/language/en-GB/flags.json +++ b/public/language/en-GB/flags.json @@ -45,7 +45,6 @@ "no-notes": "No shared notes.", "history": "Account & Flag History", - "back": "Back to Flags List", "no-history": "No flag history.", "state-all": "All states", diff --git a/src/controllers/globalmods.js b/src/controllers/globalmods.js index d2f0ae6656..71a1be2cc8 100644 --- a/src/controllers/globalmods.js +++ b/src/controllers/globalmods.js @@ -4,6 +4,7 @@ const user = require('../user'); const meta = require('../meta'); const analytics = require('../analytics'); const usersController = require('./admin/users'); +const helpers = require('./helpers'); const globalModsController = module.exports; @@ -21,6 +22,7 @@ globalModsController.ipBlacklist = async function (req, res, next) { title: '[[pages:ip-blacklist]]', rules: rules, analytics: analyticsData, + breadcrumbs: helpers.buildBreadcrumbs([{ text: '[[pages:ip-blacklist]]' }]), }); }; diff --git a/src/controllers/mods.js b/src/controllers/mods.js index b5b83d0f20..9c35a87800 100644 --- a/src/controllers/mods.js +++ b/src/controllers/mods.js @@ -12,6 +12,7 @@ const plugins = require('../plugins'); const pagination = require('../pagination'); const privileges = require('../privileges'); const utils = require('../utils'); +const helpers = require('./helpers'); const modsController = module.exports; modsController.flags = {}; @@ -94,6 +95,7 @@ modsController.flags.list = async function (req, res, next) { filters: filters, title: '[[pages:flags]]', pagination: pagination.create(flagsData.page, flagsData.pageCount, req.query), + breadcrumbs: helpers.buildBreadcrumbs([{ text: '[[pages:flags]]' }]), }); }; @@ -141,6 +143,10 @@ modsController.flags.detail = async function (req, res, next) { categories: results.categories, filters: req.session.flags_filters || [], privileges: results.privileges, + breadcrumbs: helpers.buildBreadcrumbs([ + { text: '[[pages:flags]]', url: '/flags' }, + { text: '[[pages:flag-details, ' + req.params.flagId + ']]' }, + ]), })); }; @@ -193,6 +199,7 @@ modsController.postQueue = async function (req, res, next) { title: '[[pages:post-queue]]', posts: postData, pagination: pagination.create(page, pageCount), + breadcrumbs: helpers.buildBreadcrumbs([{ text: '[[pages:post-queue]]' }]), }); }; diff --git a/src/views/admin/manage/ip-blacklist.tpl b/src/views/admin/manage/ip-blacklist.tpl index 62d0446ec4..da3fea162b 100644 --- a/src/views/admin/manage/ip-blacklist.tpl +++ b/src/views/admin/manage/ip-blacklist.tpl @@ -1,3 +1,5 @@ + +

@@ -40,7 +42,7 @@

[[admin/manage/ip-blacklist:analytics.blacklist-hourly]]
- +
diff --git a/src/views/admin/manage/post-queue.tpl b/src/views/admin/manage/post-queue.tpl index 52e02fb9ee..decf23b657 100644 --- a/src/views/admin/manage/post-queue.tpl +++ b/src/views/admin/manage/post-queue.tpl @@ -1,3 +1,5 @@ + +
From 365996e7e65fbbe73a3f11a27fe7a8f8fccaebff Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 16 Jun 2020 11:36:03 -0400 Subject: [PATCH 11/13] fix(deps): #8412 bump themes --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index 6d47b2a836..f28828846e 100644 --- a/install/package.json +++ b/install/package.json @@ -90,9 +90,9 @@ "nodebb-plugin-spam-be-gone": "0.7.1", "nodebb-rewards-essentials": "0.1.3", "nodebb-theme-lavender": "5.0.11", - "nodebb-theme-persona": "10.1.52", + "nodebb-theme-persona": "10.1.53", "nodebb-theme-slick": "1.2.29", - "nodebb-theme-vanilla": "11.1.27", + "nodebb-theme-vanilla": "11.1.28", "nodebb-widget-essentials": "4.1.0", "nodemailer": "^6.4.6", "passport": "^0.4.1", From 4cae893f494d6e0b4a578ce900b48325740782a5 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 16 Jun 2020 11:58:28 -0400 Subject: [PATCH 12/13] fix(openapi): tests for #8412 --- public/openapi/read.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/openapi/read.yaml b/public/openapi/read.yaml index afab3af4d3..87c4ce5bb4 100644 --- a/public/openapi/read.yaml +++ b/public/openapi/read.yaml @@ -4751,6 +4751,7 @@ paths: title: type: string - $ref: components/schemas/Pagination.yaml#/Pagination + - $ref: components/schemas/Breadcrumbs.yaml#/Breadcrumbs - $ref: components/schemas/CommonProps.yaml#/CommonProps "/api/flags/{flagId}": get: @@ -4963,6 +4964,7 @@ paths: additionalProperties: description: "A list of global and admin privileges, and whether the calling user has (or has inherited) them" type: boolean + - $ref: components/schemas/Breadcrumbs.yaml#/Breadcrumbs - $ref: components/schemas/CommonProps.yaml#/CommonProps /api/post-queue: get: @@ -5114,6 +5116,7 @@ paths: type: string - $ref: components/schemas/CategoryObject.yaml#/CategoryObject - $ref: components/schemas/Pagination.yaml#/Pagination + - $ref: components/schemas/Breadcrumbs.yaml#/Breadcrumbs - $ref: components/schemas/CommonProps.yaml#/CommonProps /api/ip-blacklist: get: From 056f85f864ba4f60af80cb0817ea046d61909062 Mon Sep 17 00:00:00 2001 From: Manuel Valle Date: Tue, 16 Jun 2020 11:50:07 -0600 Subject: [PATCH 13/13] Topic hooks extension (#8413) * Update data.js with new hook Implemented new 'filter:topic.getFields' hook as in posts * Update data.js * Update data.js --- src/topics/data.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/topics/data.js b/src/topics/data.js index 2e1931e823..6b73163b4c 100644 --- a/src/topics/data.js +++ b/src/topics/data.js @@ -6,6 +6,7 @@ var db = require('../database'); var categories = require('../categories'); var utils = require('../utils'); var translator = require('../translator'); +const plugins = require('../plugins'); const intFields = [ 'tid', 'cid', 'uid', 'mainPid', 'postcount', @@ -21,8 +22,14 @@ module.exports = function (Topics) { } const keys = tids.map(tid => 'topic:' + tid); const topics = await (fields.length ? db.getObjectsFields(keys, fields) : db.getObjects(keys)); - topics.forEach(topic => modifyTopic(topic, fields)); - return topics; + const result = await plugins.fireHook('filter:topic.getFields', { + tids: tids, + topics: topics, + fields: fields, + keys: keys, + }); + result.topics.forEach(topic => modifyTopic(topic, fields)); + return result.topics; }; Topics.getTopicField = async function (tid, field) {