From 1550f826525e662f41812907b4482cd531396c26 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 19 May 2015 14:56:39 -0400
Subject: [PATCH 1/8] closes #2928
---
src/views/admin/general/navigation.tpl | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/src/views/admin/general/navigation.tpl b/src/views/admin/general/navigation.tpl
index fe956cc5bc..36c7ac2ce7 100644
--- a/src/views/admin/general/navigation.tpl
+++ b/src/views/admin/general/navigation.tpl
@@ -25,6 +25,21 @@
<label>Text Class: <small>optional</small>
<input class="form-control" type="text" name="textClass" value="{enabled.textClass}" />
</label>
+
+ <hr />
+ <strong>Properties:</strong>
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" name="property:isAdmin" <!-- IF enabled.properties.isAdmin -->checked<!-- ENDIF enabled.properties.isAdmin -->/> <strong>Only display to Admins</strong>
+ </label>
+ </div>
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" name="property:loggedIn" <!-- IF enabled.properties.loggedIn -->checked<!-- ENDIF enabled.properties.loggedIn -->/> <strong>Only display to logged in users</strong>
+ </label>
+ </div>
+
+
<hr />
<button class="btn btn-danger delete">Delete</button>
<!-- IF enabled.enabled -->
From 60f9fc17ae904634787ade64c0a13a906cedd834 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 19 May 2015 14:57:05 -0400
Subject: [PATCH 2/8] #2928
---
public/src/admin/general/navigation.js | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js
index c98b9fa7be..e725e39ad1 100644
--- a/public/src/admin/general/navigation.js
+++ b/public/src/admin/general/navigation.js
@@ -49,18 +49,31 @@ define('admin/general/navigation', ['translator'], function(translator) {
$('#enabled li').each(function() {
var form = $(this).find('form').serializeArray(),
- data = {};
+ data = {},
+ properties = {};
form.forEach(function(input) {
- data[input.name] = translator.escape(input.value);
+ if (input.name.slice(0, 9) === 'property:' && input.value === 'on') {
+ properties[input.name.slice(9)] = true;
+ } else {
+ data[input.name] = translator.escape(input.value);
+ }
});
+ data.properties = {};
+
available.forEach(function(item) {
if (item.route.match(data.route)) {
- data.properties = item.properties;
+ data.properties = item.properties || {};
}
});
+ for (var prop in properties) {
+ if (properties.hasOwnProperty(prop)) {
+ data.properties[prop] = properties[prop];
+ }
+ }
+
nav.push(data);
});
From 93170ca10647e6aa64e0245459f8af5bb0daf68f Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 19 May 2015 15:31:51 -0400
Subject: [PATCH 3/8] closes #3147
---
src/topics/create.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/topics/create.js b/src/topics/create.js
index 1aee41e01a..81d86793fe 100644
--- a/src/topics/create.js
+++ b/src/topics/create.js
@@ -281,6 +281,7 @@ module.exports = function(Topics) {
if (parseInt(uid, 10) && data.req) {
Topics.notifyFollowers(postData, uid);
+ user.updateLastOnlineTime(uid);
}
if (postData.index > 0) {
From 9cdc2e5a2d3db1f5f4c2cb5da79aa14f2465e331 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 19 May 2015 15:46:23 -0400
Subject: [PATCH 4/8] closes #3147 properly
---
src/topics/create.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/topics/create.js b/src/topics/create.js
index 81d86793fe..75422ff40b 100644
--- a/src/topics/create.js
+++ b/src/topics/create.js
@@ -281,7 +281,7 @@ module.exports = function(Topics) {
if (parseInt(uid, 10) && data.req) {
Topics.notifyFollowers(postData, uid);
- user.updateLastOnlineTime(uid);
+ user.setUserField(uid, 'lastonline', Date.now());
}
if (postData.index > 0) {
From 05049946d482d8b1fb5307c74212f8cae0e79ff2 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 19 May 2015 16:59:38 -0400
Subject: [PATCH 5/8] updated error strings
---
public/language/en_GB/error.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json
index d587e80dd0..73bd2ce7db 100644
--- a/public/language/en_GB/error.json
+++ b/public/language/en_GB/error.json
@@ -88,8 +88,8 @@
"invalid-file": "Invalid File",
"uploads-are-disabled": "Uploads are disabled",
- "signature-too-long" : "Sorry, your signature cannot be longer than %1 characters.",
- "about-me-too-long" : "Sorry, your about me cannot be longer than %1 characters.",
+ "signature-too-long" : "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long" : "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "You can't chat with yourself!",
"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
From 93df7f14d88bd40f88e78c5a39b04975b28b751e Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 19 May 2015 17:45:23 -0400
Subject: [PATCH 6/8] latest translations and fallbacks
---
public/language/ar/error.json | 3 ++-
public/language/ar/topic.json | 1 +
public/language/ar/user.json | 1 +
public/language/bg/error.json | 5 +++--
public/language/bg/topic.json | 1 +
public/language/bg/user.json | 1 +
public/language/bn/error.json | 3 ++-
public/language/bn/topic.json | 1 +
public/language/bn/user.json | 1 +
public/language/cs/error.json | 3 ++-
public/language/cs/topic.json | 1 +
public/language/cs/user.json | 1 +
public/language/de/error.json | 5 +++--
public/language/de/topic.json | 1 +
public/language/de/user.json | 1 +
public/language/el/error.json | 3 ++-
public/language/el/topic.json | 1 +
public/language/el/user.json | 1 +
public/language/en@pirate/error.json | 1 +
public/language/en@pirate/topic.json | 1 +
public/language/en@pirate/user.json | 1 +
public/language/en_US/error.json | 1 +
public/language/en_US/topic.json | 1 +
public/language/en_US/user.json | 1 +
public/language/es/error.json | 3 ++-
public/language/es/topic.json | 1 +
public/language/es/user.json | 1 +
public/language/et/error.json | 3 ++-
public/language/et/topic.json | 1 +
public/language/et/user.json | 1 +
public/language/fa_IR/error.json | 5 +++--
public/language/fa_IR/language.json | 2 +-
public/language/fa_IR/topic.json | 1 +
public/language/fa_IR/user.json | 1 +
public/language/fi/error.json | 3 ++-
public/language/fi/topic.json | 1 +
public/language/fi/user.json | 1 +
public/language/fr/error.json | 5 +++--
public/language/fr/topic.json | 1 +
public/language/fr/user.json | 1 +
public/language/he/error.json | 3 ++-
public/language/he/topic.json | 1 +
public/language/he/user.json | 1 +
public/language/hu/error.json | 3 ++-
public/language/hu/topic.json | 1 +
public/language/hu/user.json | 1 +
public/language/id/error.json | 3 ++-
public/language/id/topic.json | 1 +
public/language/id/user.json | 1 +
public/language/it/error.json | 3 ++-
public/language/it/topic.json | 1 +
public/language/it/user.json | 1 +
public/language/ja/error.json | 1 +
public/language/ja/topic.json | 1 +
public/language/ja/user.json | 1 +
public/language/ko/error.json | 3 ++-
public/language/ko/topic.json | 1 +
public/language/ko/user.json | 1 +
public/language/lt/error.json | 3 ++-
public/language/lt/topic.json | 1 +
public/language/lt/user.json | 1 +
public/language/ms/error.json | 5 +++--
public/language/ms/topic.json | 1 +
public/language/ms/user.json | 1 +
public/language/nb/error.json | 3 ++-
public/language/nb/topic.json | 1 +
public/language/nb/user.json | 1 +
public/language/nl/error.json | 5 +++--
public/language/nl/topic.json | 1 +
public/language/nl/user.json | 1 +
public/language/pl/error.json | 3 ++-
public/language/pl/topic.json | 1 +
public/language/pl/user.json | 1 +
public/language/pt_BR/error.json | 3 ++-
public/language/pt_BR/topic.json | 1 +
public/language/pt_BR/user.json | 1 +
public/language/ro/error.json | 3 ++-
public/language/ro/topic.json | 1 +
public/language/ro/user.json | 1 +
public/language/ru/error.json | 5 +++--
public/language/ru/topic.json | 1 +
public/language/ru/user.json | 1 +
public/language/sc/error.json | 1 +
public/language/sc/topic.json | 1 +
public/language/sc/user.json | 1 +
public/language/sk/error.json | 1 +
public/language/sk/topic.json | 1 +
public/language/sk/user.json | 1 +
public/language/sv/error.json | 3 ++-
public/language/sv/topic.json | 1 +
public/language/sv/user.json | 1 +
public/language/th/error.json | 3 ++-
public/language/th/topic.json | 1 +
public/language/th/user.json | 1 +
public/language/tr/error.json | 3 ++-
public/language/tr/topic.json | 1 +
public/language/tr/user.json | 1 +
public/language/vi/error.json | 3 ++-
public/language/vi/topic.json | 1 +
public/language/vi/user.json | 1 +
public/language/zh_CN/error.json | 3 ++-
public/language/zh_CN/topic.json | 1 +
public/language/zh_CN/user.json | 1 +
public/language/zh_TW/error.json | 3 ++-
public/language/zh_TW/topic.json | 1 +
public/language/zh_TW/user.json | 1 +
106 files changed, 143 insertions(+), 38 deletions(-)
diff --git a/public/language/ar/error.json b/public/language/ar/error.json
index 2071baf252..4c10a8cf38 100644
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -2,7 +2,7 @@
"invalid-data": "بيانات غير صالحة",
"not-logged-in": "لم تقم بتسجيل الدخول",
"account-locked": "تم إقفال حسابكم مؤقتًا.",
- "search-requires-login": "البحث في المنتدى يستلزم توفرك على حساب! المرجو تسجيل دخولك أو إنشاء حساب!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "قائمة غير موجودة",
"invalid-tid": "موضوع غير متواجد",
"invalid-pid": "رد غير موجود",
@@ -68,6 +68,7 @@
"invalid-file": "ملف غير مقبول",
"uploads-are-disabled": "رفع الملفات غير مفعل",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "لايمكنك فتح محادثة مع نفسك",
"chat-restricted": "هذا المستخدم عطل المحادثات الواردة عليه. يجب أن يتبعك حتى تتمكن من فتح محادثة معه.",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json
index 0ac8738c9f..fa8064880c 100644
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "لا توجد مواضيع !",
"no_posts_found": "لا توجد مشاركات!",
"post_is_deleted": "هذه المشاركة محذوفة!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "الملف الشخصي",
"posted_by": "كتب من طرف %1",
"posted_by_guest": "كتب من طرف زائر",
diff --git a/public/language/ar/user.json b/public/language/ar/user.json
index 613bade9ce..acc500eabf 100644
--- a/public/language/ar/user.json
+++ b/public/language/ar/user.json
@@ -21,6 +21,7 @@
"watched": "متابع",
"followers": "المتابعون",
"following": "يتابع",
+ "aboutme": "About me",
"signature": "توقيع",
"gravatar": "Gravatar",
"birthday": "عيد ميلاد",
diff --git a/public/language/bg/error.json b/public/language/bg/error.json
index 17907c8815..ce39acb82d 100644
--- a/public/language/bg/error.json
+++ b/public/language/bg/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Невалидни данни",
"not-logged-in": "Изглежда не сте влезли в системата.",
"account-locked": "Вашият акаунт беше заключен временно",
- "search-requires-login": "Търсенето изисква регистриран акаунт! Моля, влезте или се регистрирайте!",
+ "search-requires-login": "Търсенето изисква акаунт – моля, влезте или се регистрирайте.",
"invalid-cid": "Невалиден идентификатор на категория",
"invalid-tid": "Невалиден идентификатор на тема",
"invalid-pid": "Невалиден идентификатор на публикация",
@@ -67,7 +67,8 @@
"topic-thumbnails-are-disabled": "Иконките на темите са изключени.",
"invalid-file": "Грешен файл",
"uploads-are-disabled": "Качването не е разрешено",
- "signature-too-long": "Съжаляваме, но подписът Ви трябва да съдържа не повече от %1 символ(а).",
+ "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Не можете да пишете чат съобщение на себе си!",
"chat-restricted": "Този потребител е ограничил чат съобщенията до себе си. Той трябва първо да Ви последва, преди да можете да си пишете с него.",
"too-many-messages": "Изпратили сте твърде много съобщения. Моля, изчакайте малко.",
diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json
index 03062d7e70..492bf1bccf 100644
--- a/public/language/bg/topic.json
+++ b/public/language/bg/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Няма открити теми!",
"no_posts_found": "Няма открити публикации!",
"post_is_deleted": "Тази публикация е изтрита!",
+ "topic_is_deleted": "Тази тема е изтрита!",
"profile": "Профил",
"posted_by": "Публикувано от %1",
"posted_by_guest": "Публикувано от гост",
diff --git a/public/language/bg/user.json b/public/language/bg/user.json
index f6b68145f1..dee62ac943 100644
--- a/public/language/bg/user.json
+++ b/public/language/bg/user.json
@@ -21,6 +21,7 @@
"watched": "Наблюдавани",
"followers": "Последователи",
"following": "Следва",
+ "aboutme": "За мен",
"signature": "Подпис",
"gravatar": "Граватар",
"birthday": "Рождена дата",
diff --git a/public/language/bn/error.json b/public/language/bn/error.json
index 40b8dc44d7..979dca250b 100644
--- a/public/language/bn/error.json
+++ b/public/language/bn/error.json
@@ -2,7 +2,7 @@
"invalid-data": "ভুল তথ্য",
"not-logged-in": "আপনি লগিন করেননি",
"account-locked": "আপনার অ্যাকাউন্ট সাময়িকভাবে লক করা হয়েছে",
- "search-requires-login": "অনুসন্ধান করার জন্য একটি অ্যাকাউন্ট প্রয়োজন! অনুগ্রহপূর্বক প্রবেশ করুন অথবা নিবন্ধন করুন!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "ভুল বিভাগ নাম্বার",
"invalid-tid": "ভুল টপিক নাম্বার",
"invalid-pid": "ভুল পোস্ট নাম্বার",
@@ -68,6 +68,7 @@
"invalid-file": "ভুল ফাইল",
"uploads-are-disabled": "আপলোড নিষ্ক্রিয় করা",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "আপনি নিজের সাথে চ্যাট করতে পারবেন না!",
"chat-restricted": "এই সদস্য তার বার্তালাপ সংরক্ষিত রেখেছেন। এই সদস্য আপনাকে ফলো করার পরই কেবলমাত্র আপনি তার সাথে চ্যাট করতে পারবেন",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json
index 3b0835cf2e..92466f18c8 100644
--- a/public/language/bn/topic.json
+++ b/public/language/bn/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "কোন টপিক পাওয়া যায়নি!",
"no_posts_found": "কোন পোস্ট পাওয়া যায়নি",
"post_is_deleted": "এই পোস্টটি মুছে ফেলা হয়েছে!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "প্রোফাইল ",
"posted_by": "পোস্ট করেছেন %1",
"posted_by_guest": "অতিথি পোস্ট ",
diff --git a/public/language/bn/user.json b/public/language/bn/user.json
index 5107df1fa7..96b8943a2d 100644
--- a/public/language/bn/user.json
+++ b/public/language/bn/user.json
@@ -21,6 +21,7 @@
"watched": "Watched",
"followers": "যাদের অনুসরণ করছেন",
"following": "যারা আপনাকে অনুসরণ করছে",
+ "aboutme": "About me",
"signature": "স্বাক্ষর",
"gravatar": "গ্রাভাতার",
"birthday": "জন্মদিন",
diff --git a/public/language/cs/error.json b/public/language/cs/error.json
index 1a82707bd9..60418d0ef0 100644
--- a/public/language/cs/error.json
+++ b/public/language/cs/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Neplatná data",
"not-logged-in": "Zdá se, že nejste přihlášen(a)",
"account-locked": "Váš účet byl dočasně uzamčen",
- "search-requires-login": "Chcete-li vyhledávat, musíte mít účet. Přihlašte se nebo zaregistrujte, prosím.",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Neplatné ID kategorie",
"invalid-tid": "Neplatné ID tématu",
"invalid-pid": "Neplatné ID příspěvku",
@@ -68,6 +68,7 @@
"invalid-file": "Neplatný soubor",
"uploads-are-disabled": "Nahrávání je zakázáno",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Nemůžete chatovat sami se sebou!",
"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json
index 4f20b6e6db..7e930cfc23 100644
--- a/public/language/cs/topic.json
+++ b/public/language/cs/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Nebyla nalezena žádná témata!",
"no_posts_found": "Nebyly nalezeny žádné příspěvky!",
"post_is_deleted": "Tento příspěvek je vymazán!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profil",
"posted_by": "Posted by %1",
"posted_by_guest": "Posted by Guest",
diff --git a/public/language/cs/user.json b/public/language/cs/user.json
index 171ed20163..b41192c56f 100644
--- a/public/language/cs/user.json
+++ b/public/language/cs/user.json
@@ -21,6 +21,7 @@
"watched": "Watched",
"followers": "Sledují ho",
"following": "Sleduje",
+ "aboutme": "About me",
"signature": "Podpis",
"gravatar": "Gravatar",
"birthday": "Datum narození",
diff --git a/public/language/de/error.json b/public/language/de/error.json
index 1d5935080d..61cb1fa3f9 100644
--- a/public/language/de/error.json
+++ b/public/language/de/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Daten ungültig",
"not-logged-in": "Du bist nicht angemeldet.",
"account-locked": "Dein Account wurde vorübergehend gesperrt.",
- "search-requires-login": "Die Suche erfordert ein Konto! Bitte log dich ein oder registriere dich!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Ungültige Kategorie-ID",
"invalid-tid": "Ungültige Themen-ID",
"invalid-pid": "Ungültige Beitrags-ID",
@@ -67,7 +67,8 @@
"topic-thumbnails-are-disabled": "Vorschaubilder für Themen sind deaktiviert",
"invalid-file": "Datei ungültig",
"uploads-are-disabled": "Uploads sind deaktiviert",
- "signature-too-long": "Deine Signatur darf %1 Zeichen nicht überschreiten.",
+ "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Du kannst nicht mit dir selber chatten!",
"chat-restricted": "Dieser Benutzer hat seine Chatfunktion eingeschränkt. Du kannst nur mit diesem Benutzer chatten, wenn er dir folgt.",
"too-many-messages": "Du hast zu viele Nachrichten versandt, bitte warte eine Weile.",
diff --git a/public/language/de/topic.json b/public/language/de/topic.json
index c4fe7732d8..43d59ecb73 100644
--- a/public/language/de/topic.json
+++ b/public/language/de/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Keine passenden Themen gefunden.",
"no_posts_found": "Keine Beiträge gefunden!",
"post_is_deleted": "Dieser Beitrag wurde gelöscht!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profil",
"posted_by": "Geschrieben von %1",
"posted_by_guest": "Verfasst von einem Gast",
diff --git a/public/language/de/user.json b/public/language/de/user.json
index 2661df0091..d1677c7609 100644
--- a/public/language/de/user.json
+++ b/public/language/de/user.json
@@ -21,6 +21,7 @@
"watched": "Beobachtet",
"followers": "Folger",
"following": "Folgt",
+ "aboutme": "About me",
"signature": "Signatur",
"gravatar": "Gravatar",
"birthday": "Geburtstag",
diff --git a/public/language/el/error.json b/public/language/el/error.json
index 5749bd7156..2cb627fbc4 100644
--- a/public/language/el/error.json
+++ b/public/language/el/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Άκυρα Δεδομένα",
"not-logged-in": "Φαίνεται πως δεν είσαι συνδεδεμένος/η.",
"account-locked": "Ο λογαριασμός σου έχει κλειδωθεί προσωρινά",
- "search-requires-login": "Πρέπει να είσαι συνδεδεμένος/η για να αναζητήσεις! Παρακαλώ συνδέσου ή εγγράψου!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Άκυρο ID Κατηγορίας",
"invalid-tid": "Άκυρο ID Θέματος",
"invalid-pid": "Άκυρο ID Δημοσίευσης",
@@ -68,6 +68,7 @@
"invalid-file": "Άκυρο Αρχείο",
"uploads-are-disabled": "Το ανέβασμα αρχείων έχει απενεργοποιηθεί",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Δεν μπορείς να συνομιλήσεις με τον εαυτό σου!",
"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/el/topic.json b/public/language/el/topic.json
index 5e93f49db9..2a905bf786 100644
--- a/public/language/el/topic.json
+++ b/public/language/el/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Δεν βρέθηκαν θέματα!",
"no_posts_found": "Δεν βρέθηκαν δημοσιεύσεις!",
"post_is_deleted": "Αυτή η δημοσίευση έχει διαγραφεί!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Προφίλ",
"posted_by": "Δημοσιεύτηκε από τον/την %1",
"posted_by_guest": "Δημοσιεύτηκε από Επισκέπτη",
diff --git a/public/language/el/user.json b/public/language/el/user.json
index 984400744f..9524d5a529 100644
--- a/public/language/el/user.json
+++ b/public/language/el/user.json
@@ -21,6 +21,7 @@
"watched": "Watched",
"followers": "Ακόλουθοι",
"following": "Ακολουθά",
+ "aboutme": "About me",
"signature": "Υπογραφή",
"gravatar": "Gravatar",
"birthday": "Γενέθλια",
diff --git a/public/language/en@pirate/error.json b/public/language/en@pirate/error.json
index 71c02b3dc5..ac2457e250 100644
--- a/public/language/en@pirate/error.json
+++ b/public/language/en@pirate/error.json
@@ -68,6 +68,7 @@
"invalid-file": "Invalid File",
"uploads-are-disabled": "Uploads are disabled",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "You can't chat with yourself!",
"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/en@pirate/topic.json b/public/language/en@pirate/topic.json
index 88cd2e2328..641e8f0346 100644
--- a/public/language/en@pirate/topic.json
+++ b/public/language/en@pirate/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "No topics found!",
"no_posts_found": "No posts found!",
"post_is_deleted": "This post is deleted!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profile",
"posted_by": "Posted by %1",
"posted_by_guest": "Posted by Guest",
diff --git a/public/language/en@pirate/user.json b/public/language/en@pirate/user.json
index d93872539c..49ecb754ac 100644
--- a/public/language/en@pirate/user.json
+++ b/public/language/en@pirate/user.json
@@ -21,6 +21,7 @@
"watched": "Watched",
"followers": "Followers",
"following": "Following",
+ "aboutme": "About me",
"signature": "Signature",
"gravatar": "Gravatar",
"birthday": "Birthday",
diff --git a/public/language/en_US/error.json b/public/language/en_US/error.json
index 71c02b3dc5..ac2457e250 100644
--- a/public/language/en_US/error.json
+++ b/public/language/en_US/error.json
@@ -68,6 +68,7 @@
"invalid-file": "Invalid File",
"uploads-are-disabled": "Uploads are disabled",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "You can't chat with yourself!",
"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/en_US/topic.json b/public/language/en_US/topic.json
index 750ce2694a..d9742f2eda 100644
--- a/public/language/en_US/topic.json
+++ b/public/language/en_US/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "No topics found!",
"no_posts_found": "No posts found!",
"post_is_deleted": "This post is deleted!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profile",
"posted_by": "Posted by %1",
"posted_by_guest": "Posted by Guest",
diff --git a/public/language/en_US/user.json b/public/language/en_US/user.json
index ddfb4ac04a..c3ebec37a2 100644
--- a/public/language/en_US/user.json
+++ b/public/language/en_US/user.json
@@ -21,6 +21,7 @@
"watched": "Watched",
"followers": "Followers",
"following": "Following",
+ "aboutme": "About me",
"signature": "Signature",
"gravatar": "Gravatar",
"birthday": "Birthday",
diff --git a/public/language/es/error.json b/public/language/es/error.json
index 12132c317d..cd90a8470b 100644
--- a/public/language/es/error.json
+++ b/public/language/es/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Datos no válidos",
"not-logged-in": "No has iniciado sesión.",
"account-locked": "Tu cuenta ha sido bloqueada temporalmente.",
- "search-requires-login": "¡Buscar requiere estar registrado! Por favor, entra o regístrate.",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Identificador de categoría no válido",
"invalid-tid": "Identificador de tema no válido",
"invalid-pid": "Identificador de publicación no válido",
@@ -68,6 +68,7 @@
"invalid-file": "Archivo no válido",
"uploads-are-disabled": "Las subidas están deshabilitadas.",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "¡No puedes conversar contigo mismo!",
"chat-restricted": "Este usuario tiene restringidos los mensajes de chat. Los usuarios deben seguirte antes de que pueda charlar con ellos",
"too-many-messages": "Has enviado demasiados mensajes, por favor espera un poco.",
diff --git a/public/language/es/topic.json b/public/language/es/topic.json
index 1938b05c7d..edf271b351 100644
--- a/public/language/es/topic.json
+++ b/public/language/es/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "¡No se encontraron temas!",
"no_posts_found": "¡No se encontraron publicaciones!",
"post_is_deleted": "¡Esta publicación está eliminada!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Perfil",
"posted_by": "Publicado por %1",
"posted_by_guest": "Publicado por Invitado",
diff --git a/public/language/es/user.json b/public/language/es/user.json
index 09782de1b5..44baffb856 100644
--- a/public/language/es/user.json
+++ b/public/language/es/user.json
@@ -21,6 +21,7 @@
"watched": "Visto",
"followers": "Seguidores",
"following": "Siguiendo",
+ "aboutme": "About me",
"signature": "Firma",
"gravatar": "Gravatar",
"birthday": "Cumpleaños",
diff --git a/public/language/et/error.json b/public/language/et/error.json
index 776586b76c..bceffa41e1 100644
--- a/public/language/et/error.json
+++ b/public/language/et/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Vigased andmed",
"not-logged-in": "Sa ei ole sisse logitud",
"account-locked": "Su kasutaja on ajutiselt lukustatud",
- "search-requires-login": "Foorumis otsimiseks on vaja kasutajat! Palun logi sisse või registreeru kasutajaks!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Vigane kategooria ID",
"invalid-tid": "Vigane teema ID",
"invalid-pid": "Vigane postituse ID",
@@ -68,6 +68,7 @@
"invalid-file": "Vigane fail",
"uploads-are-disabled": "Üleslaadimised on keelatud",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Sa ei saa endaga vestelda!",
"chat-restricted": "Kasutaja on piiranud sõnumite saatmist. Privaatsõnumi saatmiseks peab kasutaja sind jälgima",
"too-many-messages": "Oled saatnud liiga palju sõnumeid, oota natukene.",
diff --git a/public/language/et/topic.json b/public/language/et/topic.json
index f5d72479c9..4359384ac4 100644
--- a/public/language/et/topic.json
+++ b/public/language/et/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Teemasid ei leitud!",
"no_posts_found": "Postitusi ei leitud!",
"post_is_deleted": "See postitus on kustutatud!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profiil",
"posted_by": "Postitas %1",
"posted_by_guest": "Postitatud külalise ppolt",
diff --git a/public/language/et/user.json b/public/language/et/user.json
index 6c015502db..5cd87ac9a2 100644
--- a/public/language/et/user.json
+++ b/public/language/et/user.json
@@ -21,6 +21,7 @@
"watched": "Vaadatud",
"followers": "Jälgijad",
"following": "Jälgimised",
+ "aboutme": "About me",
"signature": "Allkiri",
"gravatar": "Gravatar",
"birthday": "Sünnipäev",
diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json
index 693ac564de..37e2a353b3 100644
--- a/public/language/fa_IR/error.json
+++ b/public/language/fa_IR/error.json
@@ -2,7 +2,7 @@
"invalid-data": "داده(های) نامعتبر",
"not-logged-in": "به نظر میرسد که با حساب کاربری وارد نشده اید.",
"account-locked": "حساب کاربری شما موقتاً مسدود شده است.",
- "search-requires-login": "جستجو نیاز به حساب کاربری دارد! لطفا وارد شوید و یا ثبت نام کنید!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "شناسه دسته نامعتبر است.",
"invalid-tid": "شناسه جستار نامعتبر است.",
"invalid-pid": "شناسه دیدگاه نامعتبر است.",
@@ -67,7 +67,8 @@
"topic-thumbnails-are-disabled": "چهرکهای جستار غیرفعال شده است.",
"invalid-file": "فایل نامعتبر است.",
"uploads-are-disabled": "امکان بارگذاری غیرفعال شده است.",
- "signature-too-long": "پوزش میخواهیم، امضای شما نمیتواند بیشتر از %1 نویسه داشته باشد.",
+ "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "شما نمیتوانید با خودتان گفتگو کنید!",
"chat-restricted": "این کاربر پیام های گفتگوی خود را محدود کرده است . آنها بایدشما را دنبال کنند تا اینکه شما بتوانید به آنها پیامی بفرستید",
"too-many-messages": "شما پیامهای خیلی زیادی فرستاده اید، لطفا مدتی صبر نمایید",
diff --git a/public/language/fa_IR/language.json b/public/language/fa_IR/language.json
index de83f729fb..c387007d53 100644
--- a/public/language/fa_IR/language.json
+++ b/public/language/fa_IR/language.json
@@ -1,5 +1,5 @@
{
- "name": "Persian (Iran)",
+ "name": "فارسی",
"code": "fa_IR",
"dir": "rtl"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/topic.json b/public/language/fa_IR/topic.json
index 2ed30ffa38..3a26922060 100644
--- a/public/language/fa_IR/topic.json
+++ b/public/language/fa_IR/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "هیچ جستاری یافت نشد!",
"no_posts_found": "دیدگاهی یافت نشد!",
"post_is_deleted": "این دیدگاه پاک شده!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "نمایه",
"posted_by": "ارسال شده توسط %1",
"posted_by_guest": "ارسال شده توسط مهمان",
diff --git a/public/language/fa_IR/user.json b/public/language/fa_IR/user.json
index e3722d684c..2758770015 100644
--- a/public/language/fa_IR/user.json
+++ b/public/language/fa_IR/user.json
@@ -21,6 +21,7 @@
"watched": "پاییده شده",
"followers": "دنبالکنندهها",
"following": "دنبالشوندهها",
+ "aboutme": "About me",
"signature": "امضا",
"gravatar": "گراواتار",
"birthday": "روز تولد",
diff --git a/public/language/fi/error.json b/public/language/fi/error.json
index 6001a3f211..0c38939c8c 100644
--- a/public/language/fi/error.json
+++ b/public/language/fi/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Virheellinen data",
"not-logged-in": "Et taida olla kirjautuneena sisään.",
"account-locked": "Käyttäjätilisi on lukittu väliaikaisesti",
- "search-requires-login": "Hakeminen vaatii käyttäjätilin! Kirjaudu sisään tai rekisteröidy!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Virheellinen kategorian ID",
"invalid-tid": "Virheellinen aiheen ID",
"invalid-pid": "Virheellinen viestin ID",
@@ -68,6 +68,7 @@
"invalid-file": "Virheellinen tiedosto",
"uploads-are-disabled": "Et voi lähettää tiedostoa",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Et voi keskustella itsesi kanssa!",
"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json
index d6812a7fa4..ec87d3db17 100644
--- a/public/language/fi/topic.json
+++ b/public/language/fi/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Aiheita ei löytynyt!",
"no_posts_found": "Viestejä ei löytynyt!",
"post_is_deleted": "Tämä viesti poistettiin!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profiili",
"posted_by": "%1 kirjoitti",
"posted_by_guest": "Vieras kirjoitti",
diff --git a/public/language/fi/user.json b/public/language/fi/user.json
index 3a4c176679..302f503beb 100644
--- a/public/language/fi/user.json
+++ b/public/language/fi/user.json
@@ -21,6 +21,7 @@
"watched": "Seurattu",
"followers": "Seuraajat",
"following": "Seuratut",
+ "aboutme": "About me",
"signature": "Allekirjoitus",
"gravatar": "Gravatar",
"birthday": "Syntymäpäivä",
diff --git a/public/language/fr/error.json b/public/language/fr/error.json
index 880c9ce132..dd79c11b72 100644
--- a/public/language/fr/error.json
+++ b/public/language/fr/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Données invalides",
"not-logged-in": "Vous ne semblez pas être connecté.",
"account-locked": "Votre compte a été temporairement suspendu",
- "search-requires-login": "Vous devez avoir un compte pour effectuer une recherche ! Veuillez vous identifier ou vous inscrire !",
+ "search-requires-login": "Rechercher nécessite d'avoir un compte. Veuillez vous identifier ou vous enregistrer.",
"invalid-cid": "ID de catégorie invalide",
"invalid-tid": "ID de sujet invalide",
"invalid-pid": "ID de message invalide",
@@ -67,7 +67,8 @@
"topic-thumbnails-are-disabled": "Les miniatures de sujet sont désactivés",
"invalid-file": "Fichier invalide",
"uploads-are-disabled": "Les envois sont désactivés",
- "signature-too-long": "La signature ne peut dépasser %1 caractère(s).",
+ "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Vous ne pouvez chatter avec vous même !",
"chat-restricted": "Cet utilisateur a restreint les ses messages de chat. Il doit d'abord vous suivre avant de pouvoir discuter avec lui.",
"too-many-messages": "Vous avez envoyé trop de messages, veuillez patienter un instant.",
diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json
index 8248eb2580..7a3649951c 100644
--- a/public/language/fr/topic.json
+++ b/public/language/fr/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Aucun sujet n'a été trouvé !",
"no_posts_found": "Aucun message trouvé !",
"post_is_deleted": "Ce message a été supprimé !",
+ "topic_is_deleted": "Ce sujet a été supprimé !",
"profile": "Profil",
"posted_by": "Posté par %1",
"posted_by_guest": "Posté par un invité",
diff --git a/public/language/fr/user.json b/public/language/fr/user.json
index b2e6c5a902..486ee48178 100644
--- a/public/language/fr/user.json
+++ b/public/language/fr/user.json
@@ -21,6 +21,7 @@
"watched": "Suivis",
"followers": "Abonnés",
"following": "Abonnements",
+ "aboutme": "À propos de moi",
"signature": "Signature",
"gravatar": "Gravatar",
"birthday": "Anniversaire",
diff --git a/public/language/he/error.json b/public/language/he/error.json
index d3171986cc..ebe39d885d 100644
--- a/public/language/he/error.json
+++ b/public/language/he/error.json
@@ -2,7 +2,7 @@
"invalid-data": "נתונים שגויים",
"not-logged-in": "נראה שאינך מחובר למערכת.",
"account-locked": "חשבונך נחסם באופן זמני",
- "search-requires-login": "החיפוש דורש משתמש רשום! יש להיכנס למערכת או להירשם!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "זהוי קטגוריה שגוי",
"invalid-tid": "זהוי נושא שגוי",
"invalid-pid": "זהוי פוסט שגוי",
@@ -68,6 +68,7 @@
"invalid-file": "קובץ לא תקין",
"uploads-are-disabled": "העלאת קבצים אינה מאופשרת",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "לא ניתן לעשות צ'אט עם עצמך!",
"chat-restricted": "משתמש זה חסם את הודעות הצ'אט שלו ממשתמשים זרים. המשתמש חייב לעקוב אחריך לפני שתוכל לשוחח איתו בצ'אט",
"too-many-messages": "שלחת יותר מדי הודעות, אנא המתן לזמן מה.",
diff --git a/public/language/he/topic.json b/public/language/he/topic.json
index 3ff27d0a8a..62724d03a3 100644
--- a/public/language/he/topic.json
+++ b/public/language/he/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "לא נמצאו נושאים!",
"no_posts_found": "לא נמצאו פוסטים!",
"post_is_deleted": "פוסט זה נמחק!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "פרופיל",
"posted_by": "הפוסט הועלה על ידי %1",
"posted_by_guest": "פורסם על-ידי אורח",
diff --git a/public/language/he/user.json b/public/language/he/user.json
index c2989b6233..6011356044 100644
--- a/public/language/he/user.json
+++ b/public/language/he/user.json
@@ -21,6 +21,7 @@
"watched": "נצפה",
"followers": "עוקבים",
"following": "עוקב אחרי",
+ "aboutme": "About me",
"signature": "חתימה",
"gravatar": "אווטר",
"birthday": "יום הולדת",
diff --git a/public/language/hu/error.json b/public/language/hu/error.json
index e84486eb06..4f6a148af5 100644
--- a/public/language/hu/error.json
+++ b/public/language/hu/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Érvénytelen adat",
"not-logged-in": "Úgy tűnik, nem vagy bejelentkezve.",
"account-locked": "A fiókod ideiglenesen zárolva lett.",
- "search-requires-login": "A kereső használatához szükséges egy fiók! Kérlek jelenltkezz be vagy regisztrálj!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Érvénytelen kategória azonosító",
"invalid-tid": "Érvénytelen téma azonosító",
"invalid-pid": "Érvénytelen hozzászólás azonosító",
@@ -68,6 +68,7 @@
"invalid-file": "Érvénytelen fájl",
"uploads-are-disabled": "A feltöltés nem engedélyezett",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Nem cseveghetsz magaddal!",
"chat-restricted": "Ez a felhasználó korlátozta a chat beállításait. Csak akkor cseveghetsz vele, miután felvett a követettek közé téged",
"too-many-messages": "Túl sok üzenetet küldtél, kérlek várj egy picit.",
diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json
index 30bf3ab2f8..bb467f2c5c 100644
--- a/public/language/hu/topic.json
+++ b/public/language/hu/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Téma nem található!",
"no_posts_found": "Hozzászólások nem találhatóak!",
"post_is_deleted": "A bejegyzés törlésre került!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profil",
"posted_by": "Szerző %1",
"posted_by_guest": "Szerző Vendég",
diff --git a/public/language/hu/user.json b/public/language/hu/user.json
index f35879c80e..b6f9906710 100644
--- a/public/language/hu/user.json
+++ b/public/language/hu/user.json
@@ -21,6 +21,7 @@
"watched": "Megfigyeli",
"followers": "Követők",
"following": "Követve",
+ "aboutme": "About me",
"signature": "Aláírás",
"gravatar": "Gravatar",
"birthday": "Szülinap",
diff --git a/public/language/id/error.json b/public/language/id/error.json
index 508ebfcc6b..531b335a78 100644
--- a/public/language/id/error.json
+++ b/public/language/id/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Data Salah",
"not-logged-in": "Kamu terlihat belum login",
"account-locked": "Akun kamu dikunci sementara",
- "search-requires-login": "Pencarian butuh sebuah akun, silakan login atau register terlebih dulu",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "ID Kategori Salah",
"invalid-tid": "ID Topik Salah",
"invalid-pid": "ID Post Salah",
@@ -68,6 +68,7 @@
"invalid-file": "File Salah",
"uploads-are-disabled": "Upload ditiadakan",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Kamu tidak dapat chat dengan akun sendiri",
"chat-restricted": "Pengguna ini telah membatasi percakapa mereka. Mereka harus mengikutimu sebelum kamu dapat melakukan percakapan dengan mereka ",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/id/topic.json b/public/language/id/topic.json
index c47b9612be..5f119c3e80 100644
--- a/public/language/id/topic.json
+++ b/public/language/id/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Tidak topik yang ditemukan!",
"no_posts_found": "Tidak ada posting yang ditemukan!",
"post_is_deleted": "Posting ini telah dihapus!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profil",
"posted_by": "Dibuat oleh %1",
"posted_by_guest": "Dibuat oleh Tamu",
diff --git a/public/language/id/user.json b/public/language/id/user.json
index 5faa4375a1..74cfa9f7d6 100644
--- a/public/language/id/user.json
+++ b/public/language/id/user.json
@@ -21,6 +21,7 @@
"watched": "Watched",
"followers": "Pengikut",
"following": "Mengikuti",
+ "aboutme": "About me",
"signature": "Tanda Pengenal",
"gravatar": "Gravatar",
"birthday": "Hari Lahir",
diff --git a/public/language/it/error.json b/public/language/it/error.json
index fc59c81e2c..7577b34f43 100644
--- a/public/language/it/error.json
+++ b/public/language/it/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Dati non validi",
"not-logged-in": "Non sembri essere loggato.",
"account-locked": "Il tuo account è stato bloccato temporaneamente",
- "search-requires-login": "La ricerca richiede un account! Si prega di loggarsi o registrarsi!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "ID Categoria non valido",
"invalid-tid": "ID Topic non valido",
"invalid-pid": "ID Post non valido",
@@ -68,6 +68,7 @@
"invalid-file": "File non valido",
"uploads-are-disabled": "Uploads disabilitati",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Non puoi chattare con te stesso!",
"chat-restricted": "Questo utente ha ristretto i suoi messaggi in chat alle persone che segue. Per poter chattare con te ti deve prima seguire.",
"too-many-messages": "Hai inviato troppi messaggi, aspetta un attimo.",
diff --git a/public/language/it/topic.json b/public/language/it/topic.json
index e53ac5c6f2..d442472c00 100644
--- a/public/language/it/topic.json
+++ b/public/language/it/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Nessuna discussione trovata!",
"no_posts_found": "Nessun post trovato!",
"post_is_deleted": "Questo post è eliminato!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profilo",
"posted_by": "scritto da %1",
"posted_by_guest": "Scritto da Ospite",
diff --git a/public/language/it/user.json b/public/language/it/user.json
index ec6779bccc..38e2565652 100644
--- a/public/language/it/user.json
+++ b/public/language/it/user.json
@@ -21,6 +21,7 @@
"watched": "Osservati",
"followers": "Da chi è seguito",
"following": "Chi segue",
+ "aboutme": "About me",
"signature": "Firma",
"gravatar": "Gravatar",
"birthday": "Data di nascita",
diff --git a/public/language/ja/error.json b/public/language/ja/error.json
index 6bae1800ba..631406319a 100644
--- a/public/language/ja/error.json
+++ b/public/language/ja/error.json
@@ -68,6 +68,7 @@
"invalid-file": "無効なファイル",
"uploads-are-disabled": "アップロードが無効された",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "自分にチャットすることはできません！",
"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json
index 680b10b702..cd7dace96d 100644
--- a/public/language/ja/topic.json
+++ b/public/language/ja/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "スレッドが見つかりません！",
"no_posts_found": "ポストはありません！",
"post_is_deleted": "このポストが削除されます！",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "プロフィール",
"posted_by": "%1 のポスト",
"posted_by_guest": "Posted by Guest",
diff --git a/public/language/ja/user.json b/public/language/ja/user.json
index a480f54f67..55e52d7cb0 100644
--- a/public/language/ja/user.json
+++ b/public/language/ja/user.json
@@ -21,6 +21,7 @@
"watched": "Watched",
"followers": "フォロワー",
"following": "フォロー中",
+ "aboutme": "About me",
"signature": "署名",
"gravatar": "Gravatar",
"birthday": "誕生日",
diff --git a/public/language/ko/error.json b/public/language/ko/error.json
index c9f81d74db..5bfcca4262 100644
--- a/public/language/ko/error.json
+++ b/public/language/ko/error.json
@@ -2,7 +2,7 @@
"invalid-data": "올바르지 않은 정보입니다.",
"not-logged-in": "로그인하지 않았습니다.",
"account-locked": "임시로 잠긴 계정입니다.",
- "search-requires-login": "검색을 위해서는 계정이 필요합니다. 로그인하거나 회원가입 해 주십시오.",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "올바르지 않은 카테고리 ID입니다.",
"invalid-tid": "올바르지 않은 주제 ID입니다.",
"invalid-pid": "올바르지 않은 게시물 ID입니다.",
@@ -68,6 +68,7 @@
"invalid-file": "올바르지 않은 파일입니다.",
"uploads-are-disabled": "업로드는 비활성화되어 있습니다.",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "자신과는 채팅할 수 없습니다.",
"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json
index 56714d7a0a..9e113910a1 100644
--- a/public/language/ko/topic.json
+++ b/public/language/ko/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "주제를 찾을 수 없습니다.",
"no_posts_found": "게시물을 찾을 수 없습니다.",
"post_is_deleted": "이 게시물은 삭제되었습니다.",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "프로필",
"posted_by": "%1님이 작성했습니다.",
"posted_by_guest": "익명 사용자가 작성했습니다.",
diff --git a/public/language/ko/user.json b/public/language/ko/user.json
index 70ce30520a..324eccb26f 100644
--- a/public/language/ko/user.json
+++ b/public/language/ko/user.json
@@ -21,6 +21,7 @@
"watched": "Watched",
"followers": "이 사용자를 팔로우",
"following": "이 사용자가 팔로우",
+ "aboutme": "About me",
"signature": "서명",
"gravatar": "그라바타",
"birthday": "생일",
diff --git a/public/language/lt/error.json b/public/language/lt/error.json
index b87aac771c..49023f88aa 100644
--- a/public/language/lt/error.json
+++ b/public/language/lt/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Klaidingi duomenys",
"not-logged-in": "Atrodo, kad jūs neesate prisijungęs.",
"account-locked": "Jūsų paskyra buvo laikinai užrakinta",
- "search-requires-login": "Norint naudotis paieška, būtina paskyra! Prašome prisijungti arba užsiregistruoti.",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Klaidingas kategorijos ID",
"invalid-tid": "Klaidingas temos ID",
"invalid-pid": "Klaidingas pranešimo ID",
@@ -68,6 +68,7 @@
"invalid-file": "Klaidingas failas",
"uploads-are-disabled": "Įkėlimai neleidžiami",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Jūs negalite susirašinėti su savimi!",
"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
"too-many-messages": "Išsiuntėte per daug pranešimų, kurį laiką prašome palaukti.",
diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json
index e79c869a1b..5969a8727b 100644
--- a/public/language/lt/topic.json
+++ b/public/language/lt/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Temų nerasta!",
"no_posts_found": "Įrašų nerasta!",
"post_is_deleted": "Šis įrašas ištrintas!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profilis",
"posted_by": "Parašė %1",
"posted_by_guest": "Parašė svečias",
diff --git a/public/language/lt/user.json b/public/language/lt/user.json
index 4924eb3b4d..147e525aa5 100644
--- a/public/language/lt/user.json
+++ b/public/language/lt/user.json
@@ -21,6 +21,7 @@
"watched": "Watched",
"followers": "Sekėjai",
"following": "Seka",
+ "aboutme": "About me",
"signature": "Parašas",
"gravatar": "Gravatar",
"birthday": "Gimimo diena",
diff --git a/public/language/ms/error.json b/public/language/ms/error.json
index b0cc688b16..e9eefc19a6 100644
--- a/public/language/ms/error.json
+++ b/public/language/ms/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Data Tak Sah",
"not-logged-in": "Anda tidak log masuk.",
"account-locked": "Akaun anda telah dikunci untuk seketika",
- "search-requires-login": "Pencarian perlukan akaun! Log masuk atau daftar!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Kategori ID Tak Sah",
"invalid-tid": "Topik ID Tak Sah",
"invalid-pid": "Kiriman ID Tak Sah",
@@ -67,7 +67,8 @@
"topic-thumbnails-are-disabled": "Topik kecil dilumpuhkan.",
"invalid-file": "Fail tak sah",
"uploads-are-disabled": "Muatnaik dilumpuhkan",
- "signature-too-long": "Maaf, tandatangan tidak boleh lebih daripada %1 aksara().",
+ "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Anda tidak boleh sembang dengan diri sendiri!",
"chat-restricted": "Pengguna ini menyekat ruangan sembangnya. Dia hendaklah mengikut anda sebelum kalian dapat bersembang",
"too-many-messages": "Anda menghantar terlalu banyak pesanan, sila tunggu seketika.",
diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json
index fc1c334a0d..0b73e10449 100644
--- a/public/language/ms/topic.json
+++ b/public/language/ms/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Tiada topik yang ditemui",
"no_posts_found": "Tiada kirim yang dijumpai",
"post_is_deleted": "Kiriman ini di padam!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profil",
"posted_by": "Dikirim oleh %1",
"posted_by_guest": "Dikirim oleh pelawat",
diff --git a/public/language/ms/user.json b/public/language/ms/user.json
index 87c7c02d94..a9f7b41dd1 100644
--- a/public/language/ms/user.json
+++ b/public/language/ms/user.json
@@ -21,6 +21,7 @@
"watched": "Melihat",
"followers": "Pengikut",
"following": "Mengikuti",
+ "aboutme": "About me",
"signature": "Tandatangan",
"gravatar": "Gravatar",
"birthday": "Tarikh lahir",
diff --git a/public/language/nb/error.json b/public/language/nb/error.json
index a03b17a6b4..fad46d11e6 100644
--- a/public/language/nb/error.json
+++ b/public/language/nb/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Ugyldig data",
"not-logged-in": "Du ser ikke ut til å være logget inn.",
"account-locked": "Kontoen din har blitt midlertidig låst",
- "search-requires-login": "Søking krever en konto! Vennligst registrer deg eller logg inn!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Ugyldig kategori-ID",
"invalid-tid": "Ugyldig emne-ID",
"invalid-pid": "Ugyldig innlegg-ID",
@@ -68,6 +68,7 @@
"invalid-file": "Ugyldig fil",
"uploads-are-disabled": "Opplastninger er deaktivert",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Du kan ikke chatte med deg selv!",
"chat-restricted": "Denne brukeren har begrenset sine chat-meldinger. De må følge deg før du kan chatte med dem",
"too-many-messages": "Du har sendt for mange meldinger, vennligst vent en stund.",
diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json
index 8a599b7942..3863fd48ae 100644
--- a/public/language/nb/topic.json
+++ b/public/language/nb/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Ingen emner funnet!",
"no_posts_found": "Ingen innlegg funnet!",
"post_is_deleted": "Dette innlegget er slettet!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profil",
"posted_by": "Skapt av %1",
"posted_by_guest": "Skapt av Gjest",
diff --git a/public/language/nb/user.json b/public/language/nb/user.json
index edb5f3d27d..be80c50470 100644
--- a/public/language/nb/user.json
+++ b/public/language/nb/user.json
@@ -21,6 +21,7 @@
"watched": "Overvåkede",
"followers": "Følgere",
"following": "Følger",
+ "aboutme": "About me",
"signature": "Signatur",
"gravatar": "Gravatar",
"birthday": "Bursdag",
diff --git a/public/language/nl/error.json b/public/language/nl/error.json
index 8fc4f46971..95f7d04f1d 100644
--- a/public/language/nl/error.json
+++ b/public/language/nl/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Ongeldige Data",
"not-logged-in": "De account lijkt op dit moment niet aangemeld te zijn.",
"account-locked": "De account is tijdelijk vergrendeld",
- "search-requires-login": "Zoekfunctionaliteit gebruiker vereist een account. Registreer daarom snel, of log in op een bestaande gebruikersaccount.",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Ongeldig categoriesleutel",
"invalid-tid": "Ongeldig id voor onderwerp",
"invalid-pid": "Ongeldig berichtkenmerk",
@@ -67,7 +67,8 @@
"topic-thumbnails-are-disabled": "Miniatuurweergaven bij onderwerpen uitgeschakeld. ",
"invalid-file": "Ongeldig bestand",
"uploads-are-disabled": "Uploads zijn uitgeschakeld",
- "signature-too-long": "Helaas, maar de handtekening mag uit niet meer dan %1 teken(s) bestaan.",
+ "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Het is niet mogelijk met jezelf een chatgesprek te houden.",
"chat-restricted": "Deze gebruiker heeft beperkingen aan de chatfunctie opgelegd waardoor deze eerst iemand moet volgen voordat deze persoon een nieuwe chat mag initiëren.",
"too-many-messages": "Er zijn in korte tijd teveel berichten verzonden, een moment geduld.",
diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json
index 4b8c7ca531..38593ecca8 100644
--- a/public/language/nl/topic.json
+++ b/public/language/nl/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Geen onderwerpen gevonden!",
"no_posts_found": "Geen berichten gevonden!",
"post_is_deleted": "Dit bericht is verwijderd!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profiel",
"posted_by": "Geplaatst door %1",
"posted_by_guest": "Geplaatst door gast",
diff --git a/public/language/nl/user.json b/public/language/nl/user.json
index 723bc04f72..4822209b05 100644
--- a/public/language/nl/user.json
+++ b/public/language/nl/user.json
@@ -21,6 +21,7 @@
"watched": "Bekeken",
"followers": "Volgers",
"following": "Volgend",
+ "aboutme": "About me",
"signature": "Handtekening",
"gravatar": "Gravatar",
"birthday": "Verjaardag",
diff --git a/public/language/pl/error.json b/public/language/pl/error.json
index ca267996bc..80678e8121 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": "Wyszukiwanie wymaga konta! Zaloguj się lub zarejestruj!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Błędne ID kategorii.",
"invalid-tid": "Błędne ID tematu",
"invalid-pid": "Błędne ID postu",
@@ -68,6 +68,7 @@
"invalid-file": "Błędny plik",
"uploads-are-disabled": "Uploadowanie jest wyłączone",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Nie możesz rozmawiać ze sobą",
"chat-restricted": "Ten użytkownik ograniczył swoje czaty. Musi Cię śledzić, zanim będziesz mógł z nim czatować.",
"too-many-messages": "Wysłałeś zbyt wiele wiadomości, proszę poczekaj chwilę.",
diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json
index f27171c5fa..496c38ba51 100644
--- a/public/language/pl/topic.json
+++ b/public/language/pl/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Nie znaleziono żadnych wątków.",
"no_posts_found": "Nie znaleziono żadnych postów.",
"post_is_deleted": "Ten post jest usunięty",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profil",
"posted_by": "Napisane przez %1",
"posted_by_guest": "Wysłany przez Gościa",
diff --git a/public/language/pl/user.json b/public/language/pl/user.json
index e8e495ae0c..30593edb85 100644
--- a/public/language/pl/user.json
+++ b/public/language/pl/user.json
@@ -21,6 +21,7 @@
"watched": "Obserwowane",
"followers": "Obserwujących",
"following": "Obserwowanych",
+ "aboutme": "About me",
"signature": "Sygnatura",
"gravatar": "Gravatar",
"birthday": "Urodziny",
diff --git a/public/language/pt_BR/error.json b/public/language/pt_BR/error.json
index a2518e7d1d..f51b91c38c 100644
--- a/public/language/pt_BR/error.json
+++ b/public/language/pt_BR/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Dados Inválidos",
"not-logged-in": "Você não parece estar logado.",
"account-locked": "Sua conta foi temporariamente bloqueada ",
- "search-requires-login": "É necessário ter uma conta para realizar buscas! Efetue o login ou Crie uma nova conta.",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "ID de Categoria Inválido",
"invalid-tid": "ID de Tópico Inválido",
"invalid-pid": "ID de Post Inválido",
@@ -68,6 +68,7 @@
"invalid-file": "Arquivo Inválido",
"uploads-are-disabled": "Uploads estão desativados",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Você não pode iniciar um chat consigo mesmo!",
"chat-restricted": "Este usuário restringiu suas mensagens de chat. Eles devem seguir você antes que você possa conversar com eles",
"too-many-messages": "Você enviou muitas mensagens, por favor aguarde um momento.",
diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json
index 2c15fac095..0887a1402a 100644
--- a/public/language/pt_BR/topic.json
+++ b/public/language/pt_BR/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Nenhum tópico encontrado!",
"no_posts_found": "Nenhum post encontrado!",
"post_is_deleted": "Este post está deletado!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Perfil",
"posted_by": "Postado por %1",
"posted_by_guest": "Postado por Visitante",
diff --git a/public/language/pt_BR/user.json b/public/language/pt_BR/user.json
index 677358d58d..ae241a4edc 100644
--- a/public/language/pt_BR/user.json
+++ b/public/language/pt_BR/user.json
@@ -21,6 +21,7 @@
"watched": "Acompanhado",
"followers": "Seguidores",
"following": "Seguindo",
+ "aboutme": "About me",
"signature": "Assinatura",
"gravatar": "Gravatar",
"birthday": "Aniversário",
diff --git a/public/language/ro/error.json b/public/language/ro/error.json
index 29d8d514b7..c7595f1509 100644
--- a/public/language/ro/error.json
+++ b/public/language/ro/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Date invalide",
"not-logged-in": "Se pare ca nu ești logat.",
"account-locked": "Contul tău a fost blocat temporar",
- "search-requires-login": "Ca să poți cauta ai nevoie de un cont! Te rugăm să te autentifici sau să te înregistrezi!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "ID Categorie Invalid",
"invalid-tid": "ID Subiect Invalid",
"invalid-pid": "ID Mesaj Invalid",
@@ -68,6 +68,7 @@
"invalid-file": "Fișier invalid",
"uploads-are-disabled": "Uploadurile sunt dezactivate",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Nu poți conversa cu tine!",
"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json
index 590dfed6d5..f6a2d86eef 100644
--- a/public/language/ro/topic.json
+++ b/public/language/ro/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Nu a fost găsit nici un subiect!",
"no_posts_found": "Nu a fost găsit nici un mesaj!",
"post_is_deleted": "Acest mesaj a fost șters!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profil",
"posted_by": "Postat de %1",
"posted_by_guest": "Postat de Vizitator",
diff --git a/public/language/ro/user.json b/public/language/ro/user.json
index c9c3554b44..90724690b1 100644
--- a/public/language/ro/user.json
+++ b/public/language/ro/user.json
@@ -21,6 +21,7 @@
"watched": "Watched",
"followers": "Urmărit de",
"following": "Îi urmărește pe",
+ "aboutme": "About me",
"signature": "Semnătură",
"gravatar": "Gravatar",
"birthday": "Zi de naștere",
diff --git a/public/language/ru/error.json b/public/language/ru/error.json
index 6e038fcdc8..b4668f3588 100644
--- a/public/language/ru/error.json
+++ b/public/language/ru/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Неверные данные",
"not-logged-in": "Вы не вошли в свой аккаунт.",
"account-locked": "Ваш аккаунт временно заблокирован",
- "search-requires-login": "Поиск доступен зарегистрированным пользователям! Пожалуйста, войдите или зарегистрируйтесь!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Неверный ID категории",
"invalid-tid": "Неверный ID темы",
"invalid-pid": "Неверный ID поста",
@@ -67,7 +67,8 @@
"topic-thumbnails-are-disabled": "Иконки для темы запрещены",
"invalid-file": "Неверный файл",
"uploads-are-disabled": "Загрузка запрещена",
- "signature-too-long": "Максимальная длина подписи: %1 симв.",
+ "signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Вы не можете общаться с самим собой",
"chat-restricted": "Пользователь ограничил прием сообщений. Он должен быть подписан на Вас, чтобы Вы могли вести переписку с ним.",
"too-many-messages": "Вы отправили слишком много сообщений, подождите немного.",
diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json
index 635e31a765..1a449965b2 100644
--- a/public/language/ru/topic.json
+++ b/public/language/ru/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Тем не найдено!",
"no_posts_found": "Посты не найдены!",
"post_is_deleted": "Этот пост удален!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Профиль",
"posted_by": "Создано %1",
"posted_by_guest": "Опубликовано гостем",
diff --git a/public/language/ru/user.json b/public/language/ru/user.json
index 800be7cf79..be8dea688f 100644
--- a/public/language/ru/user.json
+++ b/public/language/ru/user.json
@@ -21,6 +21,7 @@
"watched": "Просмотров",
"followers": "Читателей",
"following": "Читаемых",
+ "aboutme": "About me",
"signature": "Подпись",
"gravatar": "Gravatar",
"birthday": "День рождения",
diff --git a/public/language/sc/error.json b/public/language/sc/error.json
index 71c02b3dc5..ac2457e250 100644
--- a/public/language/sc/error.json
+++ b/public/language/sc/error.json
@@ -68,6 +68,7 @@
"invalid-file": "Invalid File",
"uploads-are-disabled": "Uploads are disabled",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "You can't chat with yourself!",
"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json
index c0ce4121ff..206ecf6465 100644
--- a/public/language/sc/topic.json
+++ b/public/language/sc/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Peruna arresonada agatada!",
"no_posts_found": "Perunu arresonu agatadu!",
"post_is_deleted": "This post is deleted!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Perfilu",
"posted_by": "Posted by %1",
"posted_by_guest": "Posted by Guest",
diff --git a/public/language/sc/user.json b/public/language/sc/user.json
index 8f73839294..70097b829d 100644
--- a/public/language/sc/user.json
+++ b/public/language/sc/user.json
@@ -21,6 +21,7 @@
"watched": "Watched",
"followers": "Sighidores",
"following": "Sighende",
+ "aboutme": "About me",
"signature": "Firma",
"gravatar": "Gravatas",
"birthday": "Cumpleannu",
diff --git a/public/language/sk/error.json b/public/language/sk/error.json
index 079f0712d0..b86131117b 100644
--- a/public/language/sk/error.json
+++ b/public/language/sk/error.json
@@ -68,6 +68,7 @@
"invalid-file": "Neplatný súbor",
"uploads-are-disabled": "Nahrávanie je znefunkčnené",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Nemôžete chatovat so samým sebou.",
"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json
index 007cf0f22a..108ab80c20 100644
--- a/public/language/sk/topic.json
+++ b/public/language/sk/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Neboli nájdené žiadne témy!",
"no_posts_found": "Neboli nájdené žiadne príspevky",
"post_is_deleted": "Tento príspevok bol vymazaný!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profil",
"posted_by": "Publikované %1",
"posted_by_guest": "Publikované %1 od hosťa",
diff --git a/public/language/sk/user.json b/public/language/sk/user.json
index da71890f8c..957dde36e1 100644
--- a/public/language/sk/user.json
+++ b/public/language/sk/user.json
@@ -21,6 +21,7 @@
"watched": "Watched",
"followers": "Nasledujú ho",
"following": "Nasleduje",
+ "aboutme": "About me",
"signature": "Podpis",
"gravatar": "Gravatar",
"birthday": "Dátum narodenia",
diff --git a/public/language/sv/error.json b/public/language/sv/error.json
index bfd4e763eb..ca8dd6f96e 100644
--- a/public/language/sv/error.json
+++ b/public/language/sv/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Ogiltig data",
"not-logged-in": "Du verkar inte vara inloggad.",
"account-locked": "Ditt konto har tillfälligt blivit låst",
- "search-requires-login": "Sökningar kräver att du har ett konto. Logga in eller registrera dig. ",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Ogiltigt id för kategori",
"invalid-tid": "Ogiltigt id för ämne",
"invalid-pid": "Ogiltigt id för inlägg",
@@ -68,6 +68,7 @@
"invalid-file": "Ogiltig fil",
"uploads-are-disabled": "Uppladdningar är inaktiverat",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Du kan inte chatta med dig själv.",
"chat-restricted": "Denna användaren har begränsat sina chatt-meddelanden. Användaren måste följa dig innan ni kan chatta med varann",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json
index 40b81f0ec4..b581cea269 100644
--- a/public/language/sv/topic.json
+++ b/public/language/sv/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Inga ämnen hittades!",
"no_posts_found": "Inga inlägg hittades!",
"post_is_deleted": "Det här inlägget är raderat.",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profil",
"posted_by": "Skapat av %1",
"posted_by_guest": "Inlägg av anonym",
diff --git a/public/language/sv/user.json b/public/language/sv/user.json
index 2702388846..dd8f04d712 100644
--- a/public/language/sv/user.json
+++ b/public/language/sv/user.json
@@ -21,6 +21,7 @@
"watched": "Watched",
"followers": "Följare",
"following": "Följer",
+ "aboutme": "About me",
"signature": "Signatur",
"gravatar": "Gravatar",
"birthday": "Födelsedag",
diff --git a/public/language/th/error.json b/public/language/th/error.json
index 1c33a57db0..a962e365f4 100644
--- a/public/language/th/error.json
+++ b/public/language/th/error.json
@@ -2,7 +2,7 @@
"invalid-data": "ข้อมูลไม่ถูกต้อง",
"not-logged-in": "คุณยังไม่ได้ลงชื่อเข้าระบบ",
"account-locked": "บัญชีของคุณถูกระงับการใช้งานชั่วคราว",
- "search-requires-login": "ต้องลงทะเบียนบัญชีผู้ใช้สำหรับการค้นหา! โปรดลงชื่อเข้าระบบ หรือ ลงทะเบียน!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Category ID ไม่ถูกต้อง",
"invalid-tid": "Topic ID ไม่ถูกต้อง",
"invalid-pid": "Post ID ไม่ถูกต้อง",
@@ -68,6 +68,7 @@
"invalid-file": "Invalid File",
"uploads-are-disabled": "Uploads are disabled",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "You can't chat with yourself!",
"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/th/topic.json b/public/language/th/topic.json
index ea6a1a8998..15d1718498 100644
--- a/public/language/th/topic.json
+++ b/public/language/th/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "ไม่พบกระทู้",
"no_posts_found": "ไม่พบโพส",
"post_is_deleted": "ลบ Post นี้เรียบร้อยแล้ว!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "รายละเอียด",
"posted_by": "โพสโดย %1",
"posted_by_guest": "โพสโดย Guest",
diff --git a/public/language/th/user.json b/public/language/th/user.json
index f53b390dd7..15cd6fb01b 100644
--- a/public/language/th/user.json
+++ b/public/language/th/user.json
@@ -21,6 +21,7 @@
"watched": "ดูแล้ว",
"followers": "คนติดตาม",
"following": "ติดตาม",
+ "aboutme": "About me",
"signature": "ลายเซ็น",
"gravatar": "Gravatar",
"birthday": "วันเกิด",
diff --git a/public/language/tr/error.json b/public/language/tr/error.json
index 49e7247239..b34823ccfd 100644
--- a/public/language/tr/error.json
+++ b/public/language/tr/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Geçersiz Veri",
"not-logged-in": "Giriş yapmamış görünüyorsunuz.",
"account-locked": "Hesabınız geçici olarak kitlendi",
- "search-requires-login": "Arama hesap gerektiriyor. Lütfen giriş yapın ya da kaydolun.",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Geçersiz Kategori ID",
"invalid-tid": "Geçersiz Başlık ID",
"invalid-pid": "Geçersiz İleti ID",
@@ -68,6 +68,7 @@
"invalid-file": "Geçersiz Dosya",
"uploads-are-disabled": "Yüklemeler kapalı",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Kendinizle sohbet edemezsiniz!",
"chat-restricted": "Bu kullanıcı sohbet ayarlarını kısıtlamış. Bu kişiye mesaj gönderebilmeniz için sizi takip etmeleri gerekiyor",
"too-many-messages": "Ardı ardına çok fazla mesaj yolladınız, lütfen biraz bekleyiniz.",
diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json
index ef6276ca31..9700a29663 100644
--- a/public/language/tr/topic.json
+++ b/public/language/tr/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Hiç konu bulunamadı!",
"no_posts_found": "Hiç bir ileti bulunamadı!",
"post_is_deleted": "Bu ileti silinmiş!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Profil",
"posted_by": "%1 tarafından gönderildi",
"posted_by_guest": "Ziyaretçi tarafından yayımlandı",
diff --git a/public/language/tr/user.json b/public/language/tr/user.json
index 285cb3ebc5..b5edba6bbd 100644
--- a/public/language/tr/user.json
+++ b/public/language/tr/user.json
@@ -21,6 +21,7 @@
"watched": "İzlendi",
"followers": "Takipçiler",
"following": "Takip Ediyor",
+ "aboutme": "About me",
"signature": "İmza",
"gravatar": "Avatar",
"birthday": "Doğum Tarihi",
diff --git a/public/language/vi/error.json b/public/language/vi/error.json
index 3aecae1d63..33da9ba7ce 100644
--- a/public/language/vi/error.json
+++ b/public/language/vi/error.json
@@ -2,7 +2,7 @@
"invalid-data": "Dữ liệu không hợp lệ",
"not-logged-in": "Bạn chưa đăng nhập",
"account-locked": "Tài khoản của bạn đang tạm thời bị khóa",
- "search-requires-login": "Bạn cần đăng nhập để thực hiện việc tìm kiếm! Xin hãy đăng nhập hoặc đăng ký!",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "Danh mục ID không hợp lệ",
"invalid-tid": "ID chủ đề không hợp lệ",
"invalid-pid": "ID bài viết không hợp lệ",
@@ -68,6 +68,7 @@
"invalid-file": "File không hợp lệ",
"uploads-are-disabled": "Đã khóa lựa chọn tải lên",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "Bạn không thể chat với chính bạn!",
"chat-restricted": "Người dùng này đã bật chế độ hạn chế tin nhắn chat. Bạn phải được anh/cô ta follow thì mới có thể gởi tin nhắn đến họ được.",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json
index 9d0ca5e82d..f2c2193892 100644
--- a/public/language/vi/topic.json
+++ b/public/language/vi/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "Không tìm thấy chủ đề nào!",
"no_posts_found": "Không tìm thấy bài gửi nào",
"post_is_deleted": "Bài gửi này đã bị xóa!",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "Hồ sơ",
"posted_by": "Được viết bởi %1",
"posted_by_guest": "Đăng bởi khách",
diff --git a/public/language/vi/user.json b/public/language/vi/user.json
index d567c55285..5d60c007a1 100644
--- a/public/language/vi/user.json
+++ b/public/language/vi/user.json
@@ -21,6 +21,7 @@
"watched": "Đã theo dõi",
"followers": "Số người theo dõi",
"following": "Đang theo dõi",
+ "aboutme": "About me",
"signature": "Chữ ký",
"gravatar": "Gavatar",
"birthday": "Ngày sinh ",
diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json
index 934a7e3991..f461c9fa36 100644
--- a/public/language/zh_CN/error.json
+++ b/public/language/zh_CN/error.json
@@ -2,7 +2,7 @@
"invalid-data": "无效数据",
"not-logged-in": "您还没有登陆。",
"account-locked": "您的帐号已被临时锁定",
- "search-requires-login": "搜索功能仅限会员使用！请先登录或者注册！",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "无效版块 ID",
"invalid-tid": "无效主题 ID",
"invalid-pid": "无效帖子 ID",
@@ -68,6 +68,7 @@
"invalid-file": "无效文件",
"uploads-are-disabled": "上传已禁用",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "您不能和自己聊天！",
"chat-restricted": "此用户限制了他的聊天消息。必须他先关注您，您才能和他聊天。",
"too-many-messages": "您发送了太多消息，请稍等片刻。",
diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json
index 9b113c0c90..0bbbc10a7b 100644
--- a/public/language/zh_CN/topic.json
+++ b/public/language/zh_CN/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "没有找到主题！",
"no_posts_found": "没有找到帖子！",
"post_is_deleted": "此帖已被删除！",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "资料",
"posted_by": "%1 发布",
"posted_by_guest": "游客发布",
diff --git a/public/language/zh_CN/user.json b/public/language/zh_CN/user.json
index 583c03fd09..16fa062ce3 100644
--- a/public/language/zh_CN/user.json
+++ b/public/language/zh_CN/user.json
@@ -21,6 +21,7 @@
"watched": "已订阅",
"followers": "粉丝",
"following": "关注",
+ "aboutme": "About me",
"signature": "签名档",
"gravatar": "头像",
"birthday": "生日",
diff --git a/public/language/zh_TW/error.json b/public/language/zh_TW/error.json
index 5c3e212270..d2f4f0806a 100644
--- a/public/language/zh_TW/error.json
+++ b/public/language/zh_TW/error.json
@@ -2,7 +2,7 @@
"invalid-data": "無效的資料",
"not-logged-in": "您似乎還沒有登入喔！",
"account-locked": "您的帳戶暫時被鎖定！",
- "search-requires-login": "你需要一個帳戶才能搜索！請登錄或註冊！",
+ "search-requires-login": "Searching requires an account - please login or register.",
"invalid-cid": "無效的類別 ID",
"invalid-tid": "無效的主題 ID",
"invalid-pid": "無效的文章 ID",
@@ -68,6 +68,7 @@
"invalid-file": "無效的檔案",
"uploads-are-disabled": "上傳功能被停用",
"signature-too-long": "Sorry, your signature cannot be longer than %1 character(s).",
+ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).",
"cant-chat-with-yourself": "你不能與自己聊天！",
"chat-restricted": "此用戶已限制了他的聊天功能。你要在他關注你之後，才能跟他聊天",
"too-many-messages": "You have sent too many messages, please wait awhile.",
diff --git a/public/language/zh_TW/topic.json b/public/language/zh_TW/topic.json
index a65ccc6833..71c592aea9 100644
--- a/public/language/zh_TW/topic.json
+++ b/public/language/zh_TW/topic.json
@@ -5,6 +5,7 @@
"no_topics_found": "沒有找到主題！",
"no_posts_found": "找不到文章!",
"post_is_deleted": "文章已被刪除！",
+ "topic_is_deleted": "This topic is deleted!",
"profile": "資料",
"posted_by": "由 %1 張貼",
"posted_by_guest": "由訪客張貼",
diff --git a/public/language/zh_TW/user.json b/public/language/zh_TW/user.json
index 55163c4259..7296da0c9f 100644
--- a/public/language/zh_TW/user.json
+++ b/public/language/zh_TW/user.json
@@ -21,6 +21,7 @@
"watched": "觀看者",
"followers": "跟隨者",
"following": "正在關注",
+ "aboutme": "About me",
"signature": "簽名",
"gravatar": "Gravatar頭像",
"birthday": "生日",
From 671db1681ecf477e5768b3d338f704df8e64c77b Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 20 May 2015 09:57:04 -0400
Subject: [PATCH 7/8] allowing usage of "false" in silent and daemon
environment variables
---
loader.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/loader.js b/loader.js
index 5baf636dbf..c79756f09e 100644
--- a/loader.js
+++ b/loader.js
@@ -17,7 +17,7 @@ nconf.argv().env().file({
var pidFilePath = __dirname + '/pidfile',
output = logrotate({ file: __dirname + '/logs/output.log', size: '1m', keep: 3, compress: true }),
- silent = nconf.get('silent') !== false,
+ silent = nconf.get('silent') === 'false' ? false : nconf.get('silent') !== false,
numProcs,
workers = [],
@@ -248,7 +248,7 @@ Loader.notifyWorkers = function(msg, worker_pid) {
fs.open(path.join(__dirname, 'config.json'), 'r', function(err) {
if (!err) {
- if (nconf.get('daemon') !== false) {
+ if (nconf.get('daemon') !== 'false' && nconf.get('daemon') !== false) {
if (fs.existsSync(pidFilePath)) {
try {
var pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
From 972ae42d913dcc0687c327a2142c18ee067e085a Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 20 May 2015 11:44:10 -0400
Subject: [PATCH 8/8] pruned upgrade scripts in preparation for 0.7.0, ping
@barisusakli
---
src/upgrade.js | 753 +------------------------------------------------
1 file changed, 1 insertion(+), 752 deletions(-)
diff --git a/src/upgrade.js b/src/upgrade.js
index 47fd8badc0..d41c963a73 100644
--- a/src/upgrade.js
+++ b/src/upgrade.js
@@ -17,7 +17,7 @@ var db = require('./database'),
Upgrade = {},
- minSchemaDate = Date.UTC(2014, 9, 22), // This value gets updated every new MINOR version
+ minSchemaDate = Date.UTC(2015, 1, 8), // This value gets updated every new MINOR version
schemaDate, thisSchemaDate,
// IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema
@@ -72,757 +72,6 @@ Upgrade.upgrade = function(callback) {
}
});
},
- function(next) {
- thisSchemaDate = Date.UTC(2014, 9, 31);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2014/10/31] Applying newbiePostDelay values');
-
- async.series([
- async.apply(Meta.configs.setOnEmpty, 'newbiePostDelay', '120'),
- async.apply(Meta.configs.setOnEmpty, 'newbiePostDelayThreshold', '3')
- ], function(err) {
- if (err) {
- winston.error('[2014/10/31] Error encountered while Applying newbiePostDelay values');
- return next(err);
- }
- winston.info('[2014/10/31] Applying newbiePostDelay values done');
- Upgrade.update(thisSchemaDate, next);
- });
- } else {
- winston.info('[2014/10/31] Applying newbiePostDelay values skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2014, 10, 6, 18, 30);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2014/11/6] Updating topic authorship sorted set');
-
- async.waterfall([
- async.apply(db.getObjectField, 'global', 'nextTid'),
- function(nextTid, next) {
- var tids = [];
- for(var x=1,numTids=nextTid-1;x<numTids;x++) {
- tids.push(x);
- }
- async.filter(tids, function(tid, next) {
- db.exists('topic:' + tid, function(err, exists) {
- next(exists);
- });
- }, function(tids) {
- next(null, tids);
- });
- },
- function(tids, next) {
- async.eachLimit(tids, 100, function(tid, next) {
- Topics.getTopicFields(tid, ['uid', 'cid', 'tid', 'timestamp'], function(err, data) {
- if (!err && (data.cid && data.uid && data.timestamp && data.tid)) {
- db.sortedSetAdd('cid:' + data.cid + ':uid:' + data.uid + ':tid', data.timestamp, data.tid, next);
- } else {
- // Post was probably purged, skip record
- next();
- }
- });
- }, next);
- }
- ], function(err) {
- if (err) {
- winston.error('[2014/11/6] Error encountered while Updating topic authorship sorted set');
- return next(err);
- }
- winston.info('[2014/11/6] Updating topic authorship sorted set done');
- Upgrade.update(thisSchemaDate, next);
- });
- } else {
- winston.info('[2014/11/6] Updating topic authorship sorted set skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2014, 10, 7);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2014/11/7] Renaming sorted set names');
-
- async.waterfall([
- function(next) {
- async.parallel({
- cids: function(next) {
- db.getSortedSetRange('categories:cid', 0, -1, next);
- },
- uids: function(next) {
- db.getSortedSetRange('users:joindate', 0, -1, next);
- }
- }, next);
- },
- function(results, next) {
- async.eachLimit(results.cids, 50, function(cid, next) {
- async.parallel([
- function(next) {
- db.exists('categories:' + cid + ':tid', function(err, exists) {
- if (err || !exists) {
- return next(err);
- }
- db.rename('categories:' + cid + ':tid', 'cid:' + cid + ':tids', next);
- });
- },
- function(next) {
- db.exists('categories:recent_posts:cid:' + cid, function(err, exists) {
- if (err || !exists) {
- return next(err);
- }
- db.rename('categories:recent_posts:cid:' + cid, 'cid:' + cid + ':pids', next);
- });
- },
- function(next) {
- async.eachLimit(results.uids, 50, function(uid, next) {
- db.exists('cid:' + cid + ':uid:' + uid + ':tid', function(err, exists) {
- if (err || !exists) {
- return next(err);
- }
- db.rename('cid:' + cid + ':uid:' + uid + ':tid', 'cid:' + cid + ':uid:' + uid + ':tids', next);
- });
- }, next);
- }
- ], next);
- }, next);
- }
- ], function(err) {
- if (err) {
- winston.error('[2014/11/7] Error encountered while renaming sorted sets');
- return next(err);
- }
- winston.info('[2014/11/7] Renaming sorted sets done');
- Upgrade.update(thisSchemaDate, next);
- });
- } else {
- winston.info('[2014/11/7] Renaming sorted sets skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2014, 10, 11);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2014/11/11] Upgrading permissions');
-
- async.waterfall([
- function(next) {
- db.getSortedSetRange('categories:cid', 0, -1, next);
- },
- function(cids, next) {
- function categoryHasPrivilegesSet(cid, privilege, next) {
- async.parallel({
- userPrivExists: function(next) {
- Groups.getMemberCount('cid:' + cid + ':privileges:' + privilege, next);
- },
- groupPrivExists: function(next) {
- Groups.getMemberCount('cid:' + cid + ':privileges:groups:' + privilege, next);
- }
- }, function(err, results) {
- if (err) {
- return next(err);
- }
- next(null, results.userPrivExists || results.groupPrivExists);
- });
- }
-
- function upgradePrivileges(cid, groups, next) {
- var privs = ['find', 'read', 'topics:reply', 'topics:create'];
-
- async.each(privs, function(priv, next) {
- categoryHasPrivilegesSet(cid, priv, function(err, privilegesSet) {
- if (err || privilegesSet) {
- return next(err);
- }
-
- async.eachLimit(groups, 50, function(group, next) {
- if (group) {
- if (group === 'guests' && (priv === 'topics:reply' || priv === 'topics:create')) {
- return next();
- }
- Groups.join('cid:' + cid + ':privileges:groups:' + priv, group, next);
- } else {
- next();
- }
- }, next);
- });
- }, next);
- }
-
- async.waterfall([
- async.apply(db.getSetMembers, 'groups'),
- function(groups, next) {
- async.filter(groups, function(group, next) {
- db.getObjectField('group:' + group, 'hidden', function(err, hidden) {
- next(!parseInt(hidden, 10));
- }, next);
- }, function(groups) {
- next(null, groups);
- });
- }
- ], function(err, groups) {
- if (err) {
- return next(err);
- }
-
- groups.push('administrators', 'registered-users');
-
- async.eachLimit(cids, 50, function(cid, next) {
- upgradePrivileges(cid, groups, next);
- }, next);
- });
- }
- ], function(err) {
- if (err) {
- winston.error('[2014/11/11] Error encountered while upgrading permissions');
- return next(err);
- }
- winston.info('[2014/11/11] Upgrading permissions done');
- Upgrade.update(thisSchemaDate, next);
- });
- } else {
- winston.info('[2014/11/11] Upgrading permissions skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2014, 10, 17, 13);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2014/11/17] Updating user email digest settings');
-
- async.waterfall([
- async.apply(db.getSortedSetRange, 'users:joindate', 0, -1),
- function(uids, next) {
- async.filter(uids, function(uid, next) {
- db.getObjectField('user:' + uid + ':settings', 'dailyDigestFreq', function(err, freq) {
- next(freq === 'daily');
- });
- }, function(uids) {
- next(null, uids);
- });
- },
- function(uids, next) {
- async.each(uids, function(uid, next) {
- db.setObjectField('user:' + uid + ':settings', 'dailyDigestFreq', 'day', next);
- }, next);
- }
- ], function(err) {
- if (err) {
- winston.error('[2014/11/17] Error encountered while updating user email digest settings');
- return next(err);
- }
- winston.info('[2014/11/17] Updating user email digest settings done');
- Upgrade.update(thisSchemaDate, next);
- });
- } else {
- winston.info('[2014/11/17] Updating user email digest settings skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2014, 10, 29, 22);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2014/11/29] Updating config.json to new format');
- var configPath = path.join(__dirname, '../config.json');
-
- async.waterfall([
- async.apply(fs.readFile, configPath, { encoding: 'utf-8' }),
- function(config, next) {
- try {
- config = JSON.parse(config);
-
- // If the config contains "url", it has already been updated, abort.
- if (config.hasOwnProperty('url')) {
- return next();
- }
-
- config.url = config.base_url + (config.use_port ? ':' + config.port : '') + config.relative_path;
- if (config.port == '4567') {
- delete config.port;
- }
- if (config.bcrypt_rounds == 12) {
- delete config.bcrypt_rounds;
- }
- if (config.upload_path === '/public/uploads') {
- delete config.upload_path;
- }
- if (config.bind_address === '0.0.0.0') {
- delete config.bind_address;
- }
- delete config.base_url;
- delete config.use_port;
- delete config.relative_path;
-
- fs.writeFile(configPath, JSON.stringify(config, null, 4), next);
- } catch (err) {
- return next(err);
- }
- }
- ], function(err) {
- if (err) {
- winston.error('[2014/11/29] Error encountered while updating config.json to new format');
- return next(err);
- }
- winston.info('[2014/11/29] Updating config.json to new format done');
- Upgrade.update(thisSchemaDate, next);
- });
- } else {
- winston.info('[2014/11/29] Updating config.json to new format skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2014, 11, 2);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2014/12/2] Removing register user fields');
-
- db.getSortedSetRange('users:joindate', 0, -1, function(err, uids) {
- if (err) {
- return next(err);
- }
- var fieldsToDelete = [
- 'password-confirm',
- 'recaptcha_challenge_field',
- '_csrf',
- 'recaptcha_response_field',
- 'referrer'
- ];
-
- async.eachLimit(uids, 50, function(uid, next) {
- async.each(fieldsToDelete, function(field, next) {
- db.deleteObjectField('user:' + uid, field, next);
- }, next);
- }, function(err) {
- if (err) {
- winston.error('[2014/12/2] Error encountered while deleting user fields');
- return next(err);
- }
- winston.info('[2014/12/2] Removing register user fields done');
- Upgrade.update(thisSchemaDate, next);
- });
- });
- } else {
- winston.info('[2014/12/2] Removing register user fields skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2014, 11, 12);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2014/12/12] Updating teasers');
-
- db.getSortedSetRange('topics:tid', 0, -1, function(err, tids) {
- if (err) {
- return next(err);
- }
-
- async.eachLimit(tids, 50, function(tid, next) {
- Topics.updateTeaser(tid, next);
- }, function(err) {
- if (err) {
- winston.error('[2014/12/12] Error encountered while updating teasers');
- return next(err);
- }
- winston.info('[2014/12/12] Updating teasers done');
- Upgrade.update(thisSchemaDate, next);
- });
- });
- } else {
- winston.info('[2014/12/12] Updating teasers skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2014, 11, 20);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2014/12/20] Updating digest settings');
-
- async.waterfall([
- async.apply(db.getSortedSetRange, 'users:joindate', 0, -1),
- async.apply(User.getMultipleUserSettings)
- ], function(err, userSettings) {
- if (err) {
- winston.error('[2014/12/20] Error encountered while updating digest settings');
- return next(err);
- }
-
- var now = Date.now();
-
- async.eachLimit(userSettings, 50, function(setting, next) {
- if (setting.dailyDigestFreq !== 'off') {
- db.sortedSetAdd('digest:' + setting.dailyDigestFreq + ':uids', now, setting.uid, next);
- } else {
- setImmediate(next);
- }
- }, function(err) {
- if (err) {
- winston.error('[2014/12/20] Error encountered while updating digest settings');
- return next(err);
- }
- winston.info('[2014/12/20] Updating digest settings done');
- Upgrade.update(thisSchemaDate, next);
- });
- });
- } else {
- winston.info('[2014/12/20] Updating digest settings skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2015, 0, 8);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2015/01/08] Updating category topics sorted sets');
-
- db.getSortedSetRange('topics:tid', 0, -1, function(err, tids) {
- if (err) {
- winston.error('[2015/01/08] Error encountered while Updating category topics sorted sets');
- return next(err);
- }
-
- var now = Date.now();
-
- async.eachLimit(tids, 50, function(tid, next) {
- db.getObjectFields('topic:' + tid, ['cid', 'postcount'], function(err, topicData) {
- if (err) {
- return next(err);
- }
-
- if (Utils.isNumber(topicData.postcount) && topicData.cid) {
- db.sortedSetAdd('cid:' + topicData.cid + ':tids:posts', topicData.postcount, tid, next);
- } else {
- next();
- }
- });
- }, function(err) {
- if (err) {
- winston.error('[2015/01/08] Error encountered while Updating category topics sorted sets');
- return next(err);
- }
- winston.info('[2015/01/08] Updating category topics sorted sets done');
- Upgrade.update(thisSchemaDate, next);
- });
- });
- } else {
- winston.info('[2015/01/08] Updating category topics sorted sets skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2015, 0, 9);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2015/01/09] Creating fullname:uid hash');
-
- db.getSortedSetRange('users:joindate', 0, -1, function(err, uids) {
- if (err) {
- winston.error('[2014/01/09] Error encountered while Creating fullname:uid hash');
- return next(err);
- }
-
- var now = Date.now();
-
- async.eachLimit(uids, 50, function(uid, next) {
- db.getObjectFields('user:' + uid, ['fullname'], function(err, userData) {
- if (err || !userData || !userData.fullname) {
- return next(err);
- }
-
- db.setObjectField('fullname:uid', userData.fullname, uid, next);
- });
- }, function(err) {
- if (err) {
- winston.error('[2015/01/09] Error encountered while Creating fullname:uid hash');
- return next(err);
- }
- winston.info('[2015/01/09] Creating fullname:uid hash done');
- Upgrade.update(thisSchemaDate, next);
- });
- });
- } else {
- winston.info('[2015/01/09] Creating fullname:uid hash skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2015, 0, 13);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2015/01/13] Creating uid:followed_tids sorted set');
-
- db.getSortedSetRange('topics:tid', 0, -1, function(err, tids) {
- if (err) {
- winston.error('[2014/01/13] Error encountered while Creating uid:followed_tids sorted set');
- return next(err);
- }
-
- var now = Date.now();
-
- async.eachLimit(tids, 50, function(tid, next) {
- db.getSetMembers('tid:' + tid + ':followers', function(err, uids) {
- if (err) {
- return next(err);
- }
-
- async.eachLimit(uids, 50, function(uid, next) {
- if (parseInt(uid, 10)) {
- db.sortedSetAdd('uid:' + uid + ':followed_tids', now, tid, next);
- } else {
- next();
- }
- }, next);
- });
- }, function(err) {
- if (err) {
- winston.error('[2015/01/13] Error encountered while Creating uid:followed_tids sorted set');
- return next(err);
- }
- winston.info('[2015/01/13] Creating uid:followed_tids sorted set done');
- Upgrade.update(thisSchemaDate, next);
- });
- });
- } else {
- winston.info('[2015/01/13] Creating uid:followed_tids sorted set skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2015, 0, 14);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2015/01/14] Upgrading follow sets to sorted sets');
-
- db.getSortedSetRange('users:joindate', 0, -1, function(err, uids) {
- if (err) {
- winston.error('[2014/01/14] Error encountered while Upgrading follow sets to sorted sets');
- return next(err);
- }
-
- var now = Date.now();
-
- async.eachLimit(uids, 50, function(uid, next) {
- async.parallel({
- following: function(next) {
- db.getSetMembers('following:' + uid, next);
- },
- followers: function(next) {
- db.getSetMembers('followers:' + uid, next);
- }
- }, function(err, results) {
- function updateToSortedSet(set, uids, callback) {
- async.eachLimit(uids, 50, function(uid, next) {
- if (parseInt(uid, 10)) {
- db.sortedSetAdd(set, now, uid, next);
- } else {
- next();
- }
- }, callback);
- }
- if (err) {
- return next(err);
- }
-
- async.parallel([
- async.apply(db.delete, 'following:' + uid),
- async.apply(db.delete, 'followers:' + uid)
- ], function(err) {
- if (err) {
- return next(err);
- }
- async.parallel([
- async.apply(updateToSortedSet, 'following:' + uid, results.following),
- async.apply(updateToSortedSet, 'followers:' + uid, results.followers),
- async.apply(db.setObjectField, 'user:' + uid, 'followingCount', results.following.length),
- async.apply(db.setObjectField, 'user:' + uid, 'followerCount', results.followers.length),
- ], next);
- });
- });
- }, function(err) {
- if (err) {
- winston.error('[2015/01/14] Error encountered while Upgrading follow sets to sorted sets');
- return next(err);
- }
- winston.info('[2015/01/14] Upgrading follow sets to sorted sets done');
- Upgrade.update(thisSchemaDate, next);
- });
- });
- } else {
- winston.info('[2015/01/14] Upgrading follow sets to sorted sets skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2015, 0, 15);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2015/01/15] Creating topiccount for users');
-
- db.getSortedSetRange('users:joindate', 0, -1, function(err, uids) {
- if (err) {
- winston.error('[2015/01/15] Error encountered while Creating topiccount for users');
- return next(err);
- }
-
- async.eachLimit(uids, 50, function(uid, next) {
- db.sortedSetCard('uid:' + uid + ':topics', function(err, count) {
- if (err) {
- return next(err);
- }
-
- if (parseInt(count, 10)) {
- db.setObjectField('user:' + uid, 'topiccount', count, next);
- } else {
- next();
- }
- });
- }, function(err) {
- if (err) {
- winston.error('[2015/01/15] Error encountered while Creating topiccount for users');
- return next(err);
- }
- winston.info('[2015/01/15] Creating topiccount for users done');
- Upgrade.update(thisSchemaDate, next);
- });
- });
- } else {
- winston.info('[2015/01/15] Creating topiccount for users skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2015, 0, 19);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2015/01/19] Generating group slugs');
-
- async.waterfall([
- async.apply(db.getSetMembers, 'groups'),
- function(groups, next) {
- async.filter(groups, function(groupName, next) {
- db.getObjectField('group:' + groupName, 'hidden', function(err, hidden) {
- next((err || parseInt(hidden, 10)) ? false : true);
- });
- }, function(groups) {
- next(null, groups);
- });
- }
- ], function(err, groups) {
- var tasks = [];
- groups.forEach(function(groupName) {
- tasks.push(async.apply(db.setObjectField, 'group:' + groupName, 'slug', Utils.slugify(groupName)));
- tasks.push(async.apply(db.setObjectField, 'groupslug:groupname', Utils.slugify(groupName), groupName));
- });
-
- // Administrator group
- tasks.push(async.apply(db.setObjectField, 'group:administrators', 'slug', 'administrators'));
- tasks.push(async.apply(db.setObjectField, 'groupslug:groupname', 'administrators', 'administrators'));
-
- async.parallel(tasks, function(err) {
- if (err) {
- winston.error('[2015/01/19] Error encountered while Generating group slugs');
- return next(err);
- }
-
- winston.info('[2015/01/19] Generating group slugs done');
- Upgrade.update(thisSchemaDate, next);
- });
- });
- } else {
- winston.info('[2015/01/19] Generating group slugs skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2015, 0, 21);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2015/01/21] Upgrading groups to sorted set');
-
- db.getSetMembers('groups', function(err, groupNames) {
- if (err) {
- return next(err);
- }
-
- var now = Date.now();
- async.each(groupNames, function(groupName, next) {
- db.getSetMembers('group:' + groupName + ':members', function(err, members) {
- if (err) {
- return next(err);
- }
-
- async.series([
- function(next) {
- if (members && members.length) {
- db.delete('group:' + groupName + ':members', function(err) {
- if (err) {
- return next(err);
- }
- var scores = members.map(function() {
- return now;
- });
- db.sortedSetAdd('group:' + groupName + ':members', scores, members, next);
- });
- } else {
- next();
- }
- },
- async.apply(db.sortedSetAdd, 'groups:createtime', now, groupName),
- async.apply(db.setObjectField, 'group:' + groupName, 'createtime', now)
- ], next);
- });
-
- }, function(err) {
- winston.info('[2015/01/21] Upgrading groups to sorted set done');
- Upgrade.update(thisSchemaDate, next);
- });
- });
- } else {
- winston.info('[2015/01/21] Upgrading groups to sorted set skipped');
- next();
- }
- },
- function(next) {
- thisSchemaDate = Date.UTC(2015, 0, 30);
- if (schemaDate < thisSchemaDate) {
- updatesMade = true;
- winston.info('[2015/01/30] Adding group member counts');
-
- db.getSortedSetRange('groups:createtime', 0, -1, function(err, groupNames) {
- if (err) {
- return next(err);
- }
-
- var now = Date.now();
- async.each(groupNames, function(groupName, next) {
- db.sortedSetCard('group:' + groupName + ':members', function(err, memberCount) {
- if (err) {
- return next(err);
- }
-
- if (parseInt(memberCount, 10)) {
- db.setObjectField('group:' + groupName, 'memberCount', memberCount, next);
- } else {
- next();
- }
- });
- }, function(err) {
- winston.info('[2015/01/30] Adding group member counts done');
- Upgrade.update(thisSchemaDate, next);
- });
- });
- } else {
- winston.info('[2015/01/30] Adding group member counts skipped');
- next();
- }
- },
function(next) {
thisSchemaDate = Date.UTC(2015, 1, 8);
if (schemaDate < thisSchemaDate) {