From b188ff6f26a6439b290a7e05fcdf46fde12f54f2 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Wed, 18 Apr 2018 09:26:19 +0000 Subject: [PATCH 01/16] Latest translations and fallbacks --- public/language/de/admin/admin.json | 2 +- .../language/de/admin/appearance/themes.json | 2 +- public/language/de/search.json | 2 +- public/language/he/topic.json | 4 +-- public/language/nl/admin/admin.json | 4 +-- public/language/nl/admin/manage/users.json | 26 +++++++++---------- public/language/pl/admin/settings/user.json | 2 +- public/language/pl/error.json | 2 +- public/language/pl/global.json | 2 +- public/language/pl/reset_password.json | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/public/language/de/admin/admin.json b/public/language/de/admin/admin.json index 5669a4fae2..6e51d91fc0 100644 --- a/public/language/de/admin/admin.json +++ b/public/language/de/admin/admin.json @@ -1,5 +1,5 @@ { - "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?", + "alert.confirm-rebuild-and-restart": "Bist du sicher, dass du NodeBB neu bauen und neu starten möchtest?", "alert.confirm-restart": "Bist du sicher, dass du NodeBB neu starten möchtest?", "acp-title": "%1 | NodeBB Admin Systemsteuerung", diff --git a/public/language/de/admin/appearance/themes.json b/public/language/de/admin/appearance/themes.json index dc43a00325..09019b588b 100644 --- a/public/language/de/admin/appearance/themes.json +++ b/public/language/de/admin/appearance/themes.json @@ -7,5 +7,5 @@ "revert-confirm": "Bist du dir sicher, dass du das standard NodeBB Theme wieder herstellen willst?", "theme-changed": "Theme geändert", "revert-success": "Du hast dein NodeBB erfolgreich wieder auf das Standard-Theme zurückgesetzt.", - "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme." + "restart-to-activate": "Bitte baue und starte NodeBB neu um das Theme zu aktivieren." } \ No newline at end of file diff --git a/public/language/de/search.json b/public/language/de/search.json index bc779b9579..17afbfc5f4 100644 --- a/public/language/de/search.json +++ b/public/language/de/search.json @@ -6,7 +6,7 @@ "titles": "Titel", "titles-posts": "Titel und Beiträge", "match-words": "Match words", - "all": "All", + "all": "Alle", "any": "Any", "posted-by": "Geschrieben von", "in-categories": "In Kategorien", diff --git a/public/language/he/topic.json b/public/language/he/topic.json index 6646a22adb..c1ca850610 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -35,11 +35,11 @@ "view-history": "ערוך היסטוריה", "bookmark_instructions": "לחץ כאן לחזור לפוסט האחרון שקראת בנושא הזה.", "flag_title": "דווח על פוסט זה למנהל", - "merged_message": "This topic has been merged into %2", + "merged_message": "נושא זה מוזג עם %2", "deleted_message": "נושא זה נמחק. רק משתמשים עם ההרשאות המתאימות יכולים לצפות בו.", "following_topic.message": "מעתה, תקבל הודעות כאשר מישהו יעלה פוסט לנושא זה.", "not_following_topic.message": "תוכל לראות נושא זה ברשימת הנושאים שלא נקראו, אולם לא תוכל לקבל התראות כשמישהו יעלה פוסט על נושא זה.", - "ignoring_topic.message": "You will no longer see this topic in the unread topics list. You will be notified when you are mentioned or your post is up voted.", + "ignoring_topic.message": "לא תוכל לראות עוד נושא זה ברשימת הנושאים של נקראו. תקבל הודעה כשאתה תוזכר או כשהפוסט שלך יקבל הצבעה חיובית", "login_to_subscribe": "אנא הרשם או התחבר על-מנת לעקוב אחר נושא זה.", "markAsUnreadForAll.success": "נושא זה סומן כלא נקרא לכולם.", "mark_unread": "סמן כלא נקרא", diff --git a/public/language/nl/admin/admin.json b/public/language/nl/admin/admin.json index 2f59978661..39ddd56430 100644 --- a/public/language/nl/admin/admin.json +++ b/public/language/nl/admin/admin.json @@ -1,7 +1,7 @@ { - "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?", + "alert.confirm-rebuild-and-restart": "Weet u zeker dat u de NodeBB bestanden wilt hergenereren en NodeBB opnieuw wilt opstarten?", "alert.confirm-restart": "Weet u zeker dat u NodeBB opnieuw wilt opstarten?", - "acp-title": "%1 | NodeBB Administratiepaneel", + "acp-title": "%1 | NodeBB Administrator Controle Paneel", "settings-header-contents": "Inhoud" } \ No newline at end of file diff --git a/public/language/nl/admin/manage/users.json b/public/language/nl/admin/manage/users.json index 2b11bcf109..7a7bebaddc 100644 --- a/public/language/nl/admin/manage/users.json +++ b/public/language/nl/admin/manage/users.json @@ -1,21 +1,21 @@ { - "users": "Users", - "edit": "Edit", - "make-admin": "Make Admin", - "remove-admin": "Remove Admin", - "validate-email": "Validate Email", - "send-validation-email": "Send Validation Email", - "password-reset-email": "Send Password Reset Email", - "ban": "Ban User(s)", - "temp-ban": "Ban User(s) Temporarily", + "users": "Gebruikers", + "edit": "Aanpassen", + "make-admin": "Maak administrator", + "remove-admin": "Verwijder administrator", + "validate-email": "Bevestig Email", + "send-validation-email": "Verstuur Email bevestiging", + "password-reset-email": "Verstuur wachtwoord herstel email", + "ban": "Verban gebruiker(s)", + "temp-ban": "Verban gebruiker(s) tijdelijk", "unban": "Unban User(s)", "reset-lockout": "Reset Lockout", "reset-flags": "Reset Flags", - "delete": "Delete User(s)", - "purge": "Delete User(s) and Content", + "delete": "Verwijder gebruiker(s)", + "purge": "Verwijder gebruiker(s) en inhoud", "download-csv": "Download CSV", - "invite": "Invite", - "new": "New User", + "invite": "Uitnodigen", + "new": "Nieuwe gebruiker", "pills.latest": "Latest Users", "pills.unvalidated": "Not Validated", diff --git a/public/language/pl/admin/settings/user.json b/public/language/pl/admin/settings/user.json index cdd8c101db..7b4b71f139 100644 --- a/public/language/pl/admin/settings/user.json +++ b/public/language/pl/admin/settings/user.json @@ -2,7 +2,7 @@ "authentication": "Uwierzytelnianie", "allow-local-login": "Zezwalaj na lokalne logowanie", "require-email-confirmation": "Wymagaj potwierdzenia adresu email", - "email-confirm-interval": "Użytkownik nie może ponownie wysłać email z potwierdzeniem, dopóki nie minie", + "email-confirm-interval": "Użytkownik nie może ponownie wysłać e-maila z potwierdzeniem, dopóki nie minie", "email-confirm-email2": "minut", "allow-login-with": "Zezwalaj na logowanie przy użyciu", "allow-login-with.username-email": "Nazwy użytkownika lub adresu email", diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 9890aa410f..c824ed721f 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -18,7 +18,7 @@ "invalid-username-or-password": "Podaj nazwę użytkownika i hasło", "invalid-search-term": "Błędne wyszukiwane wyrażenie", "invalid-url": "Błąd w adresie URL.", - "csrf-invalid": "Logowanie nie powiodło się. Przyczyną jest zapewne wygaśnięcie sesji. Spróbój ponownie.", + "csrf-invalid": "Logowanie nie powiodło się, zapewne na skutek wygaśnięcia sesji. Spróbuj ponownie.", "invalid-pagination-value": "Błędna wartość paginacji, zakres od %1 do %2", "username-taken": "Login zajęty", "email-taken": "Email zajęty", diff --git a/public/language/pl/global.json b/public/language/pl/global.json index d1302630d8..be223e9dd4 100644 --- a/public/language/pl/global.json +++ b/public/language/pl/global.json @@ -16,7 +16,7 @@ "please_log_in": "Proszę się zalogować", "logout": "Wyloguj się", "posting_restriction_info": "Posty mogą pisać tylko zarejestrowani użytkownicy forum. Kliknij tutaj, aby się zalogować.", - "welcome_back": "Witamy ponownie!", + "welcome_back": "Witaj ponownie,", "you_have_successfully_logged_in": "Logowanie powiodło się.", "save_changes": "Zapisz zmiany", "save": "Zapisz", diff --git a/public/language/pl/reset_password.json b/public/language/pl/reset_password.json index e19e25c8d2..87b121a0f3 100644 --- a/public/language/pl/reset_password.json +++ b/public/language/pl/reset_password.json @@ -2,7 +2,7 @@ "reset_password": "Zresetuj hasło", "update_password": "Zmień hasło", "password_changed.title": "Hasło zmienione", - "password_changed.message": "

Hasło zostało zmienione pomyślnie. Zaloguj się ponownie.", + "password_changed.message": "

Hasło zostało zmienione. Zaloguj się ponownie.", "wrong_reset_code.title": "Nieprawidłowy kod resetujący", "wrong_reset_code.message": "Wprowadzony kod resetujący jest nieprawidłowy. Spróbuj ponownie lub uzyskaj nowy kod.", "new_password": "Nowe hasło", From 0971625e635336824c246941fac78b720168beae Mon Sep 17 00:00:00 2001 From: Andrew Rodrigues Date: Wed, 18 Apr 2018 17:59:38 -0400 Subject: [PATCH 02/16] allow global mods to still login locally as well as admins if disabled in ACP --- src/controllers/authentication.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/controllers/authentication.js b/src/controllers/authentication.js index 88d0ec5b49..3ad05c2626 100644 --- a/src/controllers/authentication.js +++ b/src/controllers/authentication.js @@ -380,8 +380,8 @@ authenticationController.localLogin = function (req, username, password, next) { userData: function (next) { db.getObjectFields('user:' + uid, ['password', 'passwordExpiry'], next); }, - isAdmin: function (next) { - user.isAdministrator(uid, next); + isAdminOrGlobalMod: function (next) { + user.isAdminOrGlobalMod(uid, next); }, banned: function (next) { user.isBanned(uid, next); @@ -391,9 +391,9 @@ authenticationController.localLogin = function (req, username, password, next) { function (result, next) { userData = result.userData; userData.uid = uid; - userData.isAdmin = result.isAdmin; + userData.isAdminOrGlobalMod = result.isAdminOrGlobalMod; - if (!result.isAdmin && parseInt(meta.config.allowLocalLogin, 10) === 0) { + if (!result.isAdminOrGlobalMod && parseInt(meta.config.allowLocalLogin, 10) === 0) { return next(new Error('[[error:local-login-disabled]]')); } From a3224cc4baa5994e9541cd07ca61d56bc294b147 Mon Sep 17 00:00:00 2001 From: Andrew Rodrigues Date: Wed, 18 Apr 2018 18:04:05 -0400 Subject: [PATCH 03/16] added missing language key --- public/language/en-GB/error.json | 1 + 1 file changed, 1 insertion(+) diff --git a/public/language/en-GB/error.json b/public/language/en-GB/error.json index 260c397de6..1a3803cc14 100644 --- a/public/language/en-GB/error.json +++ b/public/language/en-GB/error.json @@ -21,6 +21,7 @@ "invalid-username-or-password": "Please specify both a username and password", "invalid-search-term": "Invalid search term", "invalid-url": "Invalid URL", + "local-login-disabled": "Local login system has been disabled for non-privileged accounts.", "csrf-invalid": "We were unable to log you in, likely due to an expired session. Please try again", "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2", From 2482696e35002807a1da29177c4dc7b12322a07b Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Thu, 19 Apr 2018 09:26:18 +0000 Subject: [PATCH 04/16] Latest translations and fallbacks --- .../language/es/admin/manage/post-queue.json | 10 +++---- public/language/he/admin/manage/users.json | 28 +++++++++---------- public/language/he/global.json | 4 +-- public/language/he/modules.json | 14 +++++----- public/language/he/notifications.json | 14 +++++----- public/language/he/topic.json | 4 +-- public/language/ru/modules.json | 4 +-- public/language/ru/search.json | 4 +-- 8 files changed, 41 insertions(+), 41 deletions(-) diff --git a/public/language/es/admin/manage/post-queue.json b/public/language/es/admin/manage/post-queue.json index 4de24c991b..7503ce5906 100644 --- a/public/language/es/admin/manage/post-queue.json +++ b/public/language/es/admin/manage/post-queue.json @@ -2,10 +2,10 @@ "post-queue": "Post Queue", "description": "There are no posts in the post queue.
To enable this feature, go to Settings → Post → Posting Restrictions and enable Post Queue.", "user": "User", - "category": "Category", - "title": "Title", - "content": "Content", - "posted": "Posted", - "reply-to": "Reply to \"%1\"", + "category": "Categoría", + "title": "Título", + "content": "Contenido", + "posted": "Publicado", + "reply-to": "Responder a %1", "content-editable": "You can click on individual content to edit before posting." } \ No newline at end of file diff --git a/public/language/he/admin/manage/users.json b/public/language/he/admin/manage/users.json index dcd55998e8..8fbe3d5280 100644 --- a/public/language/he/admin/manage/users.json +++ b/public/language/he/admin/manage/users.json @@ -21,14 +21,14 @@ "pills.unvalidated": "Not Validated", "pills.no-posts": "אין פוסטים", "pills.top-posters": "מפרסמים הכי הרבה", - "pills.top-rep": "Most Reputation", + "pills.top-rep": "מוניטין הכי גבוה", "pills.inactive": "לא-פעיל", "pills.flagged": "Most Flagged", "pills.banned": "מורחק", "pills.search": "חיפוש משתמשים", "search.uid": "על פי זהות משתמש", - "search.uid-placeholder": "Enter a user ID to search", + "search.uid-placeholder": "הזן מספר משתמש לחיפוש", "search.username": "על פי שם משתמש", "search.username-placeholder": "הזן שם משתמש לחיפוש", "search.email": "על פי דוא\"ל", @@ -46,10 +46,10 @@ "users.email": "דוא\"ל", "users.postcount": "postcount", "users.reputation": "reputation", - "users.flags": "flags", - "users.joined": "joined", - "users.last-online": "last online", - "users.banned": "banned", + "users.flags": "דגלים", + "users.joined": "הצטרף", + "users.last-online": "נראה לאחרונה", + "users.banned": "מורחק", "create.username": "שם משתמש", "create.email": "דוא\"ל", @@ -57,27 +57,27 @@ "create.password": "סיסמה", "create.password-confirm": "אשר סיסמה", - "temp-ban.length": "Ban Length", + "temp-ban.length": "זמן הרחקה", "temp-ban.reason": "סיבה (אופציונאלי)", "temp-ban.hours": "שעות", "temp-ban.days": "ימים", - "temp-ban.explanation": "Enter the length of time for the ban. Note that a time of 0 will be a considered a permanent ban.", + "temp-ban.explanation": "הזן את זמן ההרחקה. שים לב כי הזנת זמן 0 יחשב כהרחקה לצמיתות.", "alerts.confirm-ban": "האם אתה רוצה להרחיק משתמש זה לצמיתות?", - "alerts.confirm-ban-multi": "Do you really want to ban these users permanently?", - "alerts.ban-success": "User(s) banned!", - "alerts.button-ban-x": "Ban %1 user(s)", - "alerts.unban-success": "User(s) unbanned!", + "alerts.confirm-ban-multi": "האם אתה באמת רוצה להרחיק את המשתמשים לצמיתות?", + "alerts.ban-success": "משתמש(ים) הורחק/ו!", + "alerts.button-ban-x": "הרחק %1 משתמש(ים)", + "alerts.unban-success": "משתמש(ים) הורחק/ו!", "alerts.lockout-reset-success": "Lockout(s) reset!", "alerts.flag-reset-success": "Flags(s) reset!", - "alerts.no-remove-yourself-admin": "You can't remove yourself as Administrator!", + "alerts.no-remove-yourself-admin": "אינך יכול להרחיק את עצמך כמנהל!", "alerts.make-admin-success": "המשתמש הנו מנהל עכשיו", "alerts.confirm-remove-admin": "האם אתה בטוח רוצה להסיר את המנהל הזה?", "alerts.remove-admin-success": "בוטלה הרשאת מנהל למשתמש", "alerts.make-global-mod-success": "מעתה המשתמש הנו מנהל קבוצות כללי", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", "alerts.remove-global-mod-success": "User is no longer global moderator.", - "alerts.make-moderator-success": "User is now moderator.", + "alerts.make-moderator-success": "המשתמש מנהל קבוצה כעת.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", "alerts.confirm-validate-email": "האם אתה רוצה לאמת דואל(ים) למשתמש(ים) האלה?", diff --git a/public/language/he/global.json b/public/language/he/global.json index 0868fee8be..ef80ae739c 100644 --- a/public/language/he/global.json +++ b/public/language/he/global.json @@ -53,7 +53,7 @@ "topics": "נושאים", "posts": "פוסטים", "best": "הגבוה ביותר", - "votes": "Votes", + "votes": "הצבעות", "upvoters": "מצביעי בעד", "upvoted": "הוצבע בעד", "downvoters": "מצביעי נגד", @@ -107,5 +107,5 @@ "edited": "נערך", "disabled": "לא מאופשר", "select": "בחר", - "user-search-prompt": "Type something here to find users..." + "user-search-prompt": "נסה כאן למציאת משתמשים" } \ No newline at end of file diff --git a/public/language/he/modules.json b/public/language/he/modules.json index 667fdbe9dd..d9f31fdcfc 100644 --- a/public/language/he/modules.json +++ b/public/language/he/modules.json @@ -1,5 +1,5 @@ { - "chat.chatting_with": "Chat with", + "chat.chatting_with": "לשוחח עם", "chat.placeholder": "הקלד את הודעת הצ'אט כאן, לחץ אנטר לשליחה", "chat.send": "שלח", "chat.no_active": "אין לך צ'אטים פעילים", @@ -12,7 +12,7 @@ "chat.recent-chats": "צ'אטים אחרונים", "chat.contacts": "אנשי קשר", "chat.message-history": "היסטוריית הודעות", - "chat.options": "Chat options", + "chat.options": "אפשרויות לשיחה", "chat.pop-out": "הוצא את חלון הצ'אט", "chat.minimize": "צמצם", "chat.maximize": "הרחב", @@ -25,13 +25,13 @@ "chat.manage-room": "Manage Chat Room", "chat.add-user-help": "Search for users here. When selected, the user will be added to the chat. The new user will not be able to see chat messages written before they were added to the conversation.", "chat.confirm-chat-with-dnd-user": "משתמש זה שינה את הסטטוס שלו ל 'לא להפריע'. אתה עדיין מעוניין לשוחח איתו?", - "chat.rename-room": "Rename room", - "chat.rename-placeholder": "Enter your room name here", + "chat.rename-room": "שנה שם של חדר", + "chat.rename-placeholder": "הזן את שם החדר שלך כאן", "chat.rename-help": "The room name set here will be viewable by all participants in the room.", - "chat.leave": "Leave Chat", - "chat.leave-prompt": "Are you sure you wish to leave this chat?", + "chat.leave": "עזוב שיחה", + "chat.leave-prompt": "האם אתה בטוח שאתה רוצה לעזוב את השיחה הזו?", "chat.leave-help": "Leaving this chat will remove you from future correspondence in this chat. If you are re-added in the future, you will not see any chat history from prior to your re-joining.", - "chat.in-room": "In this room", + "chat.in-room": "בתוך החדר הזה", "composer.compose": "צור", "composer.show_preview": "הצג תצוגה מקדימה", "composer.hide_preview": "הסתר תצוגה מקדימה", diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index 2956f24da3..9db560ac88 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -9,7 +9,7 @@ "continue_to": "המשך ל %1", "return_to": "חזור ל %1", "new_notification": "התראה חדשה", - "new_notification_from": "You have a new Notification from %1", + "new_notification_from": "יש לך התראה חדשה מ %1", "you_have_unread_notifications": "יש לך התראות שלא נקראו.", "all": "הכל", "topics": "נושאים", @@ -52,13 +52,13 @@ "email_only": "דוא\"ל בלבד", "notification_and_email": "התראות & דוא\"ל", "notificationType_upvote": "When someone upvotes your post", - "notificationType_new-topic": "When someone you follow posts a topic", - "notificationType_new-reply": "When a new reply is posted in a topic you are watching", - "notificationType_follow": "When someone starts following you", - "notificationType_new-chat": "When you receive a chat message", - "notificationType_group-invite": "When you receive a group invite", + "notificationType_new-topic": "כשמישהו שאתה עוקב אחריו פרסם נושא", + "notificationType_new-reply": "כשתגובה חדשה מפורסמת בנושא שאתה צופה בו", + "notificationType_follow": "כשמישהו מתחיל לעקוב אחריך", + "notificationType_new-chat": "כשאתה מקבל הודעת צאט", + "notificationType_group-invite": "כשאתה מקבל הזמנה מקבוצה", "notificationType_new-register": "When someone gets added to registration queue", - "notificationType_post-queue": "When a new post is queued", + "notificationType_post-queue": "כשהודעה חדשה נכנסת לתור", "notificationType_new-post-flag": "When a post is flagged", "notificationType_new-user-flag": "When a user is flagged" } \ No newline at end of file diff --git a/public/language/he/topic.json b/public/language/he/topic.json index c1ca850610..c645a2c23f 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -52,8 +52,8 @@ "watching": "עוקב", "not-watching": "לא עוקב", "ignoring": "מתעלם", - "watching.description": "Notify me of new replies.
Show topic in unread.", - "not-watching.description": "Do not notify me of new replies.
Show topic in unread if category is not ignored.", + "watching.description": "הודע לי על תגובות חדשות.
הצג נושא חדש ברשימת הלא נקראו.", + "not-watching.description": "אל תיידע אותי על תגובות חדשות.
הצג נושא חדש ברשימת הלא נקראו במידה ובחרתי לא להתעלם מקבוצת הדיון", "ignoring.description": "Do not notify me of new replies.
Do not show topic in unread.", "thread_tools.title": "כלי נושא", "thread_tools.markAsUnreadForAll": "סמן לא נקרא לכולם", diff --git a/public/language/ru/modules.json b/public/language/ru/modules.json index 0bd452bdc3..9cb49d7f94 100644 --- a/public/language/ru/modules.json +++ b/public/language/ru/modules.json @@ -28,8 +28,8 @@ "chat.rename-room": "Rename room", "chat.rename-placeholder": "Enter your room name here", "chat.rename-help": "The room name set here will be viewable by all participants in the room.", - "chat.leave": "Leave Chat", - "chat.leave-prompt": "Are you sure you wish to leave this chat?", + "chat.leave": "Покинуть Чат", + "chat.leave-prompt": "Вы действительно хотите покинуть чат?", "chat.leave-help": "Leaving this chat will remove you from future correspondence in this chat. If you are re-added in the future, you will not see any chat history from prior to your re-joining.", "chat.in-room": "In this room", "composer.compose": "Редактор сообщений", diff --git a/public/language/ru/search.json b/public/language/ru/search.json index f685b6f9c0..3c2d5ec9b8 100644 --- a/public/language/ru/search.json +++ b/public/language/ru/search.json @@ -6,8 +6,8 @@ "titles": "Названия", "titles-posts": "Названия и записи", "match-words": "Match words", - "all": "All", - "any": "Any", + "all": "Все", + "any": "Любые", "posted-by": "В именах авторов записей", "in-categories": "В сообществах", "search-child-categories": "Искать в рубриках", From bdbdf510e05aa0865f00ba06ad04acfa6c860df3 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 19 Apr 2018 14:24:01 -0400 Subject: [PATCH 05/16] closes #6462 --- public/src/ajaxify.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 39cbb48c48..8e1b85e407 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -109,9 +109,8 @@ $(document).ready(function () { url = ajaxify.removeRelativePath(url.replace(/^\/|\/$/g, '')).toLowerCase(); var isClientToAdmin = url.startsWith('admin') && window.location.pathname.indexOf(RELATIVE_PATH + '/admin') !== 0; var isAdminToClient = !url.startsWith('admin') && window.location.pathname.indexOf(RELATIVE_PATH + '/admin') === 0; - var uploadsOrApi = url.startsWith('assets/') || url.startsWith('uploads') || url.startsWith('api'); - if (isClientToAdmin || isAdminToClient || uploadsOrApi) { + if (isClientToAdmin || isAdminToClient) { window.open(RELATIVE_PATH + '/' + url, '_top'); return true; } @@ -390,6 +389,13 @@ $(document).ready(function () { return; } + // Default behaviour for uploads and direct links to API urls + if (internalLink && ['/assets/uploads/', '/api/'].some(function (prefix) { + return String(_self.pathname).startsWith(config.relative_path + prefix); + })) { + return; + } + if (hrefEmpty(this.href) || this.protocol === 'javascript:' || $(this).attr('href') === '#') { return e.preventDefault(); } From 03758a41c3f591518a80fc808c957c3453303ba9 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Fri, 20 Apr 2018 09:26:33 +0000 Subject: [PATCH 06/16] Latest translations and fallbacks --- public/language/he/admin/manage/tags.json | 2 +- public/language/he/admin/manage/users.json | 14 +++++++------- public/language/he/modules.json | 10 +++++----- public/language/he/notifications.json | 8 ++++---- public/language/he/topic.json | 2 +- public/language/he/user.json | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/public/language/he/admin/manage/tags.json b/public/language/he/admin/manage/tags.json index 195a442b92..e6ca573ad1 100644 --- a/public/language/he/admin/manage/tags.json +++ b/public/language/he/admin/manage/tags.json @@ -7,7 +7,7 @@ "create": "צור תג", "modify": "שנה תג", "rename": "שנה שם של תג", - "delete": "Delete Selected Tags", + "delete": "מחק תגים שנבחרו", "search": "חפש תג...", "settings": "Click here to visit the tag settings page.", "name": "שם תג", diff --git a/public/language/he/admin/manage/users.json b/public/language/he/admin/manage/users.json index 8fbe3d5280..06d41ce304 100644 --- a/public/language/he/admin/manage/users.json +++ b/public/language/he/admin/manage/users.json @@ -3,13 +3,13 @@ "edit": "ערוך", "make-admin": "הפוך למנהל", "remove-admin": "הסר הרשאת מנהל", - "validate-email": "אמת דוא\"ל", - "send-validation-email": "שלח דואל אימות", + "validate-email": "סמן את דוא\"ל המשתמש/ים כמאומת", + "send-validation-email": "שלח בקשת אימות דוא\"ל למשתמש/ים", "password-reset-email": "שלח דוא\"ל לאיפוס סיסמה", "ban": "הרחק משתמש(ים)", "temp-ban": "הרחק משתמש(ים) באופן זמני", "unban": "בטל הרחקת משתמש(ים)", - "reset-lockout": "אתחל מחדש נעילה", + "reset-lockout": "שחרר נעילת חשבון", "reset-flags": "Reset Flags", "delete": "מחק משתמש(ים)", "purge": "מחק משתמש(ים) ומידע", @@ -18,7 +18,7 @@ "new": "משתמש חדש", "pills.latest": "משתמשים אחרונים", - "pills.unvalidated": "Not Validated", + "pills.unvalidated": "לא מאומת", "pills.no-posts": "אין פוסטים", "pills.top-posters": "מפרסמים הכי הרבה", "pills.top-rep": "מוניטין הכי גבוה", @@ -66,7 +66,7 @@ "alerts.confirm-ban": "האם אתה רוצה להרחיק משתמש זה לצמיתות?", "alerts.confirm-ban-multi": "האם אתה באמת רוצה להרחיק את המשתמשים לצמיתות?", "alerts.ban-success": "משתמש(ים) הורחק/ו!", - "alerts.button-ban-x": "הרחק %1 משתמש(ים)", + "alerts.button-ban-x": "אזהרה, %1 משתמש(ים) יפגעו", "alerts.unban-success": "משתמש(ים) הורחק/ו!", "alerts.lockout-reset-success": "Lockout(s) reset!", "alerts.flag-reset-success": "Flags(s) reset!", @@ -80,12 +80,12 @@ "alerts.make-moderator-success": "המשתמש מנהל קבוצה כעת.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", - "alerts.confirm-validate-email": "האם אתה רוצה לאמת דואל(ים) למשתמש(ים) האלה?", + "alerts.confirm-validate-email": "האם אתה רוצה לאמת דואל(ים) למשתמש(ים) הללו?", "alerts.validate-email-success": "דואלים אומתו.", "alerts.password-reset-confirm": "האם אתה רוצה לשלוח איפוס סיסמת דואל(ים) למשתמש(ים) האלה?", "alerts.confirm-delete": "אזהרה!
האם אתה רוצה למחוק משתמש(ים)?
פעולה זו אינה הפיכה! רק חשבון המשתמש יימחק, הפוסטים והנושאים שלו ישארו.", "alerts.delete-success": "משתמש(ים) נמחק!", - "alerts.confirm-purge": "אזהרה!
האם אתה באמת רוצה למחוק משתמש(ים) ואת התוכן שלהם? פעולה זו בלתי הפיכה! כל המידע והתכנים של המשתמש ימחקו!", + "alerts.confirm-purge": "אזהרה!
האם אתה באמת רוצה למחוק משתמש(ים) ואת התוכן שיצרו? פעולה זו בלתי הפיכה! כל המידע והתכנים של המשתמש ימחקו!", "alerts.create": "צור משתמש", "alerts.button-create": "צור", "alerts.button-cancel": "בטל", diff --git a/public/language/he/modules.json b/public/language/he/modules.json index d9f31fdcfc..708c96bd4d 100644 --- a/public/language/he/modules.json +++ b/public/language/he/modules.json @@ -21,16 +21,16 @@ "chat.three_months": "3 חודשים", "chat.delete_message_confirm": "האם אתה בטוח שברצונך למחוק הודעה זו?", "chat.add-users-to-room": "הוסף משתמשים לצ'אט", - "chat.retrieving-users": "Retrieving users...", - "chat.manage-room": "Manage Chat Room", - "chat.add-user-help": "Search for users here. When selected, the user will be added to the chat. The new user will not be able to see chat messages written before they were added to the conversation.", + "chat.retrieving-users": "שולף משתמשים", + "chat.manage-room": "נהל חדר צ'אט", + "chat.add-user-help": "חפש משתמשים כאן. בבחירת משתמש הוא יצטרף לצ'אט. המשתמש החדש יוכל לראות הודעות שנכתבו לפני הצטרפותו.", "chat.confirm-chat-with-dnd-user": "משתמש זה שינה את הסטטוס שלו ל 'לא להפריע'. אתה עדיין מעוניין לשוחח איתו?", "chat.rename-room": "שנה שם של חדר", "chat.rename-placeholder": "הזן את שם החדר שלך כאן", - "chat.rename-help": "The room name set here will be viewable by all participants in the room.", + "chat.rename-help": "שם החדר המוגדר כאן יהיה זמין לכל המשתתפים בחדר.", "chat.leave": "עזוב שיחה", "chat.leave-prompt": "האם אתה בטוח שאתה רוצה לעזוב את השיחה הזו?", - "chat.leave-help": "Leaving this chat will remove you from future correspondence in this chat. If you are re-added in the future, you will not see any chat history from prior to your re-joining.", + "chat.leave-help": "עזיבת צ'אט זה תסיר אותך מהתכתבות עתידית בצ'אט זה. אם תתווסף מחדש בעתיד, לא תראה כל היסטוריית צ'אט שלפני הצטרפותך מחדש.", "chat.in-room": "בתוך החדר הזה", "composer.compose": "צור", "composer.show_preview": "הצג תצוגה מקדימה", diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index 9db560ac88..0b9d8d4744 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -51,14 +51,14 @@ "notification_only": "התראות בלבד", "email_only": "דוא\"ל בלבד", "notification_and_email": "התראות & דוא\"ל", - "notificationType_upvote": "When someone upvotes your post", + "notificationType_upvote": "כאשר מישהו מצביע בעד הפוסט שלך", "notificationType_new-topic": "כשמישהו שאתה עוקב אחריו פרסם נושא", "notificationType_new-reply": "כשתגובה חדשה מפורסמת בנושא שאתה צופה בו", "notificationType_follow": "כשמישהו מתחיל לעקוב אחריך", "notificationType_new-chat": "כשאתה מקבל הודעת צאט", "notificationType_group-invite": "כשאתה מקבל הזמנה מקבוצה", - "notificationType_new-register": "When someone gets added to registration queue", + "notificationType_new-register": "כאשר מישהו מתווסף לתור הרישום", "notificationType_post-queue": "כשהודעה חדשה נכנסת לתור", - "notificationType_new-post-flag": "When a post is flagged", - "notificationType_new-user-flag": "When a user is flagged" + "notificationType_new-post-flag": "כאשר פוסט מסומן", + "notificationType_new-user-flag": "כאשר משתמש מסומן" } \ No newline at end of file diff --git a/public/language/he/topic.json b/public/language/he/topic.json index c645a2c23f..271de73841 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -127,5 +127,5 @@ "link_back": "תגובה: [%1](%2)", "diffs.title": "Post Edit History", "diffs.description": "This post has %1 revisions. Click one of the revisions below to see the post content at that point in time.", - "diffs.no-revisions-description": "This post has %1 revisions." + "diffs.no-revisions-description": "לפוסט זה יש %1גרסאות" } \ No newline at end of file diff --git a/public/language/he/user.json b/public/language/he/user.json index 56ec35951f..cb774ed8ef 100644 --- a/public/language/he/user.json +++ b/public/language/he/user.json @@ -29,7 +29,7 @@ "ignored": "התעלם", "followers": "עוקבים", "following": "עוקב אחרי", - "aboutme": "עליי", + "aboutme": "אודותי", "signature": "חתימה", "birthday": "יום הולדת", "chat": "צ'אט", @@ -66,7 +66,7 @@ "upload_a_picture": "העלה תמונה", "remove_uploaded_picture": "מחק את התמונה שהועלתה", "upload_cover_picture": "העלה תמונת נושא", - "remove_cover_picture_confirm": "האם אתה בטוח שאתה רוצה למחוק את תמונת הקאבר?", + "remove_cover_picture_confirm": "האם אתה בטוח שאתה רוצה למחוק את תמונת הרקע?", "crop_picture": "חתוך תמונה", "upload_cropped_picture": "חתוך והעלה", "settings": "הגדרות", From 877b45ab0047c31cb92f586e7fb0f06b5c1c4b87 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 20 Apr 2018 10:35:49 -0400 Subject: [PATCH 07/16] adding old path to uploads as well, to ajaxify shirt-circuit --- public/src/ajaxify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 8e1b85e407..589c3a71f8 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -390,7 +390,7 @@ $(document).ready(function () { } // Default behaviour for uploads and direct links to API urls - if (internalLink && ['/assets/uploads/', '/api/'].some(function (prefix) { + if (internalLink && ['/uploads', '/assets/uploads/', '/api/'].some(function (prefix) { return String(_self.pathname).startsWith(config.relative_path + prefix); })) { return; From bb3f98eb05a55fad58fa1725c8814a42f5e3bc52 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sat, 21 Apr 2018 09:26:25 +0000 Subject: [PATCH 08/16] Latest translations and fallbacks --- public/language/zh-CN/admin/settings/post.json | 2 +- public/language/zh-CN/global.json | 2 +- public/language/zh-CN/topic.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/language/zh-CN/admin/settings/post.json b/public/language/zh-CN/admin/settings/post.json index c8bdf3692c..b471b57013 100644 --- a/public/language/zh-CN/admin/settings/post.json +++ b/public/language/zh-CN/admin/settings/post.json @@ -3,7 +3,7 @@ "sorting.post-default": "默认帖子排序", "sorting.oldest-to-newest": "从旧到新", "sorting.newest-to-oldest": "从新到旧", - "sorting.most-votes": "最多投票", + "sorting.most-votes": "最多赞同", "sorting.most-posts": "最多回复", "sorting.topic-default": "默认主题排序", "length": "帖子长度", diff --git a/public/language/zh-CN/global.json b/public/language/zh-CN/global.json index bdb63f6748..a0fddbfdf9 100644 --- a/public/language/zh-CN/global.json +++ b/public/language/zh-CN/global.json @@ -53,7 +53,7 @@ "topics": "主题", "posts": "帖子", "best": "最佳", - "votes": "投票", + "votes": "赞同", "upvoters": "顶的人", "upvoted": "顶", "downvoters": "踩的人", diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json index 19971fde40..0fefa3db42 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -118,7 +118,7 @@ "sort_by": "排序", "oldest_to_newest": "从旧到新", "newest_to_oldest": "从新到旧", - "most_votes": "最多投票", + "most_votes": "最多赞同", "most_posts": "最多回复", "stale.title": "接受建议并创建新主题？", "stale.warning": "您回复的主题已经很古老了，是否发布新主题并引用此主题的内容？", From 6659a520e034c1e41b9335afa6dd0ccd97227269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 22 Apr 2018 09:10:02 -0400 Subject: [PATCH 09/16] closes #6465 --- src/controllers/accounts/settings.js | 13 ++-------- src/controllers/admin/settings.js | 28 +++------------------ src/notifications.js | 30 ++++++++++++++++++++++ src/user/settings.js | 37 +++++++++++++--------------- 4 files changed, 53 insertions(+), 55 deletions(-) diff --git a/src/controllers/accounts/settings.js b/src/controllers/accounts/settings.js index 5166222706..5f5bb57aa7 100644 --- a/src/controllers/accounts/settings.js +++ b/src/controllers/accounts/settings.js @@ -9,6 +9,7 @@ var meta = require('../../meta'); var plugins = require('../../plugins'); var privileges = require('../../privileges'); var categories = require('../../categories'); +var notifications = require('../../notifications'); var db = require('../../database'); var helpers = require('../helpers'); var accountHelpers = require('./helpers'); @@ -180,15 +181,6 @@ settingsController.get = function (req, res, callback) { }; function getNotificationSettings(userData, callback) { - var types = [ - 'notificationType_upvote', - 'notificationType_new-topic', - 'notificationType_new-reply', - 'notificationType_follow', - 'notificationType_new-chat', - 'notificationType_group-invite', - ]; - var privilegedTypes = []; async.waterfall([ @@ -206,8 +198,7 @@ function getNotificationSettings(userData, callback) { privilegedTypes.push('notificationType_new-user-flag'); } plugins.fireHook('filter:user.notificationTypes', { - userData: userData, - types: types, + types: notifications.baseTypes.slice(), privilegedTypes: privilegedTypes, }, next); }, diff --git a/src/controllers/admin/settings.js b/src/controllers/admin/settings.js index 678a9e4e8c..d711e7cdcc 100644 --- a/src/controllers/admin/settings.js +++ b/src/controllers/admin/settings.js @@ -4,7 +4,7 @@ var async = require('async'); var meta = require('../../meta'); var emailer = require('../../emailer'); -var plugins = require('../../plugins'); +var notifications = require('../../notifications'); var settingsController = module.exports; @@ -45,32 +45,12 @@ function renderEmail(req, res, next) { } function renderUser(req, res, next) { - var types = [ - 'notificationType_upvote', - 'notificationType_new-topic', - 'notificationType_new-reply', - 'notificationType_follow', - 'notificationType_new-chat', - 'notificationType_group-invite', - ]; - - var privilegedTypes = [ - 'notificationType_new-register', - 'notificationType_post-queue', - 'notificationType_new-post-flag', - 'notificationType_new-user-flag', - ]; - async.waterfall([ function (next) { - plugins.fireHook('filter:user.notificationTypes', { - userData: {}, - types: types, - privilegedTypes: privilegedTypes, - }, next); + notifications.getAllNotificationTypes(next); }, - function (results) { - var notificationSettings = results.types.concat(results.privilegedTypes).map(function (type) { + function (notificationTypes) { + var notificationSettings = notificationTypes.map(function (type) { return { name: type, label: '[[notifications:' + type + ']]', diff --git a/src/notifications.js b/src/notifications.js index 8a91c44509..a9ef31f734 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -17,6 +17,36 @@ var emailer = require('./emailer'); var Notifications = module.exports; +Notifications.baseTypes = [ + 'notificationType_upvote', + 'notificationType_new-topic', + 'notificationType_new-reply', + 'notificationType_follow', + 'notificationType_new-chat', + 'notificationType_group-invite', +]; + +Notifications.privilegedTypes = [ + 'notificationType_new-register', + 'notificationType_post-queue', + 'notificationType_new-post-flag', + 'notificationType_new-user-flag', +]; + +Notifications.getAllNotificationTypes = function (callback) { + async.waterfall([ + function (next) { + plugins.fireHook('filter:user.notificationTypes', { + types: Notifications.baseTypes.slice(), + privilegedTypes: Notifications.privilegedTypes.slice(), + }, next); + }, + function (results, next) { + next(null, results.types.concat(results.privilegedTypes)); + }, + ], callback); +}; + Notifications.startJobs = function () { winston.verbose('[notifications.init] Registering jobs.'); new cron('*/30 * * * *', Notifications.prune, null, true); diff --git a/src/user/settings.js b/src/user/settings.js index c654d2dd99..202c440d14 100644 --- a/src/user/settings.js +++ b/src/user/settings.js @@ -6,6 +6,7 @@ var async = require('async'); var meta = require('../meta'); var db = require('../database'); var plugins = require('../plugins'); +var notifications = require('../notifications'); module.exports = function (User) { User.getSettings = function (uid, callback) { @@ -81,12 +82,14 @@ module.exports = function (User) { settings.delayImageLoading = parseInt(getSetting(settings, 'delayImageLoading', 1), 10) === 1; settings.bootswatchSkin = settings.bootswatchSkin || meta.config.bootswatchSkin || 'default'; settings.scrollToMyPost = parseInt(getSetting(settings, 'scrollToMyPost', 1), 10) === 1; - settings.notificationType_upvote = getSetting(settings, 'notificationType_upvote', 'notification'); - settings['notificationType_new-topic'] = getSetting(settings, 'notificationType_new-topic', 'notification'); - settings['notificationType_new-reply'] = getSetting(settings, 'notificationType_new-reply', 'notification'); - settings.notificationType_follow = getSetting(settings, 'notificationType_follow', 'notification'); - settings['notificationType_new-chat'] = getSetting(settings, 'notificationType_new-chat', 'notification'); - settings['notificationType_group-invite'] = getSetting(settings, 'notificationType_group-invite', 'notification'); + + notifications.getAllNotificationTypes(next); + }, + function (notificationTypes, next) { + notificationTypes.forEach(function (notificationType) { + settings[notificationType] = getSetting(settings, notificationType, 'notification'); + }); + next(null, settings); }, ], callback); @@ -139,26 +142,20 @@ module.exports = function (User) { upvoteNotifFreq: data.upvoteNotifFreq, }; - var notificationTypes = [ - 'notificationType_upvote', 'notificationType_new-topic', 'notificationType_new-reply', - 'notificationType_follow', 'notificationType_new-chat', 'notificationType_group-invite', - 'notificationType_new-register', 'notificationType_post-queue', 'notificationType_new-post-flag', - 'notificationType_new-user-flag', - ]; - - notificationTypes.forEach(function (notificationType) { - if (data[notificationType]) { - settings[notificationType] = data[notificationType]; - } - }); - - if (data.bootswatchSkin) { settings.bootswatchSkin = data.bootswatchSkin; } async.waterfall([ function (next) { + notifications.getAllNotificationTypes(next); + }, + function (notificationTypes, next) { + notificationTypes.forEach(function (notificationType) { + if (data[notificationType]) { + settings[notificationType] = data[notificationType]; + } + }); plugins.fireHook('filter:user.saveSettings', { settings: settings, data: data }, next); }, function (result, next) { From 9eac794e8e1d96cfb7b86e81ba6b9c50ee7d4a68 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 23 Apr 2018 16:05:33 -0400 Subject: [PATCH 10/16] normalising behaviour for subfolder installs, #6410 --- src/views/500-embed.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/500-embed.tpl b/src/views/500-embed.tpl index d9d9f30d5d..3bd6857048 100644 --- a/src/views/500-embed.tpl +++ b/src/views/500-embed.tpl @@ -1,6 +1,6 @@