diff --git a/CHANGELOG.md b/CHANGELOG.md index 622b15cbf0..6ade8c1a6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,71 @@ +#### v1.19.3 (2022-02-16) + +##### Chores + +* **i18n:** + * fallback strings for new resources: nodebb.admin-settings-uploads (4043f179) + * fallback strings for new resources: nodebb.user (775d9077) +* **deps:** + * update dependency lint-staged to v12.3.4 (9577ef8d) + * update commitlint monorepo to v16.2.1 (2290cee5) + * update dependency eslint to v8.9.0 (763cd193) +* remove punycode dep (e9cb1452) +* incrementing version number - v1.19.2 (e49b31f0) +* update changelog for v1.19.2 (f012984d) + +##### New Features + +* delete diffs on post purge, closes #10291 (e9e48a75) +* closes #10296 (58b5781c) +* deleting a user upload dissociates from posts, and vice versa (d5ed8736) +* #10276, dont change/revert theme if its current (398d25c2) + +##### Bug Fixes + +* #10302, fix regression (503e27f7) +* one last try (9205169f) +* doggy.gif (2f64d633) +* one more fix (cfdfbf32) +* dupe key errors (770fcd9e) +* #10292, delete missing fields (dbf7a458) +* local deleteUploads() method in `src/user/delete.js` to call `User.deleteUpload()` (b9edee14) +* #10144, automatically delete uploads from disk on post purge, ACP option to keep uploads on disk if desired (84dfda59) +* four-space indents in package.json (9aa3e442) +* #10289, remove lodash dependency in src/cli/package-install.js (81fa2e22) +* non-functional upgrade script (1c7fb8fe) +* language keys (350052ec) +* #10273, properly calculate item count for best/controversial (d70ce3a9) +* **deps:** + * update dependency nodebb-plugin-emoji to v3.5.16 (#10297) (b47ca86d) + * update dependency nodebb-plugin-markdown to v9.0.7 (#10293) (5b0d4a8e) + * update dependency nodebb-plugin-emoji to v3.5.14 (#10295) (7af057fa) + * update dependency nodebb-plugin-mentions to v3.0.5 (#10294) (55a98183) + * update dependency winston to v3.6.0 (#10285) (22da7a10) + * update dependency nodebb-plugin-markdown to v9.0.6 (3225a1af) + * update dependency nodebb-plugin-spam-be-gone to v0.7.13 (#10280) (3dc108d3) + * update dependency nodebb-plugin-emoji to v3.5.12 (#10279) (2c0b6322) + * update dependency nodebb-plugin-emoji to v3.5.11 (#10274) (766ef4e5) + +##### Refactors + +* lazy load slugify (946d351f) +* .deleteUpload() to accept array of paths (7ef9c7d2) +* fix user uploads paths, and associate uid with user uploads (ea36016d) +* change the post uploads' hash seeds to have the `files/` prefix (6489e9fd) +* abstract some common code out to local utility methods (aad0c5fd) +* move post upload tests to its own file (d92da828) +* remove extra zset remove, closes #10277 (489c0d30) + +##### Code Style Changes + +* linting errors (5d7e1ebc) + +##### Tests + +* fix topic thumb tests and topic thumbs to work properly with post upload assoc. (fb78570c) +* user uploads.js tests (8c2752ba) +* testing user upload methods, already fixed one bug (11275d68) + #### v1.19.2 (2022-02-09) ##### Chores diff --git a/install/package.json b/install/package.json index 95d2089d19..8095f83682 100644 --- a/install/package.json +++ b/install/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "1.19.2", + "version": "1.19.3", "homepage": "http://www.nodebb.org", "repository": { "type": "git", @@ -57,7 +57,7 @@ "csurf": "1.11.0", "daemon": "1.1.0", "diff": "5.0.0", - "express": "4.17.2", + "express": "4.17.3", "express-session": "1.17.2", "express-useragent": "1.0.15", "file-loader": "6.2.0", @@ -96,10 +96,10 @@ "nodebb-plugin-spam-be-gone": "0.7.13", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "5.3.2", - "nodebb-theme-persona": "11.3.38", + "nodebb-theme-persona": "11.3.40", "nodebb-theme-slick": "1.4.23", "nodebb-theme-vanilla": "12.1.17", - "nodebb-widget-essentials": "5.0.7", + "nodebb-widget-essentials": "5.0.9", "nodemailer": "6.7.2", "nprogress": "0.2.0", "passport": "0.5.2", diff --git a/public/language/ar/global.json b/public/language/ar/global.json index a9205b9dfd..7f93ee0e24 100644 --- a/public/language/ar/global.json +++ b/public/language/ar/global.json @@ -23,7 +23,7 @@ "close": "أغلق", "pagination": "الصفحات", "pagination.out_of": "%1 من %2", - "pagination.enter_index": "أدخل الرقم التسلسلي", + "pagination.enter_index": "Go to post index", "header.admin": "مدير النظام", "header.categories": "الأقسام", "header.recent": "حديث", diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index 82bf38c9ef..6b0d4b691a 100644 --- a/public/language/ar/topic.json +++ b/public/language/ar/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/bg/global.json b/public/language/bg/global.json index 87aa5c7190..545e1eaa9b 100644 --- a/public/language/bg/global.json +++ b/public/language/bg/global.json @@ -23,7 +23,7 @@ "close": "Затваряне", "pagination": "Странициране", "pagination.out_of": "%1 от %2", - "pagination.enter_index": "Въведете номер", + "pagination.enter_index": "Към публикация номер", "header.admin": "Администратор", "header.categories": "Категории", "header.recent": "Скорошни", diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json index 40474033ac..f11bd6eec8 100644 --- a/public/language/bg/topic.json +++ b/public/language/bg/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 по-рано", "first-post": "Първа публикация", "last-post": "Последна публикация", + "go-to-my-next-post": "Към следващата ми публикация", + "no-more-next-post": "Нямате повече публикации в тази тема", "post-quick-reply": "Пускане на бърза публикация" } \ No newline at end of file diff --git a/public/language/bn/global.json b/public/language/bn/global.json index b4035b3f5f..a38ab65901 100644 --- a/public/language/bn/global.json +++ b/public/language/bn/global.json @@ -23,7 +23,7 @@ "close": "বন্ধ", "pagination": "পাতা নং", "pagination.out_of": "%2 এর মাঝে %1", - "pagination.enter_index": "সূচক লিখুন", + "pagination.enter_index": "Go to post index", "header.admin": "অ্যাডমিন", "header.categories": "বিভাগ", "header.recent": "সাম্প্রতিক", diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json index 53a06c3c00..f116da0f41 100644 --- a/public/language/bn/topic.json +++ b/public/language/bn/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/cs/global.json b/public/language/cs/global.json index 2c4ff54a80..73dfef6204 100644 --- a/public/language/cs/global.json +++ b/public/language/cs/global.json @@ -23,7 +23,7 @@ "close": "Zrušit", "pagination": "Stránkování", "pagination.out_of": "%1 z %2", - "pagination.enter_index": "Zadejte index", + "pagination.enter_index": "Go to post index", "header.admin": "Administrace", "header.categories": "Kategorie", "header.recent": "Nejnovější", diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index 42a0402639..859db6ba3b 100644 --- a/public/language/cs/topic.json +++ b/public/language/cs/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 dříve", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/da/global.json b/public/language/da/global.json index 4f05e26e39..b3815b94f2 100644 --- a/public/language/da/global.json +++ b/public/language/da/global.json @@ -23,7 +23,7 @@ "close": "Luk", "pagination": "Sidetal", "pagination.out_of": "%1 ud af %2", - "pagination.enter_index": "Indtast indeks", + "pagination.enter_index": "Go to post index", "header.admin": "Administrator", "header.categories": "Kategorier", "header.recent": "Seneste", diff --git a/public/language/da/topic.json b/public/language/da/topic.json index 6cdfd5b4ac..1f1b073993 100644 --- a/public/language/da/topic.json +++ b/public/language/da/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/de/global.json b/public/language/de/global.json index 7b54201cd5..f33f212f05 100644 --- a/public/language/de/global.json +++ b/public/language/de/global.json @@ -23,7 +23,7 @@ "close": "Schließen", "pagination": "Seitennummerierung", "pagination.out_of": "%1 von %2", - "pagination.enter_index": "Seitenzahl eingeben", + "pagination.enter_index": "Go to post index", "header.admin": "Admin", "header.categories": "Kategorien", "header.recent": "Aktuell", diff --git a/public/language/de/topic.json b/public/language/de/topic.json index 95ab642b0c..2807109154 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 früher", "first-post": "Erster Beitrag", "last-post": "Letzter Beitrag", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Beitrag schnell Beantworten" } \ No newline at end of file diff --git a/public/language/el/global.json b/public/language/el/global.json index 9e07313feb..5d5797c1bf 100644 --- a/public/language/el/global.json +++ b/public/language/el/global.json @@ -23,7 +23,7 @@ "close": "Κλείσιμο", "pagination": "Σελιδοποίηση", "pagination.out_of": "%1 από %2", - "pagination.enter_index": "Εισαγωγή Σελίδας", + "pagination.enter_index": "Go to post index", "header.admin": "Διαχειριστής", "header.categories": "Κατηγορίες", "header.recent": "Πρόσφατα", diff --git a/public/language/el/topic.json b/public/language/el/topic.json index f7665b1fdd..b59f4e51d7 100644 --- a/public/language/el/topic.json +++ b/public/language/el/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/en-GB/global.json b/public/language/en-GB/global.json index 3f974d70dc..f1ee75200e 100644 --- a/public/language/en-GB/global.json +++ b/public/language/en-GB/global.json @@ -28,7 +28,7 @@ "pagination": "Pagination", "pagination.out_of": "%1 out of %2", - "pagination.enter_index": "Enter index", + "pagination.enter_index": "Go to post index", "header.admin": "Admin", "header.categories": "Categories", diff --git a/public/language/en-GB/topic.json b/public/language/en-GB/topic.json index fc7984f6de..90b56bdeff 100644 --- a/public/language/en-GB/topic.json +++ b/public/language/en-GB/topic.json @@ -207,5 +207,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } diff --git a/public/language/en-US/global.json b/public/language/en-US/global.json index 029ca874bf..9cb37d6e1a 100644 --- a/public/language/en-US/global.json +++ b/public/language/en-US/global.json @@ -23,7 +23,7 @@ "close": "Close", "pagination": "Pagination", "pagination.out_of": "%1 out of %2", - "pagination.enter_index": "Enter index", + "pagination.enter_index": "Go to post index", "header.admin": "Admin", "header.categories": "Categories", "header.recent": "Recent", diff --git a/public/language/en-US/topic.json b/public/language/en-US/topic.json index db9455fec8..9836b78a3d 100644 --- a/public/language/en-US/topic.json +++ b/public/language/en-US/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/en-x-pirate/global.json b/public/language/en-x-pirate/global.json index 188018fdd1..eaec53c49a 100644 --- a/public/language/en-x-pirate/global.json +++ b/public/language/en-x-pirate/global.json @@ -23,7 +23,7 @@ "close": "Shoot down", "pagination": "Pagination", "pagination.out_of": "%1 out of %2", - "pagination.enter_index": "Enter index", + "pagination.enter_index": "Go to post index", "header.admin": "Captains only", "header.categories": "Categories", "header.recent": "Recent", diff --git a/public/language/en-x-pirate/topic.json b/public/language/en-x-pirate/topic.json index db9455fec8..9836b78a3d 100644 --- a/public/language/en-x-pirate/topic.json +++ b/public/language/en-x-pirate/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/es/global.json b/public/language/es/global.json index 70e2d4a9dd..7cf340dc3f 100644 --- a/public/language/es/global.json +++ b/public/language/es/global.json @@ -23,7 +23,7 @@ "close": "Cerrar", "pagination": "Paginación", "pagination.out_of": "%1 de %2", - "pagination.enter_index": "Introduzca el número", + "pagination.enter_index": "Go to post index", "header.admin": "Administración", "header.categories": "Categorías", "header.recent": "Recientes", diff --git a/public/language/es/topic.json b/public/language/es/topic.json index 23e9196b54..391f0535dd 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 antes", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/et/global.json b/public/language/et/global.json index cf7d910806..3673db366b 100644 --- a/public/language/et/global.json +++ b/public/language/et/global.json @@ -23,7 +23,7 @@ "close": "Sulge", "pagination": "Lehekülgede numeratsioon", "pagination.out_of": "%1 kõigist %2-st", - "pagination.enter_index": "Sisetage indeks", + "pagination.enter_index": "Go to post index", "header.admin": "Admin", "header.categories": "Kategooriad", "header.recent": "Hiljutised", diff --git a/public/language/et/topic.json b/public/language/et/topic.json index 41cf277184..61092bcd51 100644 --- a/public/language/et/topic.json +++ b/public/language/et/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/fa-IR/global.json b/public/language/fa-IR/global.json index 5350a2ee54..5ccbedb8d5 100644 --- a/public/language/fa-IR/global.json +++ b/public/language/fa-IR/global.json @@ -23,7 +23,7 @@ "close": "بستن", "pagination": "صفحه‌بندی", "pagination.out_of": "%1 از %2", - "pagination.enter_index": "شماره را وارد کنید", + "pagination.enter_index": "Go to post index", "header.admin": "مدیر", "header.categories": "دسته‌بندی‌ها", "header.recent": "تازه‌ها", diff --git a/public/language/fa-IR/topic.json b/public/language/fa-IR/topic.json index 03a9110d42..41a0af6fa8 100644 --- a/public/language/fa-IR/topic.json +++ b/public/language/fa-IR/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 قبل", "first-post": "اولین پست", "last-post": "آخرین پست", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/fi/global.json b/public/language/fi/global.json index ad0a856b76..f4a9973905 100644 --- a/public/language/fi/global.json +++ b/public/language/fi/global.json @@ -23,7 +23,7 @@ "close": "Sulje", "pagination": "Sivutus", "pagination.out_of": "%1/%2", - "pagination.enter_index": "Syötä indeksi", + "pagination.enter_index": "Go to post index", "header.admin": "Ylläpitäjä", "header.categories": "Kategoriat", "header.recent": "Viimeisimmät", diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index fd73ad6070..a60caf7089 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 aiempi", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/fr/global.json b/public/language/fr/global.json index 533b1b73d1..18c9a152b2 100644 --- a/public/language/fr/global.json +++ b/public/language/fr/global.json @@ -23,7 +23,7 @@ "close": "Fermer", "pagination": "Pagination", "pagination.out_of": "%1 sur %2", - "pagination.enter_index": "Entrer un numéro de page", + "pagination.enter_index": "Go to post index", "header.admin": "Admin", "header.categories": "Catégories", "header.recent": "Récent", diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index b01d31bd2b..fbfac50f85 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "il y a %1", "first-post": "Premier message", "last-post": "Dernier message", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Réponse rapide" } \ No newline at end of file diff --git a/public/language/gl/global.json b/public/language/gl/global.json index 12ff5d51f3..29a24d7cca 100644 --- a/public/language/gl/global.json +++ b/public/language/gl/global.json @@ -23,7 +23,7 @@ "close": "Pechar ", "pagination": "Paxinación", "pagination.out_of": "%1 de %2", - "pagination.enter_index": "Introduce unha referencia", + "pagination.enter_index": "Go to post index", "header.admin": "Admin", "header.categories": "Categorías", "header.recent": "Recentes", diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json index c712b54d83..7b64d25a78 100644 --- a/public/language/gl/topic.json +++ b/public/language/gl/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/he/admin/admin.json b/public/language/he/admin/admin.json index 4e37a15c95..a8b9f1af40 100644 --- a/public/language/he/admin/admin.json +++ b/public/language/he/admin/admin.json @@ -4,8 +4,8 @@ "acp-title": "%1 | לוח בקרה למנהל NodeBB", "settings-header-contents": "תוכן", - "changes-saved": "Changes Saved", - "changes-saved-message": "Your changes to the NodeBB configuration have been saved.", - "changes-not-saved": "Changes Not Saved", - "changes-not-saved-message": "NodeBB encountered a problem saving your changes. (%1)" + "changes-saved": "שינויים שנשמרו", + "changes-saved-message": "השינויים שלך בתצורת NodeBB נשמרו.", + "changes-not-saved": "השינויים לא נשמרו", + "changes-not-saved-message": "NodeBB נתקל בעיה בשמירת השינויים שלך. (%1)" } \ No newline at end of file diff --git a/public/language/he/admin/settings/advanced.json b/public/language/he/admin/settings/advanced.json index 86f3267f11..67ac61d90e 100644 --- a/public/language/he/admin/settings/advanced.json +++ b/public/language/he/admin/settings/advanced.json @@ -13,7 +13,7 @@ "headers.acao-help": "כדי למנוע גישה לכל האתרים, השאר ריק", "headers.acao-regex-help": "הכנס תבנית טקסט (Regex) כאן כדי לאפשר קריאה דינאמית מאתרים חיצוניים. אם ברצונך לחסום כל גישה חיצונית, השאר ריק.", "headers.acac": "אתרים אשר אל בקשות אליהם, יתווספו גם נתוני כניסה כגוןCookie וכו'. ( Access-Control-Allow-Credentials)", - "headers.acam": "Access-Control-Allow-Methods", + "headers.acam": "שיטות אפשריות בבקרת גישה", "headers.acah": "Access-Control-Allow-Headers", "headers.coep": "Cross-Origin-Embedder-Policy", "headers.coep-help": "When enabled (default), will set the header to require-corp", diff --git a/public/language/he/global.json b/public/language/he/global.json index 5ca8d625b3..5695c66530 100644 --- a/public/language/he/global.json +++ b/public/language/he/global.json @@ -23,7 +23,7 @@ "close": "סגור", "pagination": "הגדרות עמוד", "pagination.out_of": "%1 מתוך %2", - "pagination.enter_index": "הכניסו אינדקס", + "pagination.enter_index": "Go to post index", "header.admin": "ניהול", "header.categories": "קטגוריות", "header.recent": "פוסטים אחרונים", diff --git a/public/language/he/modules.json b/public/language/he/modules.json index 7f88bbba95..66c91ba452 100644 --- a/public/language/he/modules.json +++ b/public/language/he/modules.json @@ -1,6 +1,6 @@ { "chat.chatting_with": "שוחח עם", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", + "chat.placeholder": "הקלד את הודעת הצ'אט כאן, ניתן לגרור ולשחרר תמונות, בסיום הקש אנטר כדי לשלוח.", "chat.scroll-up-alert": "אתה מסתכל על הודעות ישנות. לחץ כאן למעבר להודעה האחרונה.", "chat.send": "שלח", "chat.no_active": "אין לך צ'אטים פעילים", @@ -68,8 +68,8 @@ "bootbox.ok": "אישור", "bootbox.cancel": "בטל", "bootbox.confirm": "אשר", - "bootbox.submit": "Submit", - "bootbox.send": "Send", + "bootbox.submit": "שליחה", + "bootbox.send": "שלח", "cover.dragging_title": "מיקום תמונת נושא", "cover.dragging_message": "גרור תמונת נושא למיקום הרצוי ולחץ על \"שמור\"", "cover.saved": "תמונת הנושא והמיקום נשמר", diff --git a/public/language/he/post-queue.json b/public/language/he/post-queue.json index d19745d77d..21d9b2921d 100644 --- a/public/language/he/post-queue.json +++ b/public/language/he/post-queue.json @@ -15,7 +15,7 @@ "topic": "נושא", "accept": "אשר", "reject": "דחה", - "remove": "Remove", + "remove": "הסרה", "notify": "Notify", - "notify-user": "Notify User" + "notify-user": "שלח התראה למשתמש" } \ No newline at end of file diff --git a/public/language/he/topic.json b/public/language/he/topic.json index ab0fd64ff6..00d5bb627c 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "לפני %1 ", "first-post": "פוסט ראשון", "last-post": "פוסט אחרון", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "רשום תשובה מהירה" } \ No newline at end of file diff --git a/public/language/he/user.json b/public/language/he/user.json index bff782998a..1c065dd3d8 100644 --- a/public/language/he/user.json +++ b/public/language/he/user.json @@ -184,7 +184,7 @@ "consent.export_posts": "יצוא פוסטים (CVS.)", "consent.export-posts-success": "ייצוא הפוסטים מתבצע כעת. תקבל התראה כאשר הייצוא יסתיים.", "emailUpdate.intro": "אנא הכנס את כתובת הדוא\"ל שלך. הפורום משתמש בדוא\"ל שלך לשליחת תקציר מתוזמן והתראות, כמו כן לשחזור חשבון במקרה ששוכחים את הסיסמה.", - "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email you will not be able to recover your account or login with your email.", - "emailUpdate.required": "This field is required.", + "emailUpdate.optional": "שדה זה הוא אופציונלי. אינך מחויב לספק את כתובת הדוא\"ל שלך, אך ללא דוא\"ל מאומת לא תוכל לשחזר את חשבונך או להתחבר באמצעות הדוא\"ל שלך.", + "emailUpdate.required": "זהו שדה חובה", "emailUpdate.change-instructions": "מייל אימות יישלח לכתובת דוא\"ל שהכנסת עם קישור ייחודי. לחיצה על הקישור יאמת את בעלותך על הדוא\"ל ותקבל גישה לחשבונך. בכל זמן, תוכל לעדכן את כתובת הדוא\"ל שלך בדף החשבון שלך." } \ No newline at end of file diff --git a/public/language/he/users.json b/public/language/he/users.json index 4200448b7c..459dfa1d61 100644 --- a/public/language/he/users.json +++ b/public/language/he/users.json @@ -5,7 +5,7 @@ "most_flags": "הכי הרבה דיווחי משתמשים", "search": "חיפוש", "enter_username": "הכנס שם משתמש לחיפוש", - "search-user-for-chat": "Search a user to start chat", + "search-user-for-chat": "חפש משתמש כדי להתחיל איתו צאט", "load_more": "טען עוד", "users-found-search-took": "%1 משתמשים נמצאו! החיפוש ערך %2 שניות.", "filter-by": "פלטר על-פי", diff --git a/public/language/hr/global.json b/public/language/hr/global.json index 2409238471..f673e499f4 100644 --- a/public/language/hr/global.json +++ b/public/language/hr/global.json @@ -23,7 +23,7 @@ "close": "Zatvori", "pagination": "Stranice", "pagination.out_of": "%1 od %2", - "pagination.enter_index": "Unesi index", + "pagination.enter_index": "Go to post index", "header.admin": "Admin", "header.categories": "Kategorije", "header.recent": "Posljednje", diff --git a/public/language/hr/topic.json b/public/language/hr/topic.json index 3ec9d668ce..2deebc9d42 100644 --- a/public/language/hr/topic.json +++ b/public/language/hr/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/hu/global.json b/public/language/hu/global.json index 74150e826a..fd340e9ed6 100644 --- a/public/language/hu/global.json +++ b/public/language/hu/global.json @@ -23,7 +23,7 @@ "close": "Bezárás", "pagination": "Lapozás", "pagination.out_of": "%1 / %2", - "pagination.enter_index": "Írj be egy számot", + "pagination.enter_index": "Go to post index", "header.admin": "Admin", "header.categories": "Kategóriák", "header.recent": "Legutóbbi", diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index a4dd13f9e9..7c3d7639c1 100644 --- a/public/language/hu/topic.json +++ b/public/language/hu/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 korábban", "first-post": "Első bejegyzés", "last-post": "Utolsó bejegyzés", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/id/global.json b/public/language/id/global.json index d195d1b458..17706017db 100644 --- a/public/language/id/global.json +++ b/public/language/id/global.json @@ -23,7 +23,7 @@ "close": "Tutup", "pagination": "Halaman", "pagination.out_of": "%1 dari %2", - "pagination.enter_index": "Masukkan index", + "pagination.enter_index": "Go to post index", "header.admin": "Admin", "header.categories": "Kategori", "header.recent": "Terbaru", diff --git a/public/language/id/topic.json b/public/language/id/topic.json index ab52065f66..8f0069cf35 100644 --- a/public/language/id/topic.json +++ b/public/language/id/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/it/global.json b/public/language/it/global.json index de920881c3..2064486bfd 100644 --- a/public/language/it/global.json +++ b/public/language/it/global.json @@ -23,7 +23,7 @@ "close": "Chiudi", "pagination": "Impaginazione", "pagination.out_of": "%1 di %2", - "pagination.enter_index": "Inserisci un numero di pagina", + "pagination.enter_index": "Go to post index", "header.admin": "Amministratore", "header.categories": "Categorie", "header.recent": "Recenti", diff --git a/public/language/it/topic.json b/public/language/it/topic.json index 48a3fa285e..861fcdd58f 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 precedente", "first-post": "Primo post", "last-post": "Ultimo post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Invia una risposta rapida" } \ No newline at end of file diff --git a/public/language/ja/global.json b/public/language/ja/global.json index 79abf1cf83..5803512829 100644 --- a/public/language/ja/global.json +++ b/public/language/ja/global.json @@ -23,7 +23,7 @@ "close": "閉じる", "pagination": "ページ", "pagination.out_of": "%2件中%1件目", - "pagination.enter_index": "Enter index", + "pagination.enter_index": "Go to post index", "header.admin": "管理", "header.categories": "カテゴリ", "header.recent": "最近", diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json index 0b86bb1f2a..3714d41002 100644 --- a/public/language/ja/topic.json +++ b/public/language/ja/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/ko/global.json b/public/language/ko/global.json index ec2f1cf2f1..6e1fb5b669 100644 --- a/public/language/ko/global.json +++ b/public/language/ko/global.json @@ -23,7 +23,7 @@ "close": "닫기", "pagination": "페이지", "pagination.out_of": "현재: %1 / 전체: %2", - "pagination.enter_index": "이동할 포스트 번호 입력", + "pagination.enter_index": "Go to post index", "header.admin": "관리자", "header.categories": "카테고리", "header.recent": "최근", diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json index 528c6b9ea8..935d9af1fa 100644 --- a/public/language/ko/topic.json +++ b/public/language/ko/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 이전", "first-post": "첫 포스트", "last-post": "마지막 포스트", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "빠른 답글" } \ No newline at end of file diff --git a/public/language/lt/global.json b/public/language/lt/global.json index a06519ea93..00a6bde041 100644 --- a/public/language/lt/global.json +++ b/public/language/lt/global.json @@ -23,7 +23,7 @@ "close": "Uždaryti", "pagination": "Numeracija", "pagination.out_of": "%1 iš %2", - "pagination.enter_index": "Įrašykite indeksą", + "pagination.enter_index": "Go to post index", "header.admin": "Administratorius", "header.categories": "Kategorijos", "header.recent": "Naujausi", diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json index bdc184f0ee..7ed7fcbf2d 100644 --- a/public/language/lt/topic.json +++ b/public/language/lt/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/lv/global.json b/public/language/lv/global.json index 9b26c4db9b..85848c8caf 100644 --- a/public/language/lv/global.json +++ b/public/language/lv/global.json @@ -23,7 +23,7 @@ "close": "Aizvērt", "pagination": "Dalīšana pa lapām", "pagination.out_of": "%1 no %2", - "pagination.enter_index": "Ievadīt numuru", + "pagination.enter_index": "Go to post index", "header.admin": "Administrācija", "header.categories": "Kategorijas", "header.recent": "Nesenie", diff --git a/public/language/lv/topic.json b/public/language/lv/topic.json index 8131549d18..a8be194f4e 100644 --- a/public/language/lv/topic.json +++ b/public/language/lv/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/ms/global.json b/public/language/ms/global.json index 7c19ebea3a..fb5d0a418c 100644 --- a/public/language/ms/global.json +++ b/public/language/ms/global.json @@ -23,7 +23,7 @@ "close": "Tutup", "pagination": "Mukasurat", "pagination.out_of": "%1 daripada %2", - "pagination.enter_index": "Masukkan indeks", + "pagination.enter_index": "Go to post index", "header.admin": "Pentadbir", "header.categories": "Kategori", "header.recent": "Terkini", diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json index edf0561b24..293118fe3c 100644 --- a/public/language/ms/topic.json +++ b/public/language/ms/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/nb/global.json b/public/language/nb/global.json index db3a528802..a1ae5a4246 100644 --- a/public/language/nb/global.json +++ b/public/language/nb/global.json @@ -23,7 +23,7 @@ "close": "Lukk", "pagination": "Paginering", "pagination.out_of": "%1 ut av %2", - "pagination.enter_index": "Skriv indeks", + "pagination.enter_index": "Go to post index", "header.admin": "Admin", "header.categories": "Kategorier", "header.recent": "Seneste", diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index 29f9bb7451..80d1fdb89e 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 tidligere", "first-post": "Første innlegg", "last-post": "Seneste innlegg", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/nl/global.json b/public/language/nl/global.json index 11e43a68b0..16de8cfe8e 100644 --- a/public/language/nl/global.json +++ b/public/language/nl/global.json @@ -23,7 +23,7 @@ "close": "Sluiten", "pagination": "Paginering", "pagination.out_of": "%1 van %2", - "pagination.enter_index": "Vul index in", + "pagination.enter_index": "Go to post index", "header.admin": "Beheer", "header.categories": "Categorieën", "header.recent": "Recent", diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index 70eabc5866..105660390d 100644 --- a/public/language/nl/topic.json +++ b/public/language/nl/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 eerder", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/pl/global.json b/public/language/pl/global.json index 7d741ff85a..4a096c650b 100644 --- a/public/language/pl/global.json +++ b/public/language/pl/global.json @@ -23,7 +23,7 @@ "close": "Zamknij", "pagination": "Numerowanie stron", "pagination.out_of": "%1 z %2", - "pagination.enter_index": "Wpisz indeks.", + "pagination.enter_index": "Go to post index", "header.admin": "Administracja", "header.categories": "Kategorie", "header.recent": "Ostatnie", diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index cf20f58725..1eaedfba9e 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 wcześniej", "first-post": "Pierwszy post", "last-post": "Ostatni post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Wyślij szybką odpowiedź" } \ No newline at end of file diff --git a/public/language/pt-BR/global.json b/public/language/pt-BR/global.json index 0924675e72..642255b20d 100644 --- a/public/language/pt-BR/global.json +++ b/public/language/pt-BR/global.json @@ -23,7 +23,7 @@ "close": "Fechar", "pagination": "Paginação", "pagination.out_of": "%1 de %2", - "pagination.enter_index": "Digite o índice", + "pagination.enter_index": "Go to post index", "header.admin": "Admin", "header.categories": "Categorias", "header.recent": "Recente", diff --git a/public/language/pt-BR/topic.json b/public/language/pt-BR/topic.json index 486474c98e..25f9f9c7e9 100644 --- a/public/language/pt-BR/topic.json +++ b/public/language/pt-BR/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 mais cedo", "first-post": "Primeiro post", "last-post": "Último post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/pt-PT/global.json b/public/language/pt-PT/global.json index ec4d7699f3..1fa4b002ae 100644 --- a/public/language/pt-PT/global.json +++ b/public/language/pt-PT/global.json @@ -23,7 +23,7 @@ "close": "Fechar", "pagination": "Paginação", "pagination.out_of": "%1 de %2", - "pagination.enter_index": "Introduz o index", + "pagination.enter_index": "Go to post index", "header.admin": "Administrador", "header.categories": "Categorias", "header.recent": "Recentes", diff --git a/public/language/pt-PT/topic.json b/public/language/pt-PT/topic.json index 4431773b6f..8ef50f4130 100644 --- a/public/language/pt-PT/topic.json +++ b/public/language/pt-PT/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 antes", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/ro/global.json b/public/language/ro/global.json index 18001ec1cf..ebfa75e87f 100644 --- a/public/language/ro/global.json +++ b/public/language/ro/global.json @@ -23,7 +23,7 @@ "close": "Închide", "pagination": "Paginație", "pagination.out_of": "%1 din %2", - "pagination.enter_index": "Introdu index", + "pagination.enter_index": "Go to post index", "header.admin": "Admin", "header.categories": "Categorii", "header.recent": "Recente", diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json index 7cc9fad6de..a662b40186 100644 --- a/public/language/ro/topic.json +++ b/public/language/ro/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/ru/global.json b/public/language/ru/global.json index 3ac793b3bf..7cce07e5fe 100644 --- a/public/language/ru/global.json +++ b/public/language/ru/global.json @@ -23,7 +23,7 @@ "close": "Закрыть", "pagination": "Разбивка на страницы", "pagination.out_of": "%1 из %2", - "pagination.enter_index": "Перейти на...", + "pagination.enter_index": "Go to post index", "header.admin": "Админка", "header.categories": "Категории", "header.recent": "Последние", diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index c000f9b989..9f1f2b1df2 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "на %1 раньше", "first-post": "Первое сообщение", "last-post": "Последнее сообщение", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/rw/global.json b/public/language/rw/global.json index 532188b2d3..8416897c52 100644 --- a/public/language/rw/global.json +++ b/public/language/rw/global.json @@ -23,7 +23,7 @@ "close": "Funga", "pagination": "Umubare wa Paji", "pagination.out_of": "%1 muri %2", - "pagination.enter_index": "Shyiramo umubare", + "pagination.enter_index": "Go to post index", "header.admin": "Ubuyobozi", "header.categories": "Ibyiciro", "header.recent": "Ibiheruka", diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json index eb1f7844d7..31e8bc72ae 100644 --- a/public/language/rw/topic.json +++ b/public/language/rw/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/sc/global.json b/public/language/sc/global.json index 43c0fd3a9b..2fe64fec86 100644 --- a/public/language/sc/global.json +++ b/public/language/sc/global.json @@ -23,7 +23,7 @@ "close": "Serra", "pagination": "Paginatzione", "pagination.out_of": "%1 out of %2", - "pagination.enter_index": "Enter index", + "pagination.enter_index": "Go to post index", "header.admin": "Amministradore", "header.categories": "Categories", "header.recent": "Ùrtimos", diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json index e39101a711..e72421f966 100644 --- a/public/language/sc/topic.json +++ b/public/language/sc/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/sk/global.json b/public/language/sk/global.json index d3a468c8c1..06ee020b42 100644 --- a/public/language/sk/global.json +++ b/public/language/sk/global.json @@ -23,7 +23,7 @@ "close": "Zatvoriť", "pagination": "Stránkovanie", "pagination.out_of": "%1 z %2", - "pagination.enter_index": "Zadajte záznam", + "pagination.enter_index": "Go to post index", "header.admin": "Správca", "header.categories": "Kategórie", "header.recent": "Nedávne", diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json index 6ca052381d..991af9c827 100644 --- a/public/language/sk/topic.json +++ b/public/language/sk/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/sl/global.json b/public/language/sl/global.json index 28006cfc21..ebea071723 100644 --- a/public/language/sl/global.json +++ b/public/language/sl/global.json @@ -23,7 +23,7 @@ "close": "Zapri", "pagination": "Oštevilčenje strani", "pagination.out_of": "%1 od %2", - "pagination.enter_index": "Vnesi številko", + "pagination.enter_index": "Go to post index", "header.admin": "Skrbnik", "header.categories": "Kategorije", "header.recent": "Nedavno", diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json index 416dba9af3..403fef6f9e 100644 --- a/public/language/sl/topic.json +++ b/public/language/sl/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "Prva objava", "last-post": "Zadnja obava", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Objavi hitri odgovor" } \ No newline at end of file diff --git a/public/language/sr/global.json b/public/language/sr/global.json index c6073e81fd..e696ef72f1 100644 --- a/public/language/sr/global.json +++ b/public/language/sr/global.json @@ -23,7 +23,7 @@ "close": "Затвори", "pagination": "Нумерисање страница", "pagination.out_of": "%1 од %2", - "pagination.enter_index": "Унесите индекс", + "pagination.enter_index": "Go to post index", "header.admin": "Админ", "header.categories": "Категорије", "header.recent": "Недавно", diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json index 6de9356949..e01610788f 100644 --- a/public/language/sr/topic.json +++ b/public/language/sr/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 раније", "first-post": "Прва порука", "last-post": "Последња порука", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Објави брзи одговор" } \ No newline at end of file diff --git a/public/language/sv/global.json b/public/language/sv/global.json index f14fe0afbd..b030cada5d 100644 --- a/public/language/sv/global.json +++ b/public/language/sv/global.json @@ -23,7 +23,7 @@ "close": "Stäng", "pagination": "Siduppdelning", "pagination.out_of": "%1 av %2", - "pagination.enter_index": "Skriv in index ", + "pagination.enter_index": "Go to post index", "header.admin": "Admin", "header.categories": "Kategorier", "header.recent": "Senaste", diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index a363d87bde..b04019a686 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 tidigare", "first-post": "Första inlägget", "last-post": "Sista inlägget", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Gör ett snabbsvar" } \ No newline at end of file diff --git a/public/language/th/global.json b/public/language/th/global.json index 8b8bd12fd1..21cad1c9c3 100644 --- a/public/language/th/global.json +++ b/public/language/th/global.json @@ -23,7 +23,7 @@ "close": "ปิด", "pagination": "การแบ่งหน้า", "pagination.out_of": "%1 จาก %2", - "pagination.enter_index": "กรอกหมายเลข", + "pagination.enter_index": "Go to post index", "header.admin": "ผู้ดูแลระบบ", "header.categories": "หมวดหมู่", "header.recent": "ล่าสุด", diff --git a/public/language/th/topic.json b/public/language/th/topic.json index f2650c2f71..d73a99bc3b 100644 --- a/public/language/th/topic.json +++ b/public/language/th/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 earlier", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/tr/global.json b/public/language/tr/global.json index 1e0e42dce3..f743ebc4bb 100644 --- a/public/language/tr/global.json +++ b/public/language/tr/global.json @@ -23,7 +23,7 @@ "close": "Kapat", "pagination": "Sayfalara numara koyma", "pagination.out_of": "%1 - %2", - "pagination.enter_index": "İndex gir", + "pagination.enter_index": "Go to post index", "header.admin": "Yönetim", "header.categories": "Kategoriler", "header.recent": "Güncel", diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index df15194719..50ee344b4b 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 önce", "first-post": "İlk ileti", "last-post": "Son ileti", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Hızlı yanıt gönder" } \ No newline at end of file diff --git a/public/language/uk/global.json b/public/language/uk/global.json index 42601de5db..4bc5e4d55e 100644 --- a/public/language/uk/global.json +++ b/public/language/uk/global.json @@ -23,7 +23,7 @@ "close": "Закрити", "pagination": "Розбиття на сторінки", "pagination.out_of": "%1 із %2", - "pagination.enter_index": "Уведіть номер", + "pagination.enter_index": "Go to post index", "header.admin": "Адмін", "header.categories": "Категорії", "header.recent": "Недавні", diff --git a/public/language/uk/topic.json b/public/language/uk/topic.json index bfa9de865b..149f97f45b 100644 --- a/public/language/uk/topic.json +++ b/public/language/uk/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 раніше", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/vi/admin/settings/uploads.json b/public/language/vi/admin/settings/uploads.json index f22d0b3b53..7a8fadf405 100644 --- a/public/language/vi/admin/settings/uploads.json +++ b/public/language/vi/admin/settings/uploads.json @@ -2,7 +2,7 @@ "posts": "Bài Đăng", "private": "Đặt tệp tải lên ở chế độ riêng tư", "strip-exif-data": "Tách Dữ Liệu EXIF", - "preserve-orphaned-uploads": "Keep uploaded files on disk after a post is purged", + "preserve-orphaned-uploads": "Giữ các tệp đã tải lên trên đĩa sau khi bài đăng được xóa", "private-extensions": "Phần mở rộng tệp để đặt ở chế độ riêng tư", "private-uploads-extensions-help": "Nhập danh sách phần mở rộng tệp tại đây phân tách bằng dấu phẩy để đặt ở chế độ riêng tư (VD: pdf,xls,doc). Để trống có nghĩa là mọi tệp đều riêng tư.", "resize-image-width-threshold": "Chỉnh kích cỡ ảnh nếu chúng rộng hơn chiều rộng đã đặt", diff --git a/public/language/vi/global.json b/public/language/vi/global.json index bc9a48332a..ddce58282d 100644 --- a/public/language/vi/global.json +++ b/public/language/vi/global.json @@ -23,7 +23,7 @@ "close": "Đóng", "pagination": "Phân trang", "pagination.out_of": "%1 trong số %2", - "pagination.enter_index": "Nhập chỉ mục", + "pagination.enter_index": "Đi đến chỉ mục bài đăng", "header.admin": "Quản trị viên", "header.categories": "Chuyên mục", "header.recent": "Gần đây", diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json index 51babdd1b6..93da4be69f 100644 --- a/public/language/vi/topic.json +++ b/public/language/vi/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 trước đó", "first-post": "Bài viết đầu tiên", "last-post": "Bài viết cuối cùng", + "go-to-my-next-post": "Đi tới bài kế tiếp của tôi", + "no-more-next-post": "Bạn không có bài viết nào khác trong chủ đề này", "post-quick-reply": "Đăng trả lời nhanh" } \ No newline at end of file diff --git a/public/language/zh-CN/global.json b/public/language/zh-CN/global.json index 1ac52ce361..26ecd2cd89 100644 --- a/public/language/zh-CN/global.json +++ b/public/language/zh-CN/global.json @@ -23,7 +23,7 @@ "close": "关闭", "pagination": "分页", "pagination.out_of": "%1 / %2", - "pagination.enter_index": "输入索引", + "pagination.enter_index": "Go to post index", "header.admin": "管理", "header.categories": "版块", "header.recent": "最新", diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json index 979923debc..f16405fdd3 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 前", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/language/zh-TW/global.json b/public/language/zh-TW/global.json index 315e195d8b..bc492eda30 100644 --- a/public/language/zh-TW/global.json +++ b/public/language/zh-TW/global.json @@ -23,7 +23,7 @@ "close": "關閉", "pagination": "分頁", "pagination.out_of": "%1 / %2", - "pagination.enter_index": "輸入索引", + "pagination.enter_index": "Go to post index", "header.admin": "管理", "header.categories": "版面", "header.recent": "最新", diff --git a/public/language/zh-TW/topic.json b/public/language/zh-TW/topic.json index cda13ebbb1..513a23dfe5 100644 --- a/public/language/zh-TW/topic.json +++ b/public/language/zh-TW/topic.json @@ -181,5 +181,7 @@ "timeago_earlier": "%1 前", "first-post": "First post", "last-post": "Last post", + "go-to-my-next-post": "Go to my next post", + "no-more-next-post": "You don't have more posts in this topic", "post-quick-reply": "Post quick reply" } \ No newline at end of file diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 0f07e884a1..577b116580 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -383,13 +383,13 @@ define('forum/topic/postTools', [ slug = '[[global:guest]]'; } } + if (slug && slug !== '[[global:former_user]]' && slug !== '[[global:guest]]') { + slug = '@' + slug; + } resolve(slug); }); return; } - if (post.length && post.attr('data-uid') !== '0') { - slug = '@' + slug; - } resolve(slug); }); diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index a2b2956e4e..824f55434a 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -54,15 +54,22 @@ define('navigator', ['forum/pagination', 'components', 'hooks', 'alerts'], funct e.stopPropagation(); }); - paginationBlockEl.off('shown.bs.dropdown', '.dropdown').on('shown.bs.dropdown', '.dropdown', function () { - setTimeout(function () { - $('.pagination-block input').focus(); + paginationBlockEl.off('shown.bs.dropdown', '.wrapper').on('shown.bs.dropdown', '.wrapper', function () { + setTimeout(async function () { + if (utils.findBootstrapEnvironment() === 'lg') { + $('.pagination-block input').focus(); + } + const postCountInTopic = await socket.emit('topics.getPostCountInTopic', ajaxify.data.tid); + if (postCountInTopic > 0) { + paginationBlockEl.find('#myNextPostBtn').removeAttr('disabled'); + } }, 100); }); paginationBlockEl.find('.pageup').off('click').on('click', navigator.scrollUp); paginationBlockEl.find('.pagedown').off('click').on('click', navigator.scrollDown); paginationBlockEl.find('.pagetop').off('click').on('click', navigator.toTop); paginationBlockEl.find('.pagebottom').off('click').on('click', navigator.toBottom); + paginationBlockEl.find('#myNextPostBtn').off('click').on('click', gotoMyNextPost); paginationBlockEl.find('input').on('keydown', function (e) { if (e.which === 13) { @@ -90,6 +97,39 @@ define('navigator', ['forum/pagination', 'components', 'hooks', 'alerts'], funct navigator.update(0); }; + let lastNextIndex = 0; + async function gotoMyNextPost() { + async function getNext(startIndex) { + return await socket.emit('topics.getMyNextPostIndex', { + tid: ajaxify.data.tid, + index: Math.max(1, startIndex), + sort: config.topicPostSort, + }); + } + if (ajaxify.data.template.topic) { + let nextIndex = await getNext(index); + if (lastNextIndex === nextIndex) { // handles last post in pagination + nextIndex = await getNext(nextIndex); + } + if (nextIndex && index !== nextIndex + 1) { + lastNextIndex = nextIndex; + $(window).one('action:ajaxify.end', function () { + if (paginationBlockEl.find('.dropdown-menu').is(':hidden')) { + paginationBlockEl.find('.dropdown-toggle').dropdown('toggle'); + } + }); + navigator.scrollToIndex(nextIndex, true, 0); + } else { + alerts.alert({ + message: '[[topic:no-more-next-post]]', + type: 'info', + }); + + lastNextIndex = 1; + } + } + } + function clampTop(newTop) { const parent = thumb.parent(); const parentOffset = parent.offset(); diff --git a/src/posts/delete.js b/src/posts/delete.js index 9cb26b2860..aaf2618186 100644 --- a/src/posts/delete.js +++ b/src/posts/delete.js @@ -60,6 +60,7 @@ module.exports = function (Posts) { deletePostFromUsersVotes(pid), deletePostFromReplies(postData), deletePostFromGroups(postData), + deletePostDiffs(pid), db.sortedSetsRemove(['posts:pid', 'posts:votes', 'posts:flagged'], pid), Posts.uploads.dissociateAll(pid), ]); @@ -144,4 +145,12 @@ module.exports = function (Posts) { const keys = groupNames[0].map(groupName => `group:${groupName}:member:pids`); await db.sortedSetsRemove(keys, postData.pid); } + + async function deletePostDiffs(pid) { + const timestamps = await Posts.diffs.list(pid); + await db.deleteAll([ + `post:${pid}:diffs`, + ...timestamps.map(t => `diff:${pid}.${t}`), + ]); + } }; diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js index 71798a3311..4183063b1f 100644 --- a/src/socket.io/topics.js +++ b/src/socket.io/topics.js @@ -1,9 +1,14 @@ 'use strict'; +const _ = require('lodash'); + +const db = require('../database'); +const posts = require('../posts'); const topics = require('../topics'); const user = require('../user'); const meta = require('../meta'); const privileges = require('../privileges'); +const cache = require('../cache'); const SocketTopics = module.exports; @@ -54,4 +59,60 @@ SocketTopics.isModerator = async function (socket, tid) { return await user.isModerator(socket.uid, cid); }; +SocketTopics.getMyNextPostIndex = async function (socket, data) { + if (!data || !data.tid || !data.index || !data.sort) { + throw new Error('[[error:invalid-data]]'); + } + + async function getTopicPids(index) { + const topicSet = data.sort === 'most_votes' ? `tid:${data.tid}:posts:votes` : `tid:${data.tid}:posts`; + const reverse = data.sort === 'newest_to_oldest' || data.sort === 'most_votes'; + const cacheKey = `np:s:${topicSet}:r:${String(reverse)}:tid:${data.tid}:pids`; + const topicPids = cache.get(cacheKey); + if (topicPids) { + return topicPids.slice(index - 1); + } + const pids = await db[reverse ? 'getSortedSetRevRange' : 'getSortedSetRange'](topicSet, 0, -1); + cache.set(cacheKey, pids, 30000); + return pids.slice(index - 1); + } + + async function getUserPids() { + const cid = await topics.getTopicField(data.tid, 'cid'); + const cacheKey = `np:cid:${cid}:uid:${socket.uid}:pids`; + const userPids = cache.get(cacheKey); + if (userPids) { + return userPids; + } + const pids = await db.getSortedSetRange(`cid:${cid}:uid:${socket.uid}:pids`, 0, -1); + cache.set(cacheKey, pids, 30000); + return pids; + } + const postCountInTopic = await db.sortedSetScore(`tid:${data.tid}:posters`, socket.uid); + if (postCountInTopic <= 0) { + return 0; + } + const [topicPids, userPidsInCategory] = await Promise.all([ + getTopicPids(data.index), + getUserPids(), + ]); + const userPidsInTopic = _.intersection(topicPids, userPidsInCategory); + if (!userPidsInTopic.length) { + if (postCountInTopic > 0) { + // wrap around to beginning + const wrapIndex = await SocketTopics.getMyNextPostIndex(socket, { ...data, index: 1 }); + return wrapIndex; + } + return 0; + } + return await posts.getPidIndex(userPidsInTopic[0], data.tid, data.sort); +}; + +SocketTopics.getPostCountInTopic = async function (socket, tid) { + if (!socket.uid || !tid) { + return 0; + } + return await db.sortedSetScore(`tid:${tid}:posters`, socket.uid); +}; + require('../promisify')(SocketTopics);