diff --git a/package.json b/package.json index 1f29c41593..ad6bee0c00 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPLv3 or later", "description": "NodeBB Forum", - "version": "0.4.3", + "version": "0.5.0-1", "homepage": "http://www.nodebb.org", "repository": { "type": "git", diff --git a/public/language/ar/error.json b/public/language/ar/error.json index a45bbc0651..df25651826 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -25,6 +25,7 @@ "no-user": "المستخدم لا يوجد", "no-teaser": "Teaser doesn't exist", "no-privileges": "You don't have enough privileges for this action.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "الموضوع مقفول", "still-uploading": "الرجاء انتظار الرفع", diff --git a/public/language/ar/global.json b/public/language/ar/global.json index 195a295122..8808c4a827 100644 --- a/public/language/ar/global.json +++ b/public/language/ar/global.json @@ -13,7 +13,7 @@ "please_log_in": "Please Log In", "logout": "تسجيل الخروج", "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.", - "welcome_back": "Welcome Back ", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "You have successfully logged in", "save_changes": "حفظ التغييرات", "close": "أغلق", diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json index 26f294bdd7..32d6b62dcf 100644 --- a/public/language/ar/notifications.json +++ b/public/language/ar/notifications.json @@ -4,12 +4,11 @@ "see_all": "See all Notifications", "back_to_home": "Back to %1", "outgoing_link": "رابط خارجي", - "outgoing_link_message": "أنت الأن ترحل", - "continue_to": "أكمل إلى", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", - "user_made_post": "%1 made a new post", "new_message_from": "New message from %1", "upvoted_your_post": "%1 has upvoted your post.", "favourited_your_post": "%1 has favourited your post.", diff --git a/public/language/cs/error.json b/public/language/cs/error.json index 4d55d9a4f3..77c582b23f 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -25,6 +25,7 @@ "no-user": "User doesn't exist", "no-teaser": "Teaser doesn't exist", "no-privileges": "You don't have enough privileges for this action.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", diff --git a/public/language/cs/global.json b/public/language/cs/global.json index a32b50ff1a..d833eb88a0 100644 --- a/public/language/cs/global.json +++ b/public/language/cs/global.json @@ -13,7 +13,7 @@ "please_log_in": "Please Log In", "logout": "Odhlásit se", "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.", - "welcome_back": "Welcome Back ", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "You have successfully logged in", "save_changes": "Uložit změny", "close": "Zrušit", diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json index 4d419dd18d..e315bfd6c0 100644 --- a/public/language/cs/notifications.json +++ b/public/language/cs/notifications.json @@ -4,12 +4,11 @@ "see_all": "See all Notifications", "back_to_home": "Back to %1", "outgoing_link": "Odkaz mimo fórum", - "outgoing_link_message": "Nyní opouštíte fórum", - "continue_to": "Přejít na", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", - "user_made_post": "%1 made a new post", "new_message_from": "New message from %1", "upvoted_your_post": "%1 has upvoted your post.", "favourited_your_post": "%1 has favourited your post.", diff --git a/public/language/de/error.json b/public/language/de/error.json index a829c0839e..2115517dcd 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -25,6 +25,7 @@ "no-user": "Der Benutzer existiert nicht", "no-teaser": "Kurztext existiert nicht", "no-privileges": "Du verfügst nicht über ausreichende Berechtigungen, um die Aktion durchzuführen.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategorie ist deaktiviert", "topic-locked": "Thema ist gesperrt", "still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.", diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json index 1f1f8401f0..c89667bd8c 100644 --- a/public/language/de/notifications.json +++ b/public/language/de/notifications.json @@ -4,12 +4,11 @@ "see_all": "Alle Benachrichtigungen ansehen", "back_to_home": "Zurück zu %1", "outgoing_link": "Externer Link", - "outgoing_link_message": "Du verlässt nun", - "continue_to": "Gehe weiter zu", - "return_to": "Zurück zu", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Neue Benachrichtigung", "you_have_unread_notifications": "Du hast ungelesene Benachrichtigungen.", - "user_made_post": "%1 hat einen Beitrag erstellt.", "new_message_from": "Neue Nachricht von %1", "upvoted_your_post": "%1 hat deinen Beitrag positiv bewertet.", "favourited_your_post": "%1 favorisiert deinen Beitrag.", diff --git a/public/language/de/tags.json b/public/language/de/tags.json index f065d4bbfa..79fdd2d405 100644 --- a/public/language/de/tags.json +++ b/public/language/de/tags.json @@ -1,6 +1,6 @@ { - "no_tag_topics": "There are no topics with this tag.", + "no_tag_topics": "Es gibt keine Themen mit diesem Tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", - "no_tags": "There are no tags yet." + "enter_tags_here": "Gib hier Tags ein und drück die Eingabetaste nach jedem Tag.", + "no_tags": "Es gibt bisher keine Tags." } \ No newline at end of file diff --git a/public/language/en@pirate/error.json b/public/language/en@pirate/error.json index 4d55d9a4f3..77c582b23f 100644 --- a/public/language/en@pirate/error.json +++ b/public/language/en@pirate/error.json @@ -25,6 +25,7 @@ "no-user": "User doesn't exist", "no-teaser": "Teaser doesn't exist", "no-privileges": "You don't have enough privileges for this action.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", diff --git a/public/language/en@pirate/global.json b/public/language/en@pirate/global.json index 210e920d4b..1b828eb73c 100644 --- a/public/language/en@pirate/global.json +++ b/public/language/en@pirate/global.json @@ -13,7 +13,7 @@ "please_log_in": "Please Log In", "logout": "Logout", "posting_restriction_info": "Postin' be currently restricted to registered members only, click here to log in.", - "welcome_back": "Welcome to Port", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "Ye have successfully logged in", "save_changes": "Save yer Changes", "close": "Shoot down", diff --git a/public/language/en@pirate/notifications.json b/public/language/en@pirate/notifications.json index 8452e25378..cc1705eff6 100644 --- a/public/language/en@pirate/notifications.json +++ b/public/language/en@pirate/notifications.json @@ -4,12 +4,11 @@ "see_all": "Spy wit' ye eye all ye notifications", "back_to_home": "Back to %1", "outgoing_link": "Go offshore", - "outgoing_link_message": "Ye be goin' offshore", - "continue_to": "Continue to", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", - "user_made_post": "%1 made a new post", "new_message_from": "New message from %1", "upvoted_your_post": "%1 has upvoted your post.", "favourited_your_post": "%1 has favourited your post.", diff --git a/public/language/en_US/error.json b/public/language/en_US/error.json index 89b996b720..bfec6e00d7 100644 --- a/public/language/en_US/error.json +++ b/public/language/en_US/error.json @@ -25,6 +25,7 @@ "no-user": "User doesn't exist", "no-teaser": "Teaser doesn't exist", "no-privileges": "You don't have enough privileges for this action.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", diff --git a/public/language/en_US/notifications.json b/public/language/en_US/notifications.json index 74d6704f1c..7f97d92275 100644 --- a/public/language/en_US/notifications.json +++ b/public/language/en_US/notifications.json @@ -4,12 +4,11 @@ "see_all": "See all Notifications", "back_to_home": "Back to %1", "outgoing_link": "Outgoing Link", - "outgoing_link_message": "You are now leaving", - "continue_to": "Continue to", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", - "user_made_post": "%1 made a new post", "new_message_from": "New message from %1", "upvoted_your_post": "%1 has upvoted your post.", "favourited_your_post": "%1 has favorited your post.", diff --git a/public/language/es/error.json b/public/language/es/error.json index 7065f57dc1..38ff5515ae 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -25,6 +25,7 @@ "no-user": "El usuario no existe", "no-teaser": "El extracto del tema no existe.", "no-privileges": "No tienes los privilegios necesarios para esa acción.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Categoría deshabilitada.", "topic-locked": "Tema bloqueado.", "still-uploading": "Por favor, espera a que terminen las subidas.", diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json index bbb45a3d94..3a7168a44d 100644 --- a/public/language/es/notifications.json +++ b/public/language/es/notifications.json @@ -4,12 +4,11 @@ "see_all": "Ver todas las notificaciones", "back_to_home": "Volver a %1", "outgoing_link": "Enlace Externo", - "outgoing_link_message": "Estas saliendo del sitio", - "continue_to": "Continuar", - "return_to": "Volver a", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Nueva Notificación", "you_have_unread_notifications": "Tienes notificaciones sin leer.", - "user_made_post": "%1 hizo una nueva publicación", "new_message_from": "Nuevo mensaje de %1", "upvoted_your_post": "%1 ha marcado como favorita tu respuesta.", "favourited_your_post": "%1 ha marcado como favorita tu respuesta.", diff --git a/public/language/es/tags.json b/public/language/es/tags.json index f065d4bbfa..cb679cdc7f 100644 --- a/public/language/es/tags.json +++ b/public/language/es/tags.json @@ -1,6 +1,6 @@ { - "no_tag_topics": "There are no topics with this tag.", - "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", - "no_tags": "There are no tags yet." + "no_tag_topics": "No hay temas con esta etiqueta.", + "tags": "Etiquetas", + "enter_tags_here": "Introduce las etiquetas aquí. Pulsa intro desde de cada una.", + "no_tags": "Aún no hay etiquetas." } \ No newline at end of file diff --git a/public/language/et/error.json b/public/language/et/error.json index 464f89ef96..596a04b4df 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -25,6 +25,7 @@ "no-user": "Kasutajat ei eksisteeri", "no-teaser": "Eelvaadet ei eksisteeri", "no-privileges": "Sul pole piisvalt õigusi.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategooria keelatud", "topic-locked": "Teema lukustatud", "still-uploading": "Palun oota, kuni üleslaadimised on laetud.", diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json index 3db1e076ab..4de13a6e0f 100644 --- a/public/language/et/notifications.json +++ b/public/language/et/notifications.json @@ -4,12 +4,11 @@ "see_all": "Vaata kõiki teateid", "back_to_home": "Tagasi %1", "outgoing_link": "Väljaminev link", - "outgoing_link_message": "Lahkud foorumist", - "continue_to": "Jätka", - "return_to": "Pöördu tagasi", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Uus teade", "you_have_unread_notifications": "Sul ei ole lugemata teateid.", - "user_made_post": "%1 tegi uue postituse", "new_message_from": "Uus sõnum kasutajalt %1", "upvoted_your_post": "%1 hääletas sinu postituse poolt.", "favourited_your_post": "%1 märkis sinu postituse lemmikuks.", diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json index 2fad56ff15..cf82fa6622 100644 --- a/public/language/fa_IR/error.json +++ b/public/language/fa_IR/error.json @@ -15,7 +15,7 @@ "invalid-pagination-value": "عدد صفحه‌بندی نامعتبر است.", "username-taken": "این نام کاربری گرفته شده است.", "email-taken": "این رایانامه گرفته شده است.", - "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", + "email-not-confirmed": "رایانامه شما تأیید نشده است، لطفاً برای تأیید رایانامه‌تان اینجا را بفشارید.", "username-too-short": "نام کاربری خیلی کوتاه است.", "user-banned": "کاربر محروم شد.", "no-category": "چنین دسته‌ای وجود ندارد.", @@ -25,6 +25,7 @@ "no-user": "چنین کاربری وجود ندارد.", "no-teaser": "چکیدهٔ دیدگاه وجود ندارد.", "no-privileges": "شما دسترسی کافی برای این کار را ندارید.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "دسته غیر‌فعال شد.", "topic-locked": "جستار بسته شد.", "still-uploading": "خواهشمندیم تا پایان بارگذاری‌ها شکیبا باشید.", diff --git a/public/language/fa_IR/modules.json b/public/language/fa_IR/modules.json index ce4c5f2900..4d22d32319 100644 --- a/public/language/fa_IR/modules.json +++ b/public/language/fa_IR/modules.json @@ -1,17 +1,17 @@ { "chat.chatting_with": "گفتگو با ", - "chat.placeholder": "Type chat message here, press enter to send", + "chat.placeholder": "پیام گفتگو را اینجا بنویسید، دکمه Enter را بزنید تا فرستاده شود.", "chat.send": "فرستادن", "chat.no_active": "شما هیچ گفتگوی فعالی ندارید.", "chat.user_typing": "%1 در حال نوشتن است...", "chat.user_has_messaged_you": "%1 به شما پیام داده است.", "chat.see_all": "نمایش تمامی گفتگوها", - "chat.no-messages": "Please select a recipient to view chat message history", - "chat.recent-chats": "Recent Chats", - "chat.contacts": "Contacts", - "chat.message-history": "Message History", + "chat.no-messages": "مشخص کنید تاریخچه گفتگوهایتان با چه کاربری را می‌خواهید ببینید", + "chat.recent-chats": "گفتگوهای اخیر", + "chat.contacts": "تماس‌ها", + "chat.message-history": "تاریخچه پیام‌ها", "chat.pop-out": "Pop out chat", - "chat.maximize": "Maximize", + "chat.maximize": "تمام صفحه", "composer.user_said_in": "%1 در %2 گفته است:", "composer.user_said": "%1 گفته است:", "composer.discard": "آیا از دور انداختن این دیدگاه اطمینان دارید؟" diff --git a/public/language/fa_IR/notifications.json b/public/language/fa_IR/notifications.json index 9c598ed25e..a643005e04 100644 --- a/public/language/fa_IR/notifications.json +++ b/public/language/fa_IR/notifications.json @@ -4,12 +4,11 @@ "see_all": "دیدن همهٔ آگاه‌سازی‌ها", "back_to_home": "بازگشت به %1", "outgoing_link": "پیوند برون‌رو", - "outgoing_link_message": "شما در حال ترک اینجایید", - "continue_to": "رفتن به", - "return_to": "بازگشت به", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "آکاه‌سازی تازه", "you_have_unread_notifications": "شما آگاه‌سازی‌های نخوانده دارید.", - "user_made_post": "%1 یک دیدگاه تازه فرستاد.", "new_message_from": "پیام تازه از %1", "upvoted_your_post": "%1 به دیدگاه شما رای داده است.", "favourited_your_post": "%1 دیدگاه شما را پسندیده است.", diff --git a/public/language/fa_IR/recent.json b/public/language/fa_IR/recent.json index 5f9b274d43..74a8876ebf 100644 --- a/public/language/fa_IR/recent.json +++ b/public/language/fa_IR/recent.json @@ -3,6 +3,6 @@ "day": "روز", "week": "هفته", "month": "ماه", - "year": "Year", + "year": "سال", "no_recent_topics": "هیچ جستار تازه‌ای نیست." } \ No newline at end of file diff --git a/public/language/fa_IR/user.json b/public/language/fa_IR/user.json index 6cd8180930..cfe346d5fd 100644 --- a/public/language/fa_IR/user.json +++ b/public/language/fa_IR/user.json @@ -3,7 +3,7 @@ "offline": "آفلاین", "username": "نام کاربری", "email": "رایانامه", - "confirm_email": "Confirm Email", + "confirm_email": "تأیید رایانامه", "fullname": "نام کامل", "website": "تارنما", "location": "محل سکونت", diff --git a/public/language/fi/error.json b/public/language/fi/error.json index 466f7aa63e..a9c4718431 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -25,6 +25,7 @@ "no-user": "Käyttäjää ei ole olemassa", "no-teaser": "Teaseria ei ole olemassa", "no-privileges": "Oikeutesi eivät riitä toiminnon suorittamiseen", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategoria ei ole käytössä", "topic-locked": "Aihe lukittu", "still-uploading": "Ole hyvä ja odota tiedostojen lähettämisen valmistumista.", diff --git a/public/language/fi/global.json b/public/language/fi/global.json index 0826c43bc2..03e0a817ba 100644 --- a/public/language/fi/global.json +++ b/public/language/fi/global.json @@ -13,7 +13,7 @@ "please_log_in": "Kirjaudu, ole hyvä", "logout": "Kirjaudu ulos", "posting_restriction_info": "Kirjoittaminen on tällä hetkellä rajattu vain rekisteröityneille käyttäjille. Napsauta tätä kirjautuaksesi.", - "welcome_back": "Tervetuloa takaisin", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "Olet onnistuneesti kirjautunut sisään", "save_changes": "Tallenna muutokset", "close": "Sulje", diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json index 84c4f97043..e9507997a0 100644 --- a/public/language/fi/notifications.json +++ b/public/language/fi/notifications.json @@ -4,12 +4,11 @@ "see_all": "Katso kaikki ilmoitukset", "back_to_home": "Back to %1", "outgoing_link": "Ulkopuolinen linkki", - "outgoing_link_message": "Olet nyt poistumassa", - "continue_to": "Jatka", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Uusi ilmoitus", "you_have_unread_notifications": "Sinulla on lukemattomia ilmoituksia.", - "user_made_post": "%1 kirjoitti uuden viestin", "new_message_from": "Uusi viesti käyttäjältä %1", "upvoted_your_post": "%1 has upvoted your post.", "favourited_your_post": "%1 lisäsi viestisi suosikkeihinsa.", diff --git a/public/language/fr/error.json b/public/language/fr/error.json index e471852ed6..63d9a1765f 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -25,6 +25,7 @@ "no-user": "Cet utilisateur n'existe pas", "no-teaser": "L’aperçu n'existe pas", "no-privileges": "Vous n'avez pas les privilèges nécessaires pour effectuer cette action.", + "no-emailers-configured": "Un email de test n'a pas pu être envoyé car aucun plugin de gestion des emails n'était chargé", "category-disabled": "Catégorie désactivée", "topic-locked": "Sujet verrouillé", "still-uploading": "Veuillez patienter pendant le téléchargement.", diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json index d5b281808f..560fb83751 100644 --- a/public/language/fr/notifications.json +++ b/public/language/fr/notifications.json @@ -4,12 +4,11 @@ "see_all": "Voir toutes les notifications.", "back_to_home": "Revenir à %1", "outgoing_link": "Lien sortant", - "outgoing_link_message": "Vous quittez le forum", - "continue_to": "Continuer vers", - "return_to": "Retourner à", + "outgoing_link_message": "Vous quittez %1.", + "continue_to": "Continuer vers %1", + "return_to": "Revenir à %1", "new_notification": "Nouvelle notification", "you_have_unread_notifications": "Vous avez des notifications non-lues", - "user_made_post": "%1 a posté un nouveau message", "new_message_from": "Nouveau message de %1", "upvoted_your_post": "%1 a voté pour votre message.", "favourited_your_post": "%1 a mis votre message en favoris.", diff --git a/public/language/fr/tags.json b/public/language/fr/tags.json index f065d4bbfa..d89f217a37 100644 --- a/public/language/fr/tags.json +++ b/public/language/fr/tags.json @@ -1,6 +1,6 @@ { - "no_tag_topics": "There are no topics with this tag.", - "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", - "no_tags": "There are no tags yet." + "no_tag_topics": "Il n'y a aucun sujet ayant ce mot-clé", + "tags": "Mots-clés", + "enter_tags_here": "Entrez les mots-clés ici. Appuyez sur entrer après chaque mot-clé.", + "no_tags": "Il n'y a pas encore de mots-clés." } \ No newline at end of file diff --git a/public/language/he/error.json b/public/language/he/error.json index a247274584..c5cd72a2a0 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -25,6 +25,7 @@ "no-user": "משתמש אינו קיים", "no-teaser": "גרין (טיזר) אינו קיים", "no-privileges": "ההרשאות שלך אינן מספיקות לביצוי פעולה זו", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "קטגוריה לא פעילה", "topic-locked": "נושא נעול", "still-uploading": "אנא המתן לסיום ההעלאות", diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index 819f00cbb4..bcbb5eac8b 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -4,12 +4,11 @@ "see_all": "צפה בכל ההתראות", "back_to_home": "Back to %1", "outgoing_link": "לינק", - "outgoing_link_message": "אתה כעת עוזב", - "continue_to": "המשך ל", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", - "user_made_post": "%1 made a new post", "new_message_from": "New message from %1", "upvoted_your_post": "%1 has upvoted your post.", "favourited_your_post": "%1 has favourited your post.", diff --git a/public/language/hu/error.json b/public/language/hu/error.json index 4d55d9a4f3..77c582b23f 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -25,6 +25,7 @@ "no-user": "User doesn't exist", "no-teaser": "Teaser doesn't exist", "no-privileges": "You don't have enough privileges for this action.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", diff --git a/public/language/hu/global.json b/public/language/hu/global.json index 856e8b74a8..58d326cbd5 100644 --- a/public/language/hu/global.json +++ b/public/language/hu/global.json @@ -13,7 +13,7 @@ "please_log_in": "Kérjük, jelentkezzen be", "logout": "Kijelentkezés", "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.", - "welcome_back": "Welcome Back ", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "Sikeresen bejelentkeztél", "save_changes": "Változások mentése", "close": "Bezár", diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json index 7a138c71ec..c189a4e5bb 100644 --- a/public/language/hu/notifications.json +++ b/public/language/hu/notifications.json @@ -4,12 +4,11 @@ "see_all": "Összes értesítés megtekintése", "back_to_home": "Back to %1", "outgoing_link": "Külső Link", - "outgoing_link_message": "Most távozol", - "continue_to": "Folytatás", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", - "user_made_post": "%1 made a new post", "new_message_from": "New message from %1", "upvoted_your_post": "%1 has upvoted your post.", "favourited_your_post": "%1 has favourited your post.", diff --git a/public/language/it/error.json b/public/language/it/error.json index 4d55d9a4f3..77c582b23f 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -25,6 +25,7 @@ "no-user": "User doesn't exist", "no-teaser": "Teaser doesn't exist", "no-privileges": "You don't have enough privileges for this action.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", diff --git a/public/language/it/global.json b/public/language/it/global.json index 6e97099f5e..95a6d2c42a 100644 --- a/public/language/it/global.json +++ b/public/language/it/global.json @@ -13,7 +13,7 @@ "please_log_in": "Per favore Accedi", "logout": "Logout", "posting_restriction_info": "L'inserimento è attualmente ristretto ai soli utenti registrati, clicca qui per effettuare l'accesso.", - "welcome_back": "Bentornato", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "Login avvenuto con successo", "save_changes": "Salva cambiamenti", "close": "Chiudi", diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json index 15af65a07d..1d2e122b74 100644 --- a/public/language/it/notifications.json +++ b/public/language/it/notifications.json @@ -4,12 +4,11 @@ "see_all": "Vedi tutte le Notifiche", "back_to_home": "Back to %1", "outgoing_link": "Link in uscita", - "outgoing_link_message": "Stai lasciando", - "continue_to": "Continua verso", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Nuove Notifiche", "you_have_unread_notifications": "Hai notifiche non lette.", - "user_made_post": "%1 ha scritto un nuovo post", "new_message_from": "Nuovo messaggio da %1", "upvoted_your_post": "%1 has upvoted your post.", "favourited_your_post": "%1 has favourited your post.", diff --git a/public/language/ja/error.json b/public/language/ja/error.json index d3d79457a2..cbaf323360 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -25,6 +25,7 @@ "no-user": "ユーザーが存在しない", "no-teaser": "ティーザーが存在しない", "no-privileges": "このアクションを実行する権限を持っていない。", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "この板は無効された", "topic-locked": "スレッドがロックされた", "still-uploading": "アップロードが完成するまでお待ちください。", diff --git a/public/language/ja/global.json b/public/language/ja/global.json index d9a27e58f4..4f60af52bb 100644 --- a/public/language/ja/global.json +++ b/public/language/ja/global.json @@ -13,7 +13,7 @@ "please_log_in": "ログインください", "logout": "ログアウト", "posting_restriction_info": "登録ユーザーのみが投稿可能となります.こちらからログインください。", - "welcome_back": "お帰りなさい", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "ログインできました", "save_changes": "保存する", "close": "閉じる", diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json index 4892251e80..efe8333fac 100644 --- a/public/language/ja/notifications.json +++ b/public/language/ja/notifications.json @@ -4,12 +4,11 @@ "see_all": "すべての通知を確認", "back_to_home": "Back to %1", "outgoing_link": "外部サイトへのリンク", - "outgoing_link_message": "リービング", - "continue_to": "続き", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "新しい通知", "you_have_unread_notifications": "未読の通知があります。", - "user_made_post": "%1は新しいポストを投稿しました。", "new_message_from": "%1からの新しいメッセージ", "upvoted_your_post": "%1はあなたのポストを評価しました。", "favourited_your_post": "%1はあなたのポストをお気に入りにしました。", diff --git a/public/language/ko/error.json b/public/language/ko/error.json index 3a91281f17..8923760f72 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -25,6 +25,7 @@ "no-user": "존재하지 않는 사용자입니다.", "no-teaser": "존재하지 않는 미리보기입니다.", "no-privileges": "이 작업을 할 수 있는 권한이 없습니다.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "비활성화된 카테고리입니다.", "topic-locked": "잠긴 주제입니다.", "still-uploading": "업로드가 끝날 때까지 기다려 주세요.", diff --git a/public/language/ko/global.json b/public/language/ko/global.json index 9e4ea9c9da..8f95e8602a 100644 --- a/public/language/ko/global.json +++ b/public/language/ko/global.json @@ -13,7 +13,7 @@ "please_log_in": "로그인해 주세요.", "logout": "로그아웃", "posting_restriction_info": "게시물 작성은 현재 회원에게만 제한되고 있습니다. 여기를 누르면 로그인 페이지로 이동합니다.", - "welcome_back": "환영합니다 : ", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "성공적으로 로그인했습니다.", "save_changes": "저장", "close": "닫기", diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json index 815c69f92c..8ececb6c49 100644 --- a/public/language/ko/notifications.json +++ b/public/language/ko/notifications.json @@ -4,12 +4,11 @@ "see_all": "모든 알림 보기", "back_to_home": "Back to %1", "outgoing_link": "외부 링크", - "outgoing_link_message": "다른 사이트로 이동합니다.", - "continue_to": "계속", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "새 알림", "you_have_unread_notifications": "읽지 않은 알림이 있습니다.", - "user_made_post": "%1님이 새 게시물을 작성했습니다.", "new_message_from": "%1님이 메시지를 보냈습니다.", "upvoted_your_post": "%1님이 내 게시물을 추천했습니다.", "favourited_your_post": "%1님이 내 게시물을 관심글로 등록했습니다.", diff --git a/public/language/lt/error.json b/public/language/lt/error.json index 11eb013410..ca771bc828 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -25,6 +25,7 @@ "no-user": "Vartotojas neegzistuoja", "no-teaser": "Trumpas skelbimas neegzistuoja!", "no-privileges": "Jūs neturite teisės atlikti šį veiksmą.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategorija išjungta", "topic-locked": "Tema užrakinta", "still-uploading": "Prašome palaukti kol bus baigti visi kėlimai į serverį", diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json index e5ba3f111d..96ffad091b 100644 --- a/public/language/lt/notifications.json +++ b/public/language/lt/notifications.json @@ -4,12 +4,11 @@ "see_all": "Peržiūrėti visus pranešimus", "back_to_home": "Atgal į %1", "outgoing_link": "Išeinanti nuoroda", - "outgoing_link_message": "Dabar jūs išeinate", - "continue_to": "Tęsti", - "return_to": "Grįžti į", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Naujas pranešimas", "you_have_unread_notifications": "Jūs turite neperskaitytų pranešimų.", - "user_made_post": "%1 parašė naują pranešimą", "new_message_from": "Nauja žinutė nuo %1", "upvoted_your_post": "%1 teigiamai įvertino jūsų pranešimą.", "favourited_your_post": "%1 pamėgo jūsų pranešimą.", diff --git a/public/language/ms/error.json b/public/language/ms/error.json index 4d55d9a4f3..77c582b23f 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -25,6 +25,7 @@ "no-user": "User doesn't exist", "no-teaser": "Teaser doesn't exist", "no-privileges": "You don't have enough privileges for this action.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", diff --git a/public/language/ms/global.json b/public/language/ms/global.json index 7f37cd336b..0180ca4e49 100644 --- a/public/language/ms/global.json +++ b/public/language/ms/global.json @@ -13,7 +13,7 @@ "please_log_in": "Sila daftar masuk", "logout": "Log Keluar", "posting_restriction_info": "Kiriman terhad kepada pengguna berdaftar sahaja, Sila click disini untuk daftar masuk", - "welcome_back": "Selamat datang kembali", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "Anda telah daftar keluar", "save_changes": "simpan perubahan", "close": "Tutup", diff --git a/public/language/ms/notifications.json b/public/language/ms/notifications.json index 9f367710cc..530c9d1f93 100644 --- a/public/language/ms/notifications.json +++ b/public/language/ms/notifications.json @@ -4,12 +4,11 @@ "see_all": "LIhat semua pemberitahuan", "back_to_home": "Back to %1", "outgoing_link": "Sambungan luar", - "outgoing_link_message": "Anda sedang keluar", - "continue_to": "Teruskan ke", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Pemberitahuan baru", "you_have_unread_notifications": "Anda ada pemberitahuan yang belum dibaca", - "user_made_post": "%1 membuat posting baru", "new_message_from": "Pesanan baru daripada %1", "upvoted_your_post": "%1 telah undi-naik posting anda", "favourited_your_post": "strong>%1 telah menggemari posting anda", diff --git a/public/language/nb/error.json b/public/language/nb/error.json index 4d55d9a4f3..77c582b23f 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -25,6 +25,7 @@ "no-user": "User doesn't exist", "no-teaser": "Teaser doesn't exist", "no-privileges": "You don't have enough privileges for this action.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json index 4680231060..96afebd800 100644 --- a/public/language/nb/notifications.json +++ b/public/language/nb/notifications.json @@ -4,12 +4,11 @@ "see_all": "Se alle varsler", "back_to_home": "Back to %1", "outgoing_link": "Utgående link", - "outgoing_link_message": "Du forlatter nå", - "continue_to": "Fortsett til", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Nytt varsel", "you_have_unread_notifications": "Du har uleste varsler.", - "user_made_post": "%1 lagde ett nytt innlegg", "new_message_from": "Ny melding fra %1", "upvoted_your_post": "%1 har stemt opp ditt innlegg.", "favourited_your_post": "%1 har favorittmerket ditt innlegg.", diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 4d55d9a4f3..77c582b23f 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -25,6 +25,7 @@ "no-user": "User doesn't exist", "no-teaser": "Teaser doesn't exist", "no-privileges": "You don't have enough privileges for this action.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", diff --git a/public/language/nl/global.json b/public/language/nl/global.json index 35e4dc2f0a..9bee43800a 100644 --- a/public/language/nl/global.json +++ b/public/language/nl/global.json @@ -13,7 +13,7 @@ "please_log_in": "Log a.u.b. In", "logout": "Uitloggen", "posting_restriction_info": "Reageren is momenteel beperkt tot geregistreerde leden, klik hier om in te loggen.", - "welcome_back": "Welkom Terug!", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "Je bent succesvol ingelogd", "save_changes": "Aanpassingen Opslaan", "close": "Sluiten", diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json index 2e62689bee..9c35d2e8d3 100644 --- a/public/language/nl/notifications.json +++ b/public/language/nl/notifications.json @@ -4,12 +4,11 @@ "see_all": "Bekijk alle Notificaties", "back_to_home": "Back to %1", "outgoing_link": "Uitgaande Link", - "outgoing_link_message": "Je verlaat nu", - "continue_to": "Doorgaan naar", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", - "user_made_post": "%1 made a new post", "new_message_from": "New message from %1", "upvoted_your_post": "%1 has upvoted your post.", "favourited_your_post": "%1 has favourited your post.", diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 98d6e588ad..e0df9469bb 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -2,7 +2,7 @@ "invalid-data": "Błędne dane", "not-logged-in": "Nie jesteś zalogowany/a.", "account-locked": "Twoje konto zostało tymczasowo zablokowane.", - "search-requires-login": "Searching requires an account! Please login or register!", + "search-requires-login": "Wyszukiwanie wymaga konta! Zaloguj się lub zarejestruj!", "invalid-cid": "Błędne ID kategorii.", "invalid-tid": "Błędne ID tematu", "invalid-pid": "Błędne ID postu", @@ -15,8 +15,8 @@ "invalid-pagination-value": "Błędna wartość paginacji", "username-taken": "Login zajęty.", "email-taken": "E-mail zajęty.", - "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", - "username-too-short": "Username too short", + "email-not-confirmed": "Twój email nie jest potwierdzony, kliknij tutaj aby go potwierdzić.", + "username-too-short": "Nazwa użytkownika za krótka.", "user-banned": "Użytkownik zbanowany", "no-category": "Kategoria nie istnieje.", "no-topic": "Temat nie istnieje", @@ -25,6 +25,7 @@ "no-user": "Użytkownik nie istnieje", "no-teaser": "Podgląd nie istnieje", "no-privileges": "Nie masz wystarczających praw by to wykonać.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategoria wyłączona.", "topic-locked": "Temat zamknięty", "still-uploading": "Poczekaj na pełne załadowanie", @@ -35,7 +36,7 @@ "file-too-big": "Maksymalna wielkość pliku to %1 kilobajtów.", "cant-vote-self-post": "Nie możesz głosować na własny post.", "already-favourited": "Już polubiłeś/aś ten post.", - "already-unfavourited": "You already unfavourited this post", + "already-unfavourited": "Usunąłeś post z ulubionych.", "cant-ban-other-admins": "Nie możesz zbanować innych adminów!", "invalid-image-type": "Błędny typ pliku", "group-name-too-short": "Nazwa grupy za krótka", @@ -51,5 +52,5 @@ "upload-error": "Błąd uploadu: %1", "signature-too-long": "Sygnatura nie może mieć więcej niż %1 znaków.", "cant-chat-with-yourself": "Nie możesz czatować ze sobą", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "not-enough-reputation-to-downvote": "Masz za mało reputacji by ocenić ten post." } \ No newline at end of file diff --git a/public/language/pl/global.json b/public/language/pl/global.json index 7a5dd92ff2..84ac6226d5 100644 --- a/public/language/pl/global.json +++ b/public/language/pl/global.json @@ -13,13 +13,13 @@ "please_log_in": "Proszę się zalogować", "logout": "Wyloguj się", "posting_restriction_info": "Pisanie jest dostępne tylko dla zarejestrowanych członków forum, kliknij tutaj aby się zalogować.", - "welcome_back": "Witaj z powrotem!", + "welcome_back": "Witamy ponownie!", "you_have_successfully_logged_in": "Zostałeś pomyślnie zalogowany.", "save_changes": "Zapisz zmiany", "close": "Zamknij", "pagination": "Numerowanie stron", "pagination.out_of": "%1 poza %2", - "pagination.enter_index": "Enter index", + "pagination.enter_index": "Wpisz indeks.", "header.admin": "Administracja", "header.recent": "Ostatnie", "header.unread": "Nieprzeczytane", diff --git a/public/language/pl/modules.json b/public/language/pl/modules.json index 6416f70bd5..e63c958dc9 100644 --- a/public/language/pl/modules.json +++ b/public/language/pl/modules.json @@ -1,18 +1,18 @@ { "chat.chatting_with": "Rozmawiaj z ", - "chat.placeholder": "Type chat message here, press enter to send", + "chat.placeholder": "Wpisz wiadomość czatu tutaj, naciśnij enter by wysłać.", "chat.send": "Wyślij", "chat.no_active": "Nie prowadzisz obecnie żadnych rozmów.", "chat.user_typing": "%1 pisze...", "chat.user_has_messaged_you": "%1 napisał do Ciebie", "chat.see_all": "Pokaż wszystkie czaty", - "chat.no-messages": "Please select a recipient to view chat message history", - "chat.recent-chats": "Recent Chats", - "chat.contacts": "Contacts", - "chat.message-history": "Message History", - "chat.pop-out": "Pop out chat", - "chat.maximize": "Maximize", - "composer.user_said_in": "%1 said in %2:", - "composer.user_said": "%1 said:", - "composer.discard": "Are you sure you wish to discard this post?" + "chat.no-messages": "Wybierz odbiorce by zobaczyć historię czatu.", + "chat.recent-chats": "Ostatnie czaty.", + "chat.contacts": "Kontakty", + "chat.message-history": "Historia wiadomości", + "chat.pop-out": "Pokaż czat", + "chat.maximize": "Maksymalizuj", + "composer.user_said_in": "%1 powiedział w %2:", + "composer.user_said": "%1 powiedział:", + "composer.discard": "Na pewno chcesz ignorować ten post?" } \ No newline at end of file diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json index 7c1626f647..493b232147 100644 --- a/public/language/pl/notifications.json +++ b/public/language/pl/notifications.json @@ -4,12 +4,11 @@ "see_all": "Zobacz wszystkie powiadomienia", "back_to_home": "Back to %1", "outgoing_link": "Łącze wychodzące", - "outgoing_link_message": "Opuszczasz", - "continue_to": "Kontynuuj do", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Nowe powiadomienie", "you_have_unread_notifications": "Masz nieprzeczytane powiadomienia.", - "user_made_post": "%1 napisał nowy post", "new_message_from": "Nowa wiadomość od %1", "upvoted_your_post": "%1 zagłosował na Twój post", "favourited_your_post": "%1 polubił/a Twój post.", diff --git a/public/language/pt_BR/error.json b/public/language/pt_BR/error.json index 9fc7c5553d..0f1f906336 100644 --- a/public/language/pt_BR/error.json +++ b/public/language/pt_BR/error.json @@ -25,6 +25,7 @@ "no-user": "Usuário não existe", "no-teaser": "Chamada não existe", "no-privileges": "Você não possui permissões para esta ação.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Categoria desativada", "topic-locked": "Tópico trancado", "still-uploading": "Aguarde a conclusão dos uploads.", diff --git a/public/language/pt_BR/notifications.json b/public/language/pt_BR/notifications.json index f731583ad1..58e0bda322 100644 --- a/public/language/pt_BR/notifications.json +++ b/public/language/pt_BR/notifications.json @@ -4,12 +4,11 @@ "see_all": "Visualizar todas as notificações", "back_to_home": "Voltar para %1", "outgoing_link": "Link Externo", - "outgoing_link_message": "Você está saindo para um link externo", - "continue_to": "Continuar para", - "return_to": "Voltar para", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Nova notificação", "you_have_unread_notifications": "Você possui notificações não lidas.", - "user_made_post": "%1 fez um novo post", "new_message_from": "Nova mensagem de %1", "upvoted_your_post": "%1 votou no seu post.", "favourited_your_post": "%1 favoritou seu post.", diff --git a/public/language/ro/error.json b/public/language/ro/error.json index 39edf3e9e2..5b54c36e72 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -25,6 +25,7 @@ "no-user": "Utilizatorul nu există", "no-teaser": "Rezumatul nu există", "no-privileges": "Nu ai destule privilegii pentru această acțiune.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Categorie dezactivată", "topic-locked": "Subiect Închis", "still-uploading": "Te rugăm să aștepți până se termină uploadul.", diff --git a/public/language/ro/global.json b/public/language/ro/global.json index 4f9c772e9d..028c2d5eb4 100644 --- a/public/language/ro/global.json +++ b/public/language/ro/global.json @@ -13,7 +13,7 @@ "please_log_in": "Autentifică-te", "logout": "Ieşire", "posting_restriction_info": "Pentru a posta trebuie să fi înregistrat. Apasă aici pentru a te atentifica.", - "welcome_back": "Bine ai revenit", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "Te-ai conectat cu succes", "save_changes": "Salvează Modificări", "close": "Închide", diff --git a/public/language/ro/language.json b/public/language/ro/language.json index cd46631dcc..671c4dc6d6 100644 --- a/public/language/ro/language.json +++ b/public/language/ro/language.json @@ -1,5 +1,5 @@ { - "name": "Română", + "name": "Română (România)", "code": "ro", "dir": "ltr" } \ No newline at end of file diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json index 4b73e50109..682cb05ee2 100644 --- a/public/language/ro/notifications.json +++ b/public/language/ro/notifications.json @@ -4,12 +4,11 @@ "see_all": "Vezi toate notificările", "back_to_home": "Înapoi la %1", "outgoing_link": "Link Extern", - "outgoing_link_message": "Acum părăsești pagina", - "continue_to": "Continuă la", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Notificare Nouă", "you_have_unread_notifications": "Ai notificări necitite.", - "user_made_post": "%1 a postat un nou mesaj", "new_message_from": "Un mesaj nou de la %1", "upvoted_your_post": "%1 a votat pozitiv mesajul tău.", "favourited_your_post": "%1 a adăugat mesajul tău la favorite.", diff --git a/public/language/ro/tags.json b/public/language/ro/tags.json index f065d4bbfa..cfd27f9ec3 100644 --- a/public/language/ro/tags.json +++ b/public/language/ro/tags.json @@ -1,6 +1,6 @@ { - "no_tag_topics": "There are no topics with this tag.", - "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", - "no_tags": "There are no tags yet." + "no_tag_topics": "Nu există nici un subiect cu acest tag.", + "tags": "Taguri", + "enter_tags_here": "Introdu tagurile aici. Apasă enter după fiecare tag.", + "no_tags": "În acest moment nu există nici un tag." } \ No newline at end of file diff --git a/public/language/ru/error.json b/public/language/ru/error.json index 1e7698e3be..e3afcd6dda 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -25,6 +25,7 @@ "no-user": "Несуществующий пользователь", "no-teaser": "Несуществующее превью", "no-privileges": "У вас недостаточно прав, чтобы совершить данное действие.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Категория отключена", "topic-locked": "Тема закрыт", "still-uploading": "Пожалуйста, подождите завершения загрузки", diff --git a/public/language/ru/global.json b/public/language/ru/global.json index e83c49da26..ced82c04eb 100644 --- a/public/language/ru/global.json +++ b/public/language/ru/global.json @@ -13,7 +13,7 @@ "please_log_in": "Пожалуйста, войдите под своим аккаунтом", "logout": "Выйти", "posting_restriction_info": "Сообщения могут оставлять только зарегистрированные пользователи, нажмите сюда, чтобы войти", - "welcome_back": "С возвращением", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "Вы вышли из аккаунта", "save_changes": "Сохранить изменения", "close": "Закрыть", diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index f549ae9239..fa840319ba 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -4,12 +4,11 @@ "see_all": "Просмотреть все уведомления", "back_to_home": "Назад к %1", "outgoing_link": "Внешняя ссылка", - "outgoing_link_message": "Вы покидаете", - "continue_to": "Перейти на", - "return_to": "Вернуться к", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Новое Уведомление", "you_have_unread_notifications": "У вас есть непрочитанные уведомления", - "user_made_post": "%1 создал новую запись", "new_message_from": "Новое сообщение от %1", "upvoted_your_post": "%1 проголосовал за Ваш пост", "favourited_your_post": "%1 добавил Ваш пост в избранное", diff --git a/public/language/ru/tags.json b/public/language/ru/tags.json index f065d4bbfa..91aa21d2d6 100644 --- a/public/language/ru/tags.json +++ b/public/language/ru/tags.json @@ -1,6 +1,6 @@ { - "no_tag_topics": "There are no topics with this tag.", - "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", - "no_tags": "There are no tags yet." + "no_tag_topics": "Нет топиков с таким тэгом.", + "tags": "Тэги", + "enter_tags_here": "Укажите тэги здесь. Нажимайте Enter после каждого тэга.", + "no_tags": "Здесь еще нет тэгов." } \ No newline at end of file diff --git a/public/language/sc/error.json b/public/language/sc/error.json index 4d55d9a4f3..77c582b23f 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -25,6 +25,7 @@ "no-user": "User doesn't exist", "no-teaser": "Teaser doesn't exist", "no-privileges": "You don't have enough privileges for this action.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", diff --git a/public/language/sc/global.json b/public/language/sc/global.json index 222a12c2d0..2d995fca01 100644 --- a/public/language/sc/global.json +++ b/public/language/sc/global.json @@ -13,7 +13,7 @@ "please_log_in": "Pro praghere Intra", "logout": "Essi·nche", "posting_restriction_info": "Sa publicatzione immoe est limitada isceti a is impitadores registrados, carca inoghe pro intrare.", - "welcome_back": "Bene Torradu", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "Ses intradu", "save_changes": "Alloga Acontzos", "close": "Serra", diff --git a/public/language/sc/notifications.json b/public/language/sc/notifications.json index f9417af5ab..c5c59c39e1 100644 --- a/public/language/sc/notifications.json +++ b/public/language/sc/notifications.json @@ -4,12 +4,11 @@ "see_all": "Càstia totus is Notìficas", "back_to_home": "Back to %1", "outgoing_link": "Acàpiu a Foras", - "outgoing_link_message": "Immoe ses essende", - "continue_to": "Sighi a", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", - "user_made_post": "%1 made a new post", "new_message_from": "New message from %1", "upvoted_your_post": "%1 has upvoted your post.", "favourited_your_post": "%1 has favourited your post.", diff --git a/public/language/sk/error.json b/public/language/sk/error.json index 32d95d97fd..8481519d05 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -25,6 +25,7 @@ "no-user": "Užívateľ neexistuje ", "no-teaser": "Teaser neexistuje", "no-privileges": "Nemáte dostatočné oprávnenia pre túto akciu ", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategória je znefunkčená.", "topic-locked": "Uzamknutá téma", "still-uploading": "Prosím čakajte na dokončenie nahrávania", diff --git a/public/language/sk/global.json b/public/language/sk/global.json index 8da1918f92..62534c8017 100644 --- a/public/language/sk/global.json +++ b/public/language/sk/global.json @@ -13,7 +13,7 @@ "please_log_in": "Prosím, prihláste sa", "logout": "Odhlásiť sa", "posting_restriction_info": "Prispievanie je obmedzené len pre registrovaných, kliknite pre prihlásenie sa ", - "welcome_back": "Vitaj naspäť", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "Úspešne si sa prihlásil", "save_changes": "Uložiť zmeny", "close": "Zrušiť", diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json index 26a94c255c..7a5b20cbb7 100644 --- a/public/language/sk/notifications.json +++ b/public/language/sk/notifications.json @@ -4,12 +4,11 @@ "see_all": "Pozri všetky notifikácie", "back_to_home": "Back to %1", "outgoing_link": "Odkaz mimo fórum", - "outgoing_link_message": "Teraz opúšťate fórum", - "continue_to": "Prejsť na", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Nová notifikácia", "you_have_unread_notifications": "Máte neprečítané notifikácie", - "user_made_post": "%1vytvoril nový príspevok", "new_message_from": "Nova spáva od %1", "upvoted_your_post": "%1 zahlasoval za Váš príspevok.", "favourited_your_post": "%1 pridal do obľubených Váš príspevok.", diff --git a/public/language/sv/error.json b/public/language/sv/error.json index 955c342e80..d5a21fe09c 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -25,6 +25,7 @@ "no-user": "Användare hittades inte", "no-teaser": "Förtexten hittades inte", "no-privileges": "Du har inte rättigheter nog för den här åtgärden.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategorin inaktiverad", "topic-locked": "Ämnet låst", "still-uploading": "Vänta medan uppladdningen slutförs.", diff --git a/public/language/sv/global.json b/public/language/sv/global.json index d6ecebaf97..d5c66387ab 100644 --- a/public/language/sv/global.json +++ b/public/language/sv/global.json @@ -13,7 +13,7 @@ "please_log_in": "Var god logga in", "logout": "Logga ut", "posting_restriction_info": "Man måste vara inloggad för att kunna skapa inlägg, klicka här för att logga in.", - "welcome_back": "Välkommen tillbaka", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "Inloggningen lyckades", "save_changes": "Spara ändringar", "close": "Stäng", diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json index ec78033e27..9f2669e4b2 100644 --- a/public/language/sv/notifications.json +++ b/public/language/sv/notifications.json @@ -4,12 +4,11 @@ "see_all": "Visa alla notiser", "back_to_home": "Back to %1", "outgoing_link": "Utgående länk", - "outgoing_link_message": "Du lämnar nu", - "continue_to": "Fortsätt till", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Ny notis", "you_have_unread_notifications": "Du har olästa notiser.", - "user_made_post": "%1 skrev ett nytt inlägg", "new_message_from": "Nytt medelande från %1", "upvoted_your_post": "%1 har röstat på ditt inlägg.", "favourited_your_post": "%1 har favoriserat ditt inlägg.", diff --git a/public/language/th/error.json b/public/language/th/error.json index 4d55d9a4f3..77c582b23f 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -25,6 +25,7 @@ "no-user": "User doesn't exist", "no-teaser": "Teaser doesn't exist", "no-privileges": "You don't have enough privileges for this action.", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", diff --git a/public/language/th/global.json b/public/language/th/global.json index 6c42d36f89..9bc26fe372 100644 --- a/public/language/th/global.json +++ b/public/language/th/global.json @@ -13,7 +13,7 @@ "please_log_in": "กรุณาเข้าสู่ระบบ", "logout": "ออกจากระบบ", "posting_restriction_info": "คุณต้องต้องเป็นสมาชิกเพื่อทำการโพสต์ คลิกที่นี่เพื่อเข้าสู่ระบบ", - "welcome_back": "ยินดีต้อนรับ", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "คุณได้เข้าสู่ระบบแล้ว", "save_changes": "บันทึกการเปลี่ยนแปลง", "close": "ปิด", diff --git a/public/language/th/notifications.json b/public/language/th/notifications.json index 0013362fac..4c33f78276 100644 --- a/public/language/th/notifications.json +++ b/public/language/th/notifications.json @@ -4,12 +4,11 @@ "see_all": "ดูข้อแจ้งเตือนทั้งหมด", "back_to_home": "Back to %1", "outgoing_link": "ลิงค์ออก", - "outgoing_link_message": "ตอนนี้คุณจะออกจาก", - "continue_to": "ดำเนินการต่อไป", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", - "user_made_post": "%1 made a new post", "new_message_from": "New message from %1", "upvoted_your_post": "%1 has upvoted your post.", "favourited_your_post": "%1 has favourited your post.", diff --git a/public/language/tr/error.json b/public/language/tr/error.json index e18f572e78..cec4db9683 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -25,6 +25,7 @@ "no-user": "Kullanıcı Yok", "no-teaser": "İleti Yok", "no-privileges": "Bu işlemi yapmak için yeterli yetkiniz yok.", + "no-emailers-configured": "E-posta eklentisi kurulu değil bu yüzden test e-postası gönderilemedi", "category-disabled": "Kategori aktif değil", "topic-locked": "Başlık Kilitli", "still-uploading": "Lütfen yüklemelerin bitmesini bekleyin.", diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index 4a35e30b88..1e0cdea3de 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -4,12 +4,11 @@ "see_all": "Bütün bildirimleri gör", "back_to_home": "Geri dön %1", "outgoing_link": "Harici Link", - "outgoing_link_message": "Şimdi ayrılıyorsunuz", - "continue_to": "Devam", - "return_to": "Geri dön", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Yeni bildirim", "you_have_unread_notifications": "Okunmamış bildirimleriniz var.", - "user_made_post": "%1 yeni bir ileti gönderdi", "new_message_from": "%1 size bir mesaj gönderdi", "upvoted_your_post": "%1 iletinizi beğendi.", "favourited_your_post": "%1 iletinizi favorilerine ekledi.", diff --git a/public/language/tr/tags.json b/public/language/tr/tags.json index f065d4bbfa..a60ce28e1a 100644 --- a/public/language/tr/tags.json +++ b/public/language/tr/tags.json @@ -1,6 +1,6 @@ { - "no_tag_topics": "There are no topics with this tag.", - "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", - "no_tags": "There are no tags yet." + "no_tag_topics": "Bu etiketli başlık yok.", + "tags": "Etiketler", + "enter_tags_here": "Etiketleri buraya girin.", + "no_tags": "Henüz etiket yok." } \ No newline at end of file diff --git a/public/language/vi/error.json b/public/language/vi/error.json index 54d23f605e..6b93d3cd98 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -25,6 +25,7 @@ "no-user": "Tài khoản không tồn tại", "no-teaser": "Teaser không tồn tại", "no-privileges": "Bạn không đủ quyền cho hành động này", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Danh mục bị disabled", "topic-locked": "Chủ đề bị khóa", "still-uploading": "Vui lòng chờ upload", diff --git a/public/language/vi/global.json b/public/language/vi/global.json index 72fbde516a..5554138a31 100644 --- a/public/language/vi/global.json +++ b/public/language/vi/global.json @@ -13,7 +13,7 @@ "please_log_in": "Xin hãy đăng nhập", "logout": "Đăng xuất", "posting_restriction_info": "Hiện giờ chỉ có các thành viên mới được quyền gửi bài viết, hãy nhấn vào đây để đăng nhập", - "welcome_back": "Chào mừng bạn quay lại", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "Bạn đã đăng nhập thành công", "save_changes": "Lưu thay đổi", "close": "Đóng lại", diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json index b569bb43ee..431305ad23 100644 --- a/public/language/vi/notifications.json +++ b/public/language/vi/notifications.json @@ -4,12 +4,11 @@ "see_all": "Xem tất cả thông báo", "back_to_home": "Back to %1", "outgoing_link": "Liên kết ngoài", - "outgoing_link_message": "Bạn giờ đang thoát", - "continue_to": "Tiếp tục đến", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "Thông báo mới", "you_have_unread_notifications": "Bạn có thông báo chưa đọc", - "user_made_post": "%1 đã viết bài mới", "new_message_from": "Tin nhắn mới từ %1", "upvoted_your_post": "%1 đã hủy vote cho bài viết của bạn", "favourited_your_post": "%1 thích bài viết của bạn", diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json index 96438847ad..0b9e0c69ae 100644 --- a/public/language/zh_CN/error.json +++ b/public/language/zh_CN/error.json @@ -25,6 +25,7 @@ "no-user": "用户不存在", "no-teaser": "主题预览不存在", "no-privileges": "您没有足够的权限进行此操作。", + "no-emailers-configured": "未加载任何电子邮箱插件，无法发送测试电邮", "category-disabled": "版块已禁用", "topic-locked": "主题已锁定", "still-uploading": "请等待上传完成", diff --git a/public/language/zh_CN/login.json b/public/language/zh_CN/login.json index bdee8b778a..49cf1cc83f 100644 --- a/public/language/zh_CN/login.json +++ b/public/language/zh_CN/login.json @@ -2,7 +2,7 @@ "username": "用户名/电子邮箱", "remember_me": "记住我？", "forgot_password": "忘记密码？", - "alternative_logins": "其他登录方式使用合作网站账号登录京东", + "alternative_logins": "使用合作网站帐号登录", "failed_login_attempt": "登录失败，请重试。", "login_successful": "您已经成功登录！", "dont_have_account": "没有帐号？" diff --git a/public/language/zh_CN/notifications.json b/public/language/zh_CN/notifications.json index 9dcae00709..546778a4e9 100644 --- a/public/language/zh_CN/notifications.json +++ b/public/language/zh_CN/notifications.json @@ -4,12 +4,11 @@ "see_all": "查看全部通知", "back_to_home": "返回 %1", "outgoing_link": "站外链接", - "outgoing_link_message": "您正在离开本站", - "continue_to": "继续前往", - "return_to": "返回", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "新通知", "you_have_unread_notifications": "您有未读的通知。", - "user_made_post": "%1 发布了一个新帖", "new_message_from": "来自 %1 的新消息", "upvoted_your_post": "%1 赞了您的帖子。", "favourited_your_post": "%1 收藏了您的帖子。", diff --git a/public/language/zh_TW/error.json b/public/language/zh_TW/error.json index 9219212736..a843fee3b9 100644 --- a/public/language/zh_TW/error.json +++ b/public/language/zh_TW/error.json @@ -25,6 +25,7 @@ "no-user": "使用者並不存在", "no-teaser": "Teaser 並不存在", "no-privileges": "您似乎沒有執行這個行為的權限！", + "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "該類別已被關閉", "topic-locked": "該主題已被鎖定", "still-uploading": "請等待上傳完成。", diff --git a/public/language/zh_TW/global.json b/public/language/zh_TW/global.json index 4dc963a6c8..ba14211878 100644 --- a/public/language/zh_TW/global.json +++ b/public/language/zh_TW/global.json @@ -13,7 +13,7 @@ "please_log_in": "請登入", "logout": "退出", "posting_restriction_info": "發表文章目前僅限於註冊的會員，點擊此處進行登錄。", - "welcome_back": "歡迎回來 ~", + "welcome_back": "Welcome Back", "you_have_successfully_logged_in": "您已經成功登錄！", "save_changes": "保存修改", "close": "關閉", diff --git a/public/language/zh_TW/notifications.json b/public/language/zh_TW/notifications.json index 70202341a0..56c9534641 100644 --- a/public/language/zh_TW/notifications.json +++ b/public/language/zh_TW/notifications.json @@ -4,12 +4,11 @@ "see_all": "顯示全部", "back_to_home": "Back to %1", "outgoing_link": "站外鏈接", - "outgoing_link_message": "你正在離開本站。", - "continue_to": "繼續前往", - "return_to": "Return to", + "outgoing_link_message": "You are now leaving %1.", + "continue_to": "Continue to %1", + "return_to": "Return to %1", "new_notification": "新訊息通知", "you_have_unread_notifications": "您有未讀的訊息！", - "user_made_post": "%1 發表了一篇新文章", "new_message_from": "來自 %1 的新訊息", "upvoted_your_post": "%1 has upvoted your post.", "favourited_your_post": "%1 has favourited your post.", diff --git a/public/language/zh_TW/users.json b/public/language/zh_TW/users.json index 44d7d58a02..6fd23be181 100644 --- a/public/language/zh_TW/users.json +++ b/public/language/zh_TW/users.json @@ -5,6 +5,6 @@ "search": "搜尋", "enter_username": "輸入想找的使用者帳號", "load_more": "載入更多", - "user-not-found": "沒有找到該使用者!", + "user-not-found": "User not found!", "users-found-search-took": "%1 user(s) found! Search took %2 ms." -} +} \ No newline at end of file diff --git a/public/src/forum/account/header.js b/public/src/forum/account/header.js index 6efa692a0f..f552bf4056 100644 --- a/public/src/forum/account/header.js +++ b/public/src/forum/account/header.js @@ -18,10 +18,6 @@ define('forum/account/header', function() { $this.toggleClass('hide', $this.hasClass('private')); }); } - - if (app.isAdmin) { - $('#editLink, #settingsLink').removeClass('hide'); - } } function selectActivePill() { diff --git a/public/src/forum/users.js b/public/src/forum/users.js index 35c68f18cb..e30ab1ae33 100644 --- a/public/src/forum/users.js +++ b/public/src/forum/users.js @@ -163,21 +163,29 @@ define('forum/users', function() { } function updateUser(data) { - var userEl = $('#users-container li[data-uid="' + data.uid +'"]'); + var usersContainer = $('#users-container'); + var userEl = usersContainer.find('li[data-uid="' + data.uid +'"]'); if (!data.online) { userEl.remove(); - } else { - ajaxify.loadTemplate('users', function(usersTemplate) { - var html = templates.parse(templates.getBlock(usersTemplate, 'users'), {users: [data]}); - translator.translate(html, function(translated) { - if (!userEl.length) { - $('#users-container').append(translated); - } else { - userEl.replaceWith(translated); - } - }); - }); + return; } + + ajaxify.loadTemplate('users', function(usersTemplate) { + var html = templates.parse(templates.getBlock(usersTemplate, 'users'), {users: [data]}); + translator.translate(html, function(translated) { + if (userEl.length) { + userEl.replaceWith(translated); + return; + } + + var anonBox = usersContainer.find('li.anon-user'); + if (anonBox.length) { + $(translated).insertBefore(anonBox); + } else { + usersContainer.append(translated); + } + }); + }); } function updateAnonCount() { diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index 4eb25b108d..78d5b6c546 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -213,7 +213,6 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, chatModal.on('mousemove keypress click', function() { if (newMessage) { socket.emit('modules.chats.markRead', touid); - console.log('sent') newMessage = false; } }); diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 6fd9393ba0..2225373ee2 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -112,6 +112,7 @@ function getUserDataByUserSlug(userslug, callerUID, callback) { userData.yourid = callerUID; userData.theirid = userData.uid; userData.isSelf = parseInt(callerUID, 10) === parseInt(userData.uid, 10); + userData.showSettings = userData.isSelf || isAdmin; userData.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1; userData['email:confirmed'] = !!parseInt(userData['email:confirmed'], 10); userData.profile_links = results.profile_links; @@ -213,7 +214,7 @@ function getFollow(route, name, req, res, next) { accountsController.getFavourites = function(req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; - getBaseUser(req.params.userslug, function(err, userData) { + getBaseUser(req.params.userslug, callerUID, function(err, userData) { if (err) { return next(err); } @@ -231,8 +232,6 @@ accountsController.getFavourites = function(req, res, next) { return next(err); } - userData.theirid = userData.uid; - userData.yourid = callerUID; userData.posts = favourites.posts; userData.nextStart = favourites.nextStart; @@ -244,7 +243,7 @@ accountsController.getFavourites = function(req, res, next) { accountsController.getPosts = function(req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; - getBaseUser(req.params.userslug, function(err, userData) { + getBaseUser(req.params.userslug, callerUID, function(err, userData) { if (err) { return next(err); } @@ -258,8 +257,6 @@ accountsController.getPosts = function(req, res, next) { return next(err); } - userData.theirid = userData.uid; - userData.yourid = callerUID; userData.posts = userPosts.posts; userData.nextStart = userPosts.nextStart; @@ -271,7 +268,7 @@ accountsController.getPosts = function(req, res, next) { accountsController.getTopics = function(req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; - getBaseUser(req.params.userslug, function(err, userData) { + getBaseUser(req.params.userslug, callerUID, function(err, userData) { if (err) { return next(err); } @@ -286,8 +283,6 @@ accountsController.getTopics = function(req, res, next) { return next(err); } - userData.theirid = userData.uid; - userData.yourid = callerUID; userData.topics = userTopics.topics; userData.nextStart = userTopics.nextStart; @@ -296,7 +291,7 @@ accountsController.getTopics = function(req, res, next) { }); }; -function getBaseUser(userslug, callback) { +function getBaseUser(userslug, callerUID, callback) { user.getUidByUserslug(userslug, function (err, uid) { if (err || !uid) { return callback(err); @@ -306,6 +301,9 @@ function getBaseUser(userslug, callback) { user: function(next) { user.getUserFields(uid, ['uid', 'username', 'userslug'], next); }, + isAdmin: function(next) { + user.isAdministrator(callerUID, next); + }, profile_links: function(next) { plugins.fireHook('filter:user.profileLinks', [], next); } @@ -313,9 +311,15 @@ function getBaseUser(userslug, callback) { if (err) { return callback(err); } + if (!results.user) { return callback(); } + + results.user.yourid = callerUID; + results.user.theirid = uid; + results.user.isSelf = parseInt(callerUID, 10) === parseInt(uid, 10); + results.user.showSettings = results.user.isSelf || results.isAdmin; results.user.profile_links = results.profile_links; callback(null, results.user); }); @@ -337,7 +341,7 @@ accountsController.accountEdit = function(req, res, next) { accountsController.accountSettings = function(req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; - getBaseUser(req.params.userslug, function(err, userData) { + getBaseUser(req.params.userslug, callerUID, function(err, userData) { if (err) { return next(err); } @@ -358,8 +362,6 @@ accountsController.accountSettings = function(req, res, next) { return next(err); } - userData.yourid = callerUID; - userData.theirid = userData.uid; userData.settings = results.settings; userData.languages = results.languages; diff --git a/src/controllers/groups.js b/src/controllers/groups.js index f96f460eaf..a7295bdd7e 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -2,7 +2,7 @@ var groups = require('../groups'), async = require('async'), - + nconf = require('nconf'), groupsController = {}; groupsController.list = function(req, res) { @@ -30,7 +30,7 @@ groupsController.details = function(req, res) { if (!err) { res.render('groups/details', results); } else { - res.redirect(nconf.get('relative_path') + '/404') + res.redirect(nconf.get('relative_path') + '/404'); } }); }; diff --git a/src/emitter.js b/src/emitter.js index a2f68e3324..22e11620fe 100644 --- a/src/emitter.js +++ b/src/emitter.js @@ -5,33 +5,37 @@ var events = require('events'), eventEmitter.all = function(events, callback) { + function onEvent(event) { + eventEmitter.on(events[event], function() { + events.splice(events.indexOf(event), 1); + + if (events.length === 0) { + callback(); + } + }); + } + for (var ev in events) { if (events.hasOwnProperty(ev)) { - (function(ev) { - eventEmitter.on(events[ev], function() { - events.splice(events.indexOf(ev), 1); - - if (events.length === 0) { - callback(); - } - }); - }(ev)); + onEvent(ev); } } }; eventEmitter.any = function(events, callback) { + function onEvent(event) { + eventEmitter.on(events[event], function() { + if (events !== null) { + callback(); + } + + events = null; + }); + } + for (var ev in events) { if (events.hasOwnProperty(ev)) { - (function(ev) { - eventEmitter.on(events[ev], function() { - if (events !== null) { - callback(); - } - - events = null; - }); - }(ev)); + onEvent(ev); } } }; diff --git a/src/groups.js b/src/groups.js index af60b9b161..13e9917520 100644 --- a/src/groups.js +++ b/src/groups.js @@ -438,6 +438,10 @@ var ignoredGroups = ['registered-users']; db.getSetMembers('groups', function(err, groupNames) { + if (err) { + return callback(err); + } + var groupKeys = groupNames.filter(function(groupName) { return ignoredGroups.indexOf(groupName) === -1; }).map(function(groupName) { @@ -445,6 +449,9 @@ }); db.getObjectsFields(groupKeys, ['name', 'hidden', 'userTitle', 'icon', 'labelColor'], function(err, groupData) { + if (err) { + return callback(err); + } groupData = groupData.filter(function(group) { return parseInt(group.hidden, 10) !== 1 && !!group.userTitle; @@ -456,6 +463,10 @@ }); db.isMemberOfSets(groupSets, uid, function(err, isMembers) { + if (err) { + return callback(err); + } + for(var i=isMembers.length - 1; i>=0; --i) { if (!isMembers[i]) { groupData.splice(i, 1); diff --git a/src/plugins.js b/src/plugins.js index 669c3e65b1..d554edd6d3 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -184,29 +184,31 @@ var fs = require('fs'), Plugins.staticDirs[pluginData.id] = path.join(pluginPath, pluginData.staticDir); } + function mapStaticDirs(mappedPath) { + if (Plugins.staticDirs[mappedPath]) { + winston.warn('[plugins/' + pluginData.id + '] Mapped path (' + mappedPath + ') already specified!'); + } else if (!validMappedPath.test(mappedPath)) { + winston.warn('[plugins/' + pluginData.id + '] Invalid mapped path specified: ' + mappedPath + '. Path must adhere to: ' + validMappedPath.toString()); + } else { + realPath = pluginData.staticDirs[mappedPath]; + staticDir = path.join(pluginPath, realPath); + + (function(staticDir) { + fs.exists(staticDir, function(exists) { + if (exists) { + Plugins.staticDirs[pluginData.id + '/' + mappedPath] = staticDir; + } else { + winston.warn('[plugins/' + pluginData.id + '] Mapped path \'' + mappedPath + ' => ' + staticDir + '\' not found.'); + } + }); + }(staticDir)); + } + } + for(var key in pluginData.staticDirs) { - (function(mappedPath) { - if (pluginData.staticDirs.hasOwnProperty(mappedPath)) { - if (Plugins.staticDirs[mappedPath]) { - winston.warn('[plugins/' + pluginData.id + '] Mapped path (' + mappedPath + ') already specified!'); - } else if (!validMappedPath.test(mappedPath)) { - winston.warn('[plugins/' + pluginData.id + '] Invalid mapped path specified: ' + mappedPath + '. Path must adhere to: ' + validMappedPath.toString()); - } else { - realPath = pluginData.staticDirs[mappedPath]; - staticDir = path.join(pluginPath, realPath); - - (function(staticDir) { - fs.exists(staticDir, function(exists) { - if (exists) { - Plugins.staticDirs[pluginData.id + '/' + mappedPath] = staticDir; - } else { - winston.warn('[plugins/' + pluginData.id + '] Mapped path \'' + mappedPath + ' => ' + staticDir + '\' not found.'); - } - }); - }(staticDir)); - } - } - }(key)); + if (pluginData.staticDirs.hasOwnProperty(key)) { + mapStaticDirs(key); + } } next(); @@ -262,8 +264,10 @@ var fs = require('fs'), async.each(languages, function(pathToLang, next) { fs.readFile(pathToLang, function(err, file) { + var json; + try { - var json = JSON.parse(file.toString()); + json = JSON.parse(file.toString()); } catch (err) { winston.error('[plugins] Unable to parse custom language file: ' + pathToLang + '\r\n' + err.stack); return next(err); @@ -370,7 +374,7 @@ var fs = require('fs'), // omg, after 6 months I finally realised what this does... // It adds the callback to the arguments passed-in, since the callback // is defined in *this* file (the async cb), and not the hooks themselves. - var value = hookObj.method.apply(Plugins, value.concat(function() { + value = hookObj.method.apply(Plugins, value.concat(function() { next(arguments[0], Array.prototype.slice.call(arguments, 1)); })); @@ -587,6 +591,7 @@ var fs = require('fs'), plugins[i].id = plugins[i].name; plugins[i].installed = false; plugins[i].active = false; + plugins[i].url = plugins[i].repository ? plugins[i].repository.url : ''; pluginMap[plugins[i].name] = plugins[i]; } @@ -601,7 +606,7 @@ var fs = require('fs'), pluginMap[plugin.id].id = pluginMap[plugin.id].id || plugin.id; pluginMap[plugin.id].name = pluginMap[plugin.id].name || plugin.id; pluginMap[plugin.id].description = plugin.description; - pluginMap[plugin.id].url = plugin.url; + pluginMap[plugin.id].url = pluginMap[plugin.id].url || plugin.url; pluginMap[plugin.id].installed = true; Plugins.isActive(plugin.id, function(err, active) { @@ -685,8 +690,10 @@ var fs = require('fs'), fs.readFile(path.join(file, 'plugin.json'), next); }, function(configJSON, next) { + var config; + try { - var config = JSON.parse(configJSON); + config = JSON.parse(configJSON); } catch (err) { winston.warn("Plugin: " + file + " is corrupted or invalid. Please check plugin.json for errors."); return next(err, null); diff --git a/src/privileges/categories.js b/src/privileges/categories.js index 11b4767b30..b0f89a9fad 100644 --- a/src/privileges/categories.js +++ b/src/privileges/categories.js @@ -68,6 +68,14 @@ module.exports = function(privileges) { }; privileges.categories.filter = function(privilege, cids, uid, callback) { + if (!cids.length) { + return callback(null, []); + } + + cids = cids.filter(function(cid, index, array) { + return array.indexOf(cid) === index; + }); + async.parallel({ allowedTo: function(next) { helpers.allowedTo(privilege, uid, cids, next); diff --git a/src/privileges/posts.js b/src/privileges/posts.js index 71df14ae36..f68a235866 100644 --- a/src/privileges/posts.js +++ b/src/privileges/posts.js @@ -77,6 +77,9 @@ module.exports = function(privileges) { }; privileges.posts.filter = function(privilege, pids, uid, callback) { + if (!pids.length) { + return callback(null, []); + } posts.getCidsByPids(pids, function(err, cids) { if (err) { return callback(err); diff --git a/src/privileges/topics.js b/src/privileges/topics.js index 900aa0782d..6a2d321d97 100644 --- a/src/privileges/topics.js +++ b/src/privileges/topics.js @@ -76,6 +76,10 @@ module.exports = function(privileges) { }; privileges.topics.filter = function(privilege, tids, uid, callback) { + if (!tids.length) { + return callback(null, []); + } + var keys = tids.map(function(tid) { return 'topic:' + tid; }); diff --git a/src/topics/unread.js b/src/topics/unread.js index d33603108a..8bdc8a04e2 100644 --- a/src/topics/unread.js +++ b/src/topics/unread.js @@ -45,11 +45,11 @@ module.exports = function(Topics) { return callback(err); } - var newtids = tids.filter(function(tid, index, self) { + var newtids = tids.filter(function(tid, index) { return !read[index]; }); - privileges.topics.filter('read', newtids, uid, function(err, newTids) { + privileges.topics.filter('read', newtids, uid, function(err, newtids) { if(err) { return callback(err); } diff --git a/src/user/notifications.js b/src/user/notifications.js index f6c8832dbe..591f799ca0 100644 --- a/src/user/notifications.js +++ b/src/user/notifications.js @@ -262,6 +262,7 @@ var async = require('async'), bodyLong: results.postContent, path: nconf.get('relative_path') + '/topic/' + results.topic.slug + '/' + results.postIndex, uniqueId: 'topic:' + tid + ':uid:' + uid, + tid: tid, from: uid }, function(err, nid) { if (err) {