From 8aaf87a3c462892ac7b1b26f9e9605265ef293c8 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sat, 19 Aug 2017 09:23:17 +0000 Subject: [PATCH 01/34] Latest translations and fallbacks --- public/language/ja/admin/advanced/database.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/language/ja/admin/advanced/database.json b/public/language/ja/admin/advanced/database.json index 26f19fa233..5b9b0977f0 100644 --- a/public/language/ja/admin/advanced/database.json +++ b/public/language/ja/admin/advanced/database.json @@ -1,7 +1,7 @@ { "x-b": "%1 b", "x-mb": "%1 mb", - "x-gb": "%1 gb", + "x-gb": "%1 GB", "uptime-seconds": "秒単位の稼働時間", "uptime-days": "日単位の稼働時間", From 74caf191f5eda012df61e3b5b8ee773fd1db8725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 19 Aug 2017 09:13:15 -0400 Subject: [PATCH 02/34] fix typo --- src/meta/blacklist.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meta/blacklist.js b/src/meta/blacklist.js index 80f3ca1190..d4a3e360fa 100644 --- a/src/meta/blacklist.js +++ b/src/meta/blacklist.js @@ -119,7 +119,7 @@ Blacklist.validate = function (rules, callback) { return true; } if (isIPv6CidrSubnet.test(rule)) { - cidr.push(rule); + cidr6.push(rule); return true; } From e895f30c8e1237bca6f6897de45eb8e202676895 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sun, 20 Aug 2017 09:23:18 +0000 Subject: [PATCH 03/34] Latest translations and fallbacks --- .../ja/admin/appearance/customise.json | 4 ++-- .../language/ja/admin/development/info.json | 4 ++-- public/language/ja/admin/extend/plugins.json | 2 +- .../language/ja/admin/general/dashboard.json | 20 +++++++++---------- .../language/ja/admin/general/languages.json | 2 +- .../language/ja/admin/settings/advanced.json | 2 +- .../language/ja/admin/settings/uploads.json | 6 +++--- public/language/ja/email.json | 8 ++++---- public/language/ja/pages.json | 2 +- public/language/ja/topic.json | 4 ++-- public/language/ja/user.json | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/public/language/ja/admin/appearance/customise.json b/public/language/ja/admin/appearance/customise.json index c2e1f7cbbc..590a0ca57d 100644 --- a/public/language/ja/admin/appearance/customise.json +++ b/public/language/ja/admin/appearance/customise.json @@ -7,6 +7,6 @@ "custom-header.description": "カスタムしたHTMLを入力してください(例. JavaScript, メタタグなど)。これはフォーラムのマークアップの<head>に追加されます。", "custom-header.enable": "カスタムヘッダーを有効にする", - "custom-css.livereload": "Enable Live Reload", - "custom-css.livereload.description": "Enable this to force all sessions on every device under your account to refresh whenever you click save" + "custom-css.livereload": "ライブリロードを有効にする", + "custom-css.livereload.description": "これを有効にすると、保存ボタンをクリックするたびにアカウントのすべてのデバイスのすべてのセッションが強制的に更新されます。" } \ No newline at end of file diff --git a/public/language/ja/admin/development/info.json b/public/language/ja/admin/development/info.json index c6a7837667..ff97e22501 100644 --- a/public/language/ja/admin/development/info.json +++ b/public/language/ja/admin/development/info.json @@ -1,12 +1,12 @@ { "you-are-on": "お知らせ - あなたは%1:%2", - "nodes-responded": "%1 nodes responded within %2ms!", + "nodes-responded": "％1ノードは％2ms以内に応答しました！", "host": "ホスト", "pid": "pid", "nodejs": "nodejs", "online": "オンライン", "git": "git", - "memory": "memory", + "memory": "メモリ", "load": "ロード", "uptime": "稼働時間", diff --git a/public/language/ja/admin/extend/plugins.json b/public/language/ja/admin/extend/plugins.json index 572c3b61f3..5f8e5e16f1 100644 --- a/public/language/ja/admin/extend/plugins.json +++ b/public/language/ja/admin/extend/plugins.json @@ -12,7 +12,7 @@ "reorder-plugins": "プラグインの並び替え", "order-active": "アクティブなプラグインの並び替え", "dev-interested": "NodeBBのプラグインの作成に興味がありますか？", - "docs-info": "Full documentation regarding plugin authoring can be found in the NodeBB Docs Portal.", + "docs-info": "プラグインオーサリングに関する完璧な文書はNodeBB Docs Portalにあります。", "order.description": "特定のプラグインは他のプラグインの前後で初期化された際に理想的な動作をします。", "order.explanation": "プラグインはここに上から下へ指定された順序でロードされます", diff --git a/public/language/ja/admin/general/dashboard.json b/public/language/ja/admin/general/dashboard.json index 3ea3d5f3da..a4057bd2e1 100644 --- a/public/language/ja/admin/general/dashboard.json +++ b/public/language/ja/admin/general/dashboard.json @@ -5,14 +5,14 @@ "users": "ユーザー", "posts": "投稿", "topics": "スレッド", - "page-views-seven": "Last 7 Days", - "page-views-thirty": "Last 30 Days", - "page-views-last-day": "Last 24 hours", - "page-views-custom": "Custom Date Range", - "page-views-custom-start": "Range Start", - "page-views-custom-end": "Range End", - "page-views-custom-help": "Enter a date range of page views you would like to view. If no date picker is available, the accepted format is YYYY-MM-DD", - "page-views-custom-error": "Please enter a valid date range in the format YYYY-MM-DD", + "page-views-seven": "過去7日間", + "page-views-thirty": "過去30日間", + "page-views-last-day": "過去24時間", + "page-views-custom": "カスタム期間", + "page-views-custom-start": "期間開始", + "page-views-custom-end": "期間終了", + "page-views-custom-help": "表示したいページビューの日付範囲を入力します。日付選択ツールが使用できない場合、受け入れ可能な形式は次のとおりです。YYYY-MM-DD", + "page-views-custom-error": "有効な期間をフォーマットで入力してくださいYYYY-MM-DD", "stats.day": "日", "stats.week": "週", @@ -23,8 +23,8 @@ "running-version": "NodeBB v%1 を実行しています。", "keep-updated": "常に最新のセキュリティパッチとバグ修正のためにNodeBBが最新であることを確認してください。", "up-to-date": "

あなたは最新の状態です。

", - "upgrade-available": "

A new version (v%1) has been released. Consider upgrading your NodeBB.

", - "prerelease-upgrade-available": "

This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider upgrading your NodeBB.

", + "upgrade-available": "

新しいバージョン(v%1) のNodeBBが検出されました。アップグレードを検討してください。

", + "prerelease-upgrade-available": "

これはNodeBBの旧リリースのバージョンです。新しいバージョン(v%1)がリリースされています。アップグレードをご検討ください。

", "prerelease-warning": "

これはNodeBBのプレリリース版です。意図しないバグが発生することがあります。

", "running-in-development": "フォーラムが開発モードで動作しています。フォーラムの動作が脆弱かもしれませんので、管理者に問い合わせてください。", diff --git a/public/language/ja/admin/general/languages.json b/public/language/ja/admin/general/languages.json index 095dcd8a0f..1d2f019640 100644 --- a/public/language/ja/admin/general/languages.json +++ b/public/language/ja/admin/general/languages.json @@ -2,5 +2,5 @@ "language-settings": "言語設定", "description": "デフォルトの言語は、フォーラムにアクセスしているすべてのユーザーの言語表示を決定します。
個々のユーザーは、アカウント設定ページでデフォルトの言語を上書きできます。", "default-language": "デフォルトの言語", - "auto-detect": "Auto Detect Language Setting for Guests" + "auto-detect": "ゲストの自動検出言語設定" } \ No newline at end of file diff --git a/public/language/ja/admin/settings/advanced.json b/public/language/ja/admin/settings/advanced.json index f7ffbdbaf2..5bb5d07758 100644 --- a/public/language/ja/admin/settings/advanced.json +++ b/public/language/ja/admin/settings/advanced.json @@ -6,7 +6,7 @@ "headers.allow-from": "NodeBBをインラインフレーム内に配置するようALLOW-FROMを設定する", "headers.powered-by": "NodeBBから送信された「Powered By」ヘッダーをカスタマイズする", "headers.acao": "アクセス-制御-有効-原点", - "headers.acao-help": "To deny access to all sites, leave empty", + "headers.acao-help": "すべてのサイトへのアクセスを拒否する場合、空のままにしておいてください。", "headers.acam": "アクセス-制御-有効-メソッド", "headers.acah": "アクセス-制御-有効-ヘッダー", "traffic-management": "トラフィック管理", diff --git a/public/language/ja/admin/settings/uploads.json b/public/language/ja/admin/settings/uploads.json index 4f30d78a06..785016821e 100644 --- a/public/language/ja/admin/settings/uploads.json +++ b/public/language/ja/admin/settings/uploads.json @@ -5,7 +5,7 @@ "max-image-width": "画像を指定した幅(ピクセル単位)にリサイズ", "max-image-width-help": "(ピクセル単位、デフォルト:760px、無効にするには0に設定)", "max-file-size": "最大ファイルサイズ(KB)", - "max-file-size-help": "(in kibibytes, default: 2048 KiB)", + "max-file-size-help": "(キロバイト,デフォルト:2048 KB)", "allow-topic-thumbnails": "ユーザーがスレッドのサムネイルをアップロードできるようにする", "topic-thumb-size": "スレッドのサムネイルの大きさ", "allowed-file-extensions": "ファイル拡張子が有効になりました。", @@ -18,9 +18,9 @@ "profile-image-dimension": "プロファイル画像の寸法", "profile-image-dimension-help": "(ピクセルで、デフォルト：128px)", "max-profile-image-size": "プロフィール画像の最大ファイルサイズ", - "max-profile-image-size-help": "(in kibibytes, default: 256 KiB)", + "max-profile-image-size-help": "(キロバイト単位,デフォルト：256 KB)", "max-cover-image-size": "カバー画像の最大サイズ", - "max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)", + "max-cover-image-size-help": "(キロバイト,デフォルト:2,048 KB)", "keep-all-user-images": "古いバージョンのアバターとプロファイルカバーをサーバーに保管", "profile-covers": "プロフィールのカバー", "default-covers": "デフォルトのカバー画像", diff --git a/public/language/ja/email.json b/public/language/ja/email.json index 8dcf90bb5c..f42c51eb3b 100644 --- a/public/language/ja/email.json +++ b/public/language/ja/email.json @@ -32,9 +32,9 @@ "notif.post.unsub.info": "この投稿の通知はあなたの申し込み設定により送られました。", "test.text1": "このメールはNodeBBのメーラー（emailer）が正しく設定されているか確認をするためのメールです。", "unsub.cta": "ここをクリックして設定を変更する", - "banned.subject": "You have been banned from %1", - "banned.text1": "The user %1 has been banned from %2.", - "banned.text2": "This ban will last until %1.", - "banned.text3": "This is the reason why you have been banned:", + "banned.subject": "%1さんからBANされました。", + "banned.text1": "%1さんは%2さんにBANされています。", + "banned.text2": "このBANは%1まで続きます。", + "banned.text3": "あなたがBANされた理由:", "closing": "ありがとうございます！" } \ No newline at end of file diff --git a/public/language/ja/pages.json b/public/language/ja/pages.json index 99beb3cf1a..aad38822ee 100644 --- a/public/language/ja/pages.json +++ b/public/language/ja/pages.json @@ -6,7 +6,7 @@ "popular-month": "今月人気のスレッド", "popular-alltime": "人気のスレッド", "recent": "最新スレッド", - "moderator-tools": "Moderator Tools", + "moderator-tools": "モデレーターツール", "flagged-content": "フラグ付きコンテンツ", "ip-blacklist": "IPブラックリスト", "users/online": "オンラインのユーザー", diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json index 0e255db706..98e0208920 100644 --- a/public/language/ja/topic.json +++ b/public/language/ja/topic.json @@ -14,7 +14,7 @@ "quote": "引用", "reply": "返信", "replies_to_this_post": "%1 件の返信", - "one_reply_to_this_post": "1 Reply", + "one_reply_to_this_post": "1 件の返信", "last_reply_time": "最後の返信", "reply-as-topic": "スレッドとして返信する", "guest-login-reply": "投稿するのにログインして下さい", @@ -59,7 +59,7 @@ "thread_tools.unlock": "スレッドをアンロック", "thread_tools.move": "スレッドを移動", "thread_tools.move_all": "すべてを移動", - "thread_tools.select_category": "Select Category", + "thread_tools.select_category": "カテゴリを選択", "thread_tools.fork": "スレッドをフォーク", "thread_tools.delete": "スレッドを削除", "thread_tools.delete-posts": "投稿を削除します", diff --git a/public/language/ja/user.json b/public/language/ja/user.json index 4889823207..adf6dd8cc3 100644 --- a/public/language/ja/user.json +++ b/public/language/ja/user.json @@ -60,7 +60,7 @@ "username_taken_workaround": "このユーザー名はすでに使用されています。いまのユーザー名は %1 です。", "password_same_as_username": "パスワードがユーザー名と同じですから、他のパスワードを使って下さい。", "password_same_as_email": "パスワードがメールアドレスと同じです。他のパスワードを使って下さい。", - "weak_password": "Weak password.", + "weak_password": "弱いパスワード", "upload_picture": "画像をアップロード", "upload_a_picture": "画像をアップロード", "remove_uploaded_picture": "アップした写真を取り消します", From 329bfeeb3bbb9ea718938a273af008f9fa813140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 20 Aug 2017 20:41:25 -0400 Subject: [PATCH 04/34] convert min/max to float --- src/database/mongo/sorted/remove.js | 6 ++++-- test/database/sorted.js | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/database/mongo/sorted/remove.js b/src/database/mongo/sorted/remove.js index e8dea857eb..71669a757b 100644 --- a/src/database/mongo/sorted/remove.js +++ b/src/database/mongo/sorted/remove.js @@ -41,11 +41,11 @@ module.exports = function (db, module) { var query = { _key: { $in: keys } }; if (min !== '-inf') { - query.score = { $gte: min }; + query.score = { $gte: parseFloat(min) }; } if (max !== '+inf') { query.score = query.score || {}; - query.score.$lte = max; + query.score.$lte = parseFloat(max); } db.collection('objects').remove(query, function (err) { @@ -53,3 +53,5 @@ module.exports = function (db, module) { }); }; }; + + diff --git a/test/database/sorted.js b/test/database/sorted.js index 67bb9831f1..123a48ecd2 100644 --- a/test/database/sorted.js +++ b/test/database/sorted.js @@ -599,15 +599,29 @@ describe('Sorted Set methods', function () { it('should remove elements with scores between min max inclusive', function (done) { db.sortedSetsRemoveRangeByScore(['sorted6'], 4, 5, function (err) { - assert.equal(err, null); + assert.ifError(err); assert.equal(arguments.length, 1); db.getSortedSetRange('sorted6', 0, -1, function (err, values) { - assert.equal(err, null); + assert.ifError(err); assert.deepEqual(values, ['value1', 'value2', 'value3']); done(); }); }); }); + + it('should remove elements with if strin score is passed in', function (done) { + db.sortedSetAdd('sortedForRemove', [11, 22, 33], ['value1', 'value2', 'value3'], function (err) { + assert.ifError(err); + db.sortedSetsRemoveRangeByScore(['sortedForRemove'], '22', '22', function (err) { + assert.ifError(err); + db.getSortedSetRange('sortedForRemove', 0, -1, function (err, values) { + assert.ifError(err); + assert.deepEqual(values, ['value1', 'value3']); + done(); + }); + }); + }); + }); }); describe('getSortedSetIntersect', function () { From 62c81ca0d32717f0e0aac06b9aa94729db4d7e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 20 Aug 2017 21:07:54 -0400 Subject: [PATCH 05/34] fix lint --- src/database/mongo/sorted/remove.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/database/mongo/sorted/remove.js b/src/database/mongo/sorted/remove.js index 71669a757b..0a3fd87b6e 100644 --- a/src/database/mongo/sorted/remove.js +++ b/src/database/mongo/sorted/remove.js @@ -53,5 +53,3 @@ module.exports = function (db, module) { }); }; }; - - From d46172b07ea4563bfc545eec6824a75ab5155b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 21 Aug 2017 15:12:34 -0400 Subject: [PATCH 06/34] up widget-essentials --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6b7ed818fa..98f28eb1ef 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "nodebb-theme-persona": "5.0.30", "nodebb-theme-slick": "1.1.0", "nodebb-theme-vanilla": "6.0.24", - "nodebb-widget-essentials": "3.0.1", + "nodebb-widget-essentials": "3.0.2", "nodemailer": "2.6.4", "nodemailer-sendmail-transport": "1.0.0", "nodemailer-smtp-transport": "^2.4.1", From 26990059d3a0b3dddc7b17f930854f0c82a55696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 21 Aug 2017 15:32:00 -0400 Subject: [PATCH 07/34] up widget-essentials --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 98f28eb1ef..f8a5422564 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "nodebb-theme-persona": "5.0.30", "nodebb-theme-slick": "1.1.0", "nodebb-theme-vanilla": "6.0.24", - "nodebb-widget-essentials": "3.0.2", + "nodebb-widget-essentials": "3.0.3", "nodemailer": "2.6.4", "nodemailer-sendmail-transport": "1.0.0", "nodemailer-smtp-transport": "^2.4.1", From da856ba6654e84d0377049f9d3d14a626bb66963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 21 Aug 2017 16:33:14 -0400 Subject: [PATCH 08/34] up deps --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index f8a5422564..0e9e707032 100644 --- a/package.json +++ b/package.json @@ -66,10 +66,10 @@ "nodebb-plugin-spam-be-gone": "0.5.1", "nodebb-rewards-essentials": "0.0.9", "nodebb-theme-lavender": "4.0.5", - "nodebb-theme-persona": "5.0.30", + "nodebb-theme-persona": "5.0.31", "nodebb-theme-slick": "1.1.0", - "nodebb-theme-vanilla": "6.0.24", - "nodebb-widget-essentials": "3.0.3", + "nodebb-theme-vanilla": "6.0.25", + "nodebb-widget-essentials": "3.0.4", "nodemailer": "2.6.4", "nodemailer-sendmail-transport": "1.0.0", "nodemailer-smtp-transport": "^2.4.1", From 1875764acab00c07e09678b05afe2023a18577a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 21 Aug 2017 16:39:24 -0400 Subject: [PATCH 09/34] fix typo in delete --- src/messaging/delete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/messaging/delete.js b/src/messaging/delete.js index 6fdf5177ef..89235790fa 100644 --- a/src/messaging/delete.js +++ b/src/messaging/delete.js @@ -14,7 +14,7 @@ module.exports = function (Messaging) { return next(); } var keys = uids.map(function (uid) { - return 'uid:' + uid + ':chat:room:' + roomId + 'mids'; + return 'uid:' + uid + ':chat:room:' + roomId + ':mids'; }); db.sortedSetsRemove(keys, roomId, next); }, From a46db9616cdefcde6f3ed98fc81a3d16ba950dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 21 Aug 2017 16:48:18 -0400 Subject: [PATCH 10/34] fix message delete and add test --- src/messaging/delete.js | 2 +- test/messaging.js | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/messaging/delete.js b/src/messaging/delete.js index 89235790fa..e3058c0ba9 100644 --- a/src/messaging/delete.js +++ b/src/messaging/delete.js @@ -16,7 +16,7 @@ module.exports = function (Messaging) { var keys = uids.map(function (uid) { return 'uid:' + uid + ':chat:room:' + roomId + ':mids'; }); - db.sortedSetsRemove(keys, roomId, next); + db.sortedSetsRemove(keys, mid, next); }, function (next) { db.delete('message:' + mid, next); diff --git a/test/messaging.js b/test/messaging.js index 42ab69f7d6..c2d7ee1b67 100644 --- a/test/messaging.js +++ b/test/messaging.js @@ -299,13 +299,13 @@ describe('Messaging Library', function () { }); it('should fail to get messages from room with invalid data', function (done) { - socketModules.chats.getMessages({ uid: null }, null, function (err, messages) { + socketModules.chats.getMessages({ uid: null }, null, function (err) { assert.equal(err.message, '[[error:invalid-data]]'); - socketModules.chats.getMessages({ uid: fooUid }, null, function (err, messages) { + socketModules.chats.getMessages({ uid: fooUid }, null, function (err) { assert.equal(err.message, '[[error:invalid-data]]'); - socketModules.chats.getMessages({ uid: fooUid }, { uid: null }, function (err, messages) { + socketModules.chats.getMessages({ uid: fooUid }, { uid: null }, function (err) { assert.equal(err.message, '[[error:invalid-data]]'); - socketModules.chats.getMessages({ uid: fooUid }, { uid: 1, roomId: null }, function (err, messages) { + socketModules.chats.getMessages({ uid: fooUid }, { uid: 1, roomId: null }, function (err) { assert.equal(err.message, '[[error:invalid-data]]'); done(); }); @@ -438,7 +438,7 @@ describe('Messaging Library', function () { }); it('should escape teaser', function (done) { - socketModules.chats.send({ uid: fooUid }, { roomId: roomId, message: ' Date: Mon, 21 Aug 2017 16:51:42 -0400 Subject: [PATCH 11/34] style change --- src/controllers/recent.js | 87 ++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 46 deletions(-) diff --git a/src/controllers/recent.js b/src/controllers/recent.js index c5d1d2128a..0849c4f576 100644 --- a/src/controllers/recent.js +++ b/src/controllers/recent.js @@ -11,7 +11,7 @@ var meta = require('../meta'); var helpers = require('./helpers'); var pagination = require('../pagination'); -var recentController = {}; +var recentController = module.exports; var validFilter = { '': true, new: true, watched: true }; @@ -47,49 +47,44 @@ recentController.get = function (req, res, next) { topics.getRecentTopics(cid, req.uid, start, stop, filter, next); }, - ], function (err, data) { - if (err) { - return next(err); - } - - data.categories = categoryData.categories; - data.selectedCategory = categoryData.selectedCategory; - data.nextStart = stop + 1; - data.set = 'topics:recent'; - data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; - data.rssFeedUrl = nconf.get('relative_path') + '/recent.rss'; - data.title = '[[pages:recent]]'; - data.filters = [{ - name: '[[unread:all-topics]]', - url: 'recent', - selected: filter === '', - filter: '', - }, { - name: '[[unread:new-topics]]', - url: 'recent/new', - selected: filter === 'new', - filter: 'new', - }, { - name: '[[unread:watched-topics]]', - url: 'recent/watched', - selected: filter === 'watched', - filter: 'watched', - }]; - - data.selectedFilter = data.filters.find(function (filter) { - return filter && filter.selected; - }); - - var pageCount = Math.max(1, Math.ceil(data.topicCount / settings.topicsPerPage)); - data.pagination = pagination.create(page, pageCount, req.query); - - if (req.path.startsWith('/api/recent') || req.path.startsWith('/recent')) { - data.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[recent:title]]' }]); - } - - data.querystring = cid ? ('?cid=' + validator.escape(String(cid))) : ''; - res.render('recent', data); - }); + function (data) { + data.categories = categoryData.categories; + data.selectedCategory = categoryData.selectedCategory; + data.nextStart = stop + 1; + data.set = 'topics:recent'; + data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; + data.rssFeedUrl = nconf.get('relative_path') + '/recent.rss'; + data.title = '[[pages:recent]]'; + data.filters = [{ + name: '[[unread:all-topics]]', + url: 'recent', + selected: filter === '', + filter: '', + }, { + name: '[[unread:new-topics]]', + url: 'recent/new', + selected: filter === 'new', + filter: 'new', + }, { + name: '[[unread:watched-topics]]', + url: 'recent/watched', + selected: filter === 'watched', + filter: 'watched', + }]; + + data.selectedFilter = data.filters.find(function (filter) { + return filter && filter.selected; + }); + + var pageCount = Math.max(1, Math.ceil(data.topicCount / settings.topicsPerPage)); + data.pagination = pagination.create(page, pageCount, req.query); + + if (req.path.startsWith('/api/recent') || req.path.startsWith('/recent')) { + data.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[recent:title]]' }]); + } + + data.querystring = cid ? ('?cid=' + validator.escape(String(cid))) : ''; + res.render('recent', data); + }, + ], next); }; - -module.exports = recentController; From 049883231705834d4e25c630951fea128b1ad0e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 22 Aug 2017 10:28:35 -0400 Subject: [PATCH 12/34] closes #5888 --- package.json | 4 ++-- public/language/en-GB/admin/settings/general.json | 3 +++ src/middleware/header.js | 1 + src/views/admin/settings/general.tpl | 6 ++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0e9e707032..d61de817f3 100644 --- a/package.json +++ b/package.json @@ -66,9 +66,9 @@ "nodebb-plugin-spam-be-gone": "0.5.1", "nodebb-rewards-essentials": "0.0.9", "nodebb-theme-lavender": "4.0.5", - "nodebb-theme-persona": "5.0.31", + "nodebb-theme-persona": "5.0.32", "nodebb-theme-slick": "1.1.0", - "nodebb-theme-vanilla": "6.0.25", + "nodebb-theme-vanilla": "6.0.26", "nodebb-widget-essentials": "3.0.4", "nodemailer": "2.6.4", "nodemailer-sendmail-transport": "1.0.0", diff --git a/public/language/en-GB/admin/settings/general.json b/public/language/en-GB/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/en-GB/admin/settings/general.json +++ b/public/language/en-GB/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/src/middleware/header.js b/src/middleware/header.js index 29716e1f60..e35cc0e333 100644 --- a/src/middleware/header.js +++ b/src/middleware/header.js @@ -46,6 +46,7 @@ module.exports = function (middleware) { res.locals.config = res.locals.config || {}; var templateValues = { title: meta.config.title || '', + 'title:url': meta.config['title:url'] || '', description: meta.config.description || '', 'cache-buster': meta.config['cache-buster'] || '', 'brand:logo': meta.config['brand:logo'] || '', diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl index 13dffdf71a..d945c56e05 100644 --- a/src/views/admin/settings/general.tpl +++ b/src/views/admin/settings/general.tpl @@ -9,6 +9,12 @@ + + +

+ [[admin/settings/general:title.url-help]] +

+