From fd9200cbb0d096c95de67e29f518031828359431 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 2 Aug 2018 01:44:15 +0000 Subject: [PATCH 01/17] fix(package): update @types/webpack to version 4.4.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d182a9339..372c8f4def 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "@types/systeminformation": "3.23.0", "@types/tmp": "0.0.33", "@types/uuid": "3.4.3", - "@types/webpack": "4.4.8", + "@types/webpack": "4.4.9", "@types/webpack-stream": "3.2.10", "@types/websocket": "0.0.39", "@types/ws": "5.1.2", From 2ea3b57499e6ce031ebc338777d2dfe0bf0711aa Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 2 Aug 2018 01:39:37 +0000 Subject: [PATCH 02/17] fix(package): update @types/mongodb to version 3.1.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 372c8f4def..f380685693 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "@types/minio": "6.0.2", "@types/mkdirp": "0.5.2", "@types/mocha": "5.2.3", - "@types/mongodb": "3.1.2", + "@types/mongodb": "3.1.3", "@types/ms": "0.7.30", "@types/node": "10.5.5", "@types/parse5": "5.0.0", From b9dfb937f1102c7b85d11769d49085663acdcb24 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 2 Aug 2018 14:24:27 +0900 Subject: [PATCH 03/17] Fix bug --- .../common/views/components/games/reversi/reversi.game.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/app/common/views/components/games/reversi/reversi.game.vue b/src/client/app/common/views/components/games/reversi/reversi.game.vue index de9c0395c7..34e9705dd4 100644 --- a/src/client/app/common/views/components/games/reversi/reversi.game.vue +++ b/src/client/app/common/views/components/games/reversi/reversi.game.vue @@ -3,12 +3,12 @@
{{ blackUser | userName }}(%i18n:common.reversi.black%) vs {{ whiteUser | userName }}(%i18n:common.reversi.white%)
-

{{ '%i18n:common.reversi.turn-of%'.replace('{}', turnUser | userName) }}

-

{{ '%i18n:common.reversi.past-turn-of%'.replace('{}', turnUser | userName) }}

+

{{ '%i18n:common.reversi.turn-of%'.replace('{}', Vue.filter('userName')(turnUser)) }}

+

{{ '%i18n:common.reversi.past-turn-of%'.replace('{}', Vue.filter('userName')(turnUser)) }}

%i18n:common.reversi.opponent-turn%

%i18n:common.reversi.my-turn%

- +

From 0df093383dfcb41b66c2d807b0c7f3fac9653f1f Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 2 Aug 2018 15:35:22 +0900 Subject: [PATCH 04/17] Refactoring --- src/remote/activitypub/request.ts | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/remote/activitypub/request.ts b/src/remote/activitypub/request.ts index e2b600ae2e..585c1c0ce8 100644 --- a/src/remote/activitypub/request.ts +++ b/src/remote/activitypub/request.ts @@ -20,18 +20,13 @@ export default (user: ILocalUser, url: string, object: any) => new Promise((reso method: 'POST', path: pathname + search, }, res => { - res.on('end', () => { - log(`${url} --> ${res.statusCode}`); + log(`${url} --> ${res.statusCode}`); - if (res.statusCode >= 200 && res.statusCode < 300) { - resolve(); - } else { - reject(res); - } - }); - - res.on('data', () => {}); - res.on('error', reject); + if (res.statusCode >= 400) { + reject(); + } else { + resolve(); + } }); sign(req, { From 7b33c63f78eb87ce80fe5ed29af62860384415d9 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Thu, 2 Aug 2018 19:03:31 +0900 Subject: [PATCH 05/17] #332 (#2065) --- locales/en.yml | 52 ++++++++++++++++-- locales/ja.yml | 53 ++++++++++++++++++- src/client/app/auth/script.ts | 2 +- src/client/app/auth/views/form.vue | 26 ++++----- src/client/app/auth/views/index.vue | 16 +++--- .../common/scripts/compose-notification.ts | 14 ++--- .../app/common/scripts/date-stringify.ts | 10 ++-- .../app/common/scripts/fuck-ad-block.ts | 4 +- src/client/app/common/views/pages/follow.vue | 2 +- .../app/desktop/views/components/notes.vue | 2 +- .../desktop/views/pages/home-customize.vue | 2 +- src/client/app/desktop/views/pages/home.vue | 2 +- src/client/app/desktop/views/pages/share.vue | 4 +- .../app/desktop/views/pages/user/user.vue | 2 +- .../app/desktop/views/pages/welcome.vue | 4 +- src/client/app/dev/views/ui.vue | 2 +- .../app/mobile/views/components/notes.vue | 2 +- src/client/app/mobile/views/pages/drive.vue | 8 +-- .../app/mobile/views/pages/favorites.vue | 2 +- .../app/mobile/views/pages/followers.vue | 2 +- .../app/mobile/views/pages/following.vue | 2 +- src/client/app/mobile/views/pages/home.vue | 2 +- .../app/mobile/views/pages/messaging-room.vue | 2 +- .../app/mobile/views/pages/messaging.vue | 2 +- src/client/app/mobile/views/pages/note.vue | 2 +- .../app/mobile/views/pages/notifications.vue | 2 +- .../views/pages/received-follow-requests.vue | 2 +- src/client/app/mobile/views/pages/search.vue | 2 +- .../app/mobile/views/pages/settings.vue | 2 +- src/client/app/mobile/views/pages/share.vue | 2 +- .../app/mobile/views/pages/user-lists.vue | 2 +- src/client/app/mobile/views/pages/user.vue | 2 +- src/client/app/mobile/views/pages/welcome.vue | 2 +- src/client/app/mobile/views/pages/widgets.vue | 4 +- 34 files changed, 167 insertions(+), 74 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index 650258e5cf..226d839938 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -6,6 +6,10 @@ common: misskey: "A ⭐ of the fediverse" about-title: "A ⭐ of the fediverse." about: "Thank you for finding Misskey. Misskey is a decentralized microblogging platform born on Earth. Since it exists within the Fediverse (a universe where various social media platforms are organized), it is mutually linked with other social media platforms. Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet?" + adblock: + detected: "Please disable ad blocker." + warning: "Misskey is not running ads, but some features may be unavailable or malfunctioning if ad blocking features are enabled." + application-authorization: "Application authorizations" customization-tips: title: "Customization tips" paragraph1: "Home customization allows you to add/delete, drag and drop and rearrange widgets." @@ -13,6 +17,15 @@ common: paragraph3: "To delete a widget, drag and drop the widget onto the area labeled \"Trash\" in the header." paragraph4: "To finish the customization, click \"Finish\" in the upper right." gotit: "Got it!" + close: "Close" + notification: + file-uploaded: "File uploaded!" + message-from: "Message from {}:" + reversi-invited: "Invited to a game:" + reversi-invited-by: "By {}." + notified-by: "Notified by {}:" + reply-from: "Reply from {}:" + quoted-by: "Quoted by {}:" name: "Misskey" time: unknown: "unknown" @@ -26,6 +39,12 @@ common: months_ago: "{}month(s) ago" years_ago: "{}year(s) ago" trash: "Trash" + date: + full-year: "Year" + month: "Month" + day: "Day" + hours: "Hours" + minutes: "Minutes" weekday-short: sunday: "S" monday: "M" @@ -121,6 +140,30 @@ common: rename: "Rename" stack-left: "Stack to the left" pop-right: "Dock on the right" +auth/views/form.vue: + share-access: "Would you allow {{app.name}} to access your account?" + permission-ask: "This application requires the following permissions:" + account-read: "View account information." + account-write: "Modify account information." + note-write: "Post." + like-write: "React." + following-write: "Follow or unfollow." + drive-read: "Read your drive." + drive-write: "Upload/delete files in your drive." + notification-read: "Read your notifications." + notification-write: "Manage your notifications." + cancel: "Cancel" + accept: "Accept" +auth/views/index.vue: + loading: "Loading..." + denied: "Application authorization is denied." + denied-paragraph: "This application will not access your account." + already-authorized: "This application is already authorized." + allowed: "Application authorization allowed." + callback-url: "Going back to the application." + please-go-back: "Please go back to the application." + error: "Session does not exist." + sign-in: "Please sign in." common/views/components/games/reversi/reversi.vue: title: "Misskey Reversi" sub-title: "Play reversi with your friends!" @@ -751,10 +794,9 @@ desktop/views/pages/search.vue: not-available: "The search function can not be used." not-found: "No posts were found for '{}'" desktop/views/pages/share.vue: - share-with: "Share with Misskey" - close: "Close" + share-with: "Share with {}" desktop/views/pages/tag.vue: - no-posts-found: "ハッシュタグ「{}」が付けられた投稿は見つかりませんでした。" + no-posts-found: "No posts \"{}\" found." desktop/views/pages/user-list.users.vue: users: "User" add-user: "Add a user" @@ -954,7 +996,7 @@ mobile/views/pages/home.vue: hybrid: "Social" global: "Global" mobile/views/pages/tag.vue: - no-posts-found: "ハッシュタグ「{}」が付けられた投稿は見つかりませんでした。" + no-posts-found: "No posts \"{}\" found." mobile/views/pages/welcome.vue: signup: "Sign up" mobile/views/pages/widgets.vue: @@ -995,6 +1037,8 @@ mobile/views/pages/settings/settings.profile.vue: mobile/views/pages/search.vue: search: "Search" empty: "No posts were found for '{}'" +mobile/views/pages/share.vue: + share-with: "Share with {}." mobile/views/pages/selectdrive.vue: select-file: "Choose files" mobile/views/pages/settings.vue: diff --git a/locales/ja.yml b/locales/ja.yml index 7e245d46a9..b3b50a5c8f 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -6,6 +6,11 @@ common: misskey: "A ⭐ of fediverse" about-title: "A ⭐ of fediverse." about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた分散マイクロブログSNSです。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。" + adblock: + detected: "広告ブロッカーを無効にしてください" + warning: "Misskeyは広告を掲載していませんが、広告をブロックする機能が有効だと一部の機能が利用できなかったり、不具合が発生する場合があります。" + application-authorization: "アプリの連携" + close: "閉じる" customization-tips: title: "カスタマイズのヒント" paragraph1: "ホームのカスタマイズでは、ウィジェットを追加/削除したり、ドラッグ&ドロップして並べ替えたりすることができます。" @@ -13,6 +18,14 @@ common: paragraph3: "ウィジェットを削除するには、ヘッダーの「ゴミ箱」と書かれたエリアにウィジェットをドラッグ&ドロップします。" paragraph4: "カスタマイズを終了するには、右上の「完了」をクリックします。" gotit: "Got it!" + notification: + file-uploaded: "ファイルがアップロードされました" + message-from: "{}さんからメッセージ:" + reversi-invited: "対局への招待があります" + reversi-invited-by: "{}さんから" + notified-by: "{}さんから" + reply-from: "{}さんから返信:" + quoted-by: "{}さんが引用:" name: "Misskey" time: unknown: "なぞのじかん" @@ -28,6 +41,13 @@ common: trash: "ゴミ箱" + date: + full-year: "年" + month: "月" + day: "日" + hours: "時" + minutes: "分" + weekday-short: sunday: "日" monday: "月" @@ -131,6 +151,32 @@ common: stack-left: "左に重ねる" pop-right: "右に出す" +auth/views/form.vue: + share-access: "{{ app.name }}があなたのアカウントにアクセスすることを許可しますか？" + permission-ask: "このアプリは次の権限を要求しています:" + account-read: "アカウントの情報を見る。" + account-write: "アカウントの情報を操作する。" + note-write: "投稿する。" + like-write: "いいねしたりいいね解除する。" + following-write: "フォローしたりフォロー解除する。" + drive-read: "ドライブを見る。" + drive-write: "ドライブを操作する。" + notification-read: "通知を見る。" + notification-write: "通知を操作する。" + cancel: "キャンセル" + accept: "アクセスを許可" + +auth/views/index.vue: + loading: "読み込み中" + denied: "アプリケーションの連携をキャンセルしました。" + denied-paragraph: "このアプリがあなたのアカウントにアクセスすることはありません。" + already-authorized: "このアプリは既に連携済みです" + allowed: "アプリケーションの連携を許可しました" + callback-url: "アプリケーションに戻っています" + please-go-back: "アプリケーションに戻って、やっていってください。" + error: "セッションが存在しません。" + sign-in: "サインインしてください" + common/views/components/games/reversi/reversi.vue: title: "Misskey Reversi" sub-title: "他のMisskeyユーザーとリバーシで対戦しよう" @@ -870,8 +916,7 @@ desktop/views/pages/search.vue: not-found: "「{}」に関する投稿は見つかりませんでした。" desktop/views/pages/share.vue: - share-with: "Misskeyで共有" - close: "閉じる" + share-with: "{}で共有" desktop/views/pages/tag.vue: no-posts-found: "ハッシュタグ「{}」が付けられた投稿は見つかりませんでした。" @@ -1127,10 +1172,14 @@ mobile/views/pages/welcome.vue: mobile/views/pages/widgets.vue: dashboard: "ダッシュボード" + widgets-hints: "ウィジェットを追加/削除したり並べ替えたりできます。ウィジェットを移動するには「三」をドラッグします。ウィジェットを削除するには「x」をタップします。いくつかのウィジェットはタップすることで表示を変更できます。" mobile/views/pages/widgets/activity.vue: activity: "アクティビティ" +mobile/views/pages/share.vue: + share-with: "{}で共有" + mobile/views/pages/messaging.vue: messaging: "メッセージ" diff --git a/src/client/app/auth/script.ts b/src/client/app/auth/script.ts index fd985c46ad..bdfdf70be3 100644 --- a/src/client/app/auth/script.ts +++ b/src/client/app/auth/script.ts @@ -15,7 +15,7 @@ import Index from './views/index.vue'; * init */ init(launch => { - document.title = 'Misskey | アプリの連携'; + document.title = '%i18n:common.name% | %i18n:common.application-authorization%'; // Init router const router = new VueRouter({ diff --git a/src/client/app/auth/views/form.vue b/src/client/app/auth/views/form.vue index 80086e3861..2d1e6d3e82 100644 --- a/src/client/app/auth/views/form.vue +++ b/src/client/app/auth/views/form.vue @@ -1,7 +1,7 @@ diff --git a/src/client/app/auth/views/index.vue b/src/client/app/auth/views/index.vue index 6d0ba3cda3..609e758994 100644 --- a/src/client/app/auth/views/index.vue +++ b/src/client/app/auth/views/index.vue @@ -1,7 +1,7 @@