From de007772a489fd47fffa7f29e3263ba4855f3c9b Mon Sep 17 00:00:00 2001 From: Accalia de Elementia Date: Sat, 13 Aug 2016 12:50:06 +0000 Subject: [PATCH 1/2] feat: Allow listing all groups via websocket also add missing radix to parsing of `after` in groups.loadMore websocket method. --- src/socket.io/groups.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index 7d9ce46a70..5df97f80f5 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -217,12 +217,12 @@ SocketGroups.search = function(socket, data, callback) { }; SocketGroups.loadMore = function(socket, data, callback) { - if (!data.sort || !data.after) { + if (!data.sort || !utils.isNumber(data.after) || parseInt(data.after, 10) < 0) { return callback(); } var groupsPerPage = 9; - var start = parseInt(data.after); + var start = parseInt(data.after, 10); var stop = start + groupsPerPage - 1; groupsController.getGroupsFromSet(socket.uid, data.sort, start, stop, callback); }; From fd71b1afb6f323ac920da0a62fca4ba69069f654 Mon Sep 17 00:00:00 2001 From: NodeBB Misty Date: Sat, 13 Aug 2016 09:02:25 -0400 Subject: [PATCH 2/2] Latest translations and fallbacks --- public/language/de/category.json | 2 +- public/language/de/register.json | 8 ++++---- public/language/fa_IR/error.json | 2 +- public/language/fa_IR/modules.json | 2 +- public/language/fa_IR/topic.json | 2 +- public/language/tr/error.json | 2 +- public/language/tr/modules.json | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/public/language/de/category.json b/public/language/de/category.json index 6ce06deed2..9169f01756 100644 --- a/public/language/de/category.json +++ b/public/language/de/category.json @@ -2,7 +2,7 @@ "category": "Kategorie", "subcategories": "Unterkategorien", "new_topic_button": "Neues Thema", - "guest-login-post": "Anmelden, um einen Beitrag zu erstellen", + "guest-login-post": "Melde dich an, um einen Beitrag zu erstellen", "no_topics": "Es gibt noch keine Themen in dieser Kategorie.
Warum beginnst du nicht eins?", "browsing": "Aktiv", "no_replies": "Niemand hat geantwortet", diff --git a/public/language/de/register.json b/public/language/de/register.json index 41998933f1..9d1b7ca049 100644 --- a/public/language/de/register.json +++ b/public/language/de/register.json @@ -1,6 +1,6 @@ { "register": "Registrieren", - "cancel_registration": "Cancel Registration", + "cancel_registration": "Registrierungsvorgang abbrechen", "help.email": "Deine E-Mail Adresse ist standardmäßig nicht öffentlich sichtbar.", "help.username_restrictions": "Einen einmaligen Benutzernamen. %1-%2 Zeichen. Andere Benutzer können dich mit @Benutzername anschreiben.", "help.minimum_password_length": "Dein Passwort muss mindestens %1 Zeichen lang sein.", @@ -16,8 +16,8 @@ "alternative_registration": "Alternative Registrierung", "terms_of_use": "Nutzungsbedingungen", "agree_to_terms_of_use": "Ich stimme den Nutzungsbedingungen zu", - "terms_of_use_error": "You must agree to the Terms of Use", + "terms_of_use_error": "Du musst den Nutzungsbedingungen zustimmen", "registration-added-to-queue": "Deine Registration wurde abgeschickt. Du wirst eine E-Mail erhalten, sobald sie von einem Administrator akzeptiert wird.", - "interstitial.intro": "We require some additional information before we can create your account.", - "interstitial.errors-found": "We could not complete your registration:" + "interstitial.intro": "Wir benötigen ein wenig mehr Informationen bevor wir deinen Account erstellen können.", + "interstitial.errors-found": "Wir konnten deinen Registrierungsvorgang nicht abschließen:" } \ No newline at end of file diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json index 0b79d81e23..965f4a00c2 100644 --- a/public/language/fa_IR/error.json +++ b/public/language/fa_IR/error.json @@ -20,7 +20,7 @@ "email-taken": "این ایمیل گرفته شده است.", "email-not-confirmed": "ایمیل شما تاکنون تایید نشده است، برای تایید ایمیل خود را اینجا را کلیک کنید.", "email-not-confirmed-chat": "شما تا قبل از تایید ایمیل قادر به چت نیستید، لطفا برای تایید ایمیل خود اینجا کلیک کنید", - "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.", + "email-not-confirmed-email-sent": "ایمیل شما هنوز تایید نشده است، لطفا صندوق پیام های خود را برای تایید ایمیل بررسی کنید.", "no-email-to-confirm": "ایمیل شما تایید نشده است ، لطفا برای وارد کردن ایمیل اینجا کلیک کنید", "email-confirm-failed": "سیستم موفق به تایید ایمیل شما نشد، لطفا بعدا دوباره سعی کنید", "confirm-email-already-sent": "ایمیل فعال‌سازی قبلا فرستاده شده، لطفا %1 دقیقه صبر کنید تا ایمیل دیگری بفرستید.", diff --git a/public/language/fa_IR/modules.json b/public/language/fa_IR/modules.json index 20f1a0d8d1..9b39f7cb7f 100644 --- a/public/language/fa_IR/modules.json +++ b/public/language/fa_IR/modules.json @@ -37,7 +37,7 @@ "composer.formatting.picture": "عکس", "composer.upload-picture": "بارگذاری عکس", "composer.upload-file": "بارگذاری فایل", - "composer.zen_mode": "Zen Mode", + "composer.zen_mode": "حالت ذن", "bootbox.ok": "باشه", "bootbox.cancel": "انصراف", "bootbox.confirm": "تایید", diff --git a/public/language/fa_IR/topic.json b/public/language/fa_IR/topic.json index adaf0d29f6..f589a051ef 100644 --- a/public/language/fa_IR/topic.json +++ b/public/language/fa_IR/topic.json @@ -86,7 +86,7 @@ "topic_will_be_moved_to": "این موضوع جابه‌جا خواهد شد به دستهٔ", "fork_topic_instruction": "پست‌هایی را که می‌خواهید به موضوع تازه ببرید، انتخاب کنید", "fork_no_pids": "هیچ پستی انتخاب نشده!", - "fork_pid_count": "%1 post(s) selected", + "fork_pid_count": "%1 پست (ها) انتخاب شده اند", "fork_success": "موضوع با موفقیت منشعب شد! برای رفتن به موضوع انشعابی اینجا را کلیک کنید.", "delete_posts_instruction": "با کلیک بر روی پست شما می خواهید به حذف/پاکسازی", "composer.title_placeholder": "عنوان موضوعتان را اینجا بنویسید...", diff --git a/public/language/tr/error.json b/public/language/tr/error.json index 27385670ed..48811f7373 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -20,7 +20,7 @@ "email-taken": "E-posta Alınmış", "email-not-confirmed": "E-postanız onaylanmamış, onaylamak için lütfen buraya tıklayın.", "email-not-confirmed-chat": "E-postanız onaylanana kadar sohbet edemezsiniz, onaylamak için lütfen buraya tıklayın.", - "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.", + "email-not-confirmed-email-sent": "E-postanız onaylanmamış, onaylamak için lütfen gelen kutunuzu kontrol edin.", "no-email-to-confirm": "Bu forum e-posta doğrulaması gerektirir, lütfen buraya bir e-posta adresi girin", "email-confirm-failed": "E-posta adresinizi doğrulayamıyoruz. Lütfen daha sonra tekrar deneyin.", "confirm-email-already-sent": "E-mail onayı zaten gönderilmiş, yeni bir onay göndermek için lütfen 1 dakika bekleyin.", diff --git a/public/language/tr/modules.json b/public/language/tr/modules.json index 059d8670fb..0edc53c346 100644 --- a/public/language/tr/modules.json +++ b/public/language/tr/modules.json @@ -37,7 +37,7 @@ "composer.formatting.picture": "Görsel", "composer.upload-picture": "Görsel Yükle", "composer.upload-file": "Dosya Yükle", - "composer.zen_mode": "Zen Mode", + "composer.zen_mode": "Zen Modu", "bootbox.ok": "Tamam", "bootbox.cancel": "İptal", "bootbox.confirm": "Onayla",