From bffd7bbb3b4f952fd29ffee0c414a1c3c3202860 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 1 Aug 2018 08:38:56 +0900 Subject: [PATCH 01/26] Clean up --- .../api/endpoints/messaging/messages/create.ts | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/server/api/endpoints/messaging/messages/create.ts b/src/server/api/endpoints/messaging/messages/create.ts index 8ebf1a2a2..144c0ba71 100644 --- a/src/server/api/endpoints/messaging/messages/create.ts +++ b/src/server/api/endpoints/messaging/messages/create.ts @@ -123,20 +123,6 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = } }, 3000); - // Register to search database - if (message.text && config.elasticsearch) { - const es = require('../../../db/elasticsearch'); - - es.index({ - index: 'misskey', - type: 'messaging_message', - id: message._id.toString(), - body: { - text: message.text - } - }); - } - // 履歴作成(自分) History.update({ userId: user._id, From c4351acf7c651cce52c95a0f6d89fbdd5e687938 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 1 Aug 2018 08:44:58 +0900 Subject: [PATCH 02/26] Clean up --- src/server/api/endpoints/messaging/messages/create.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/server/api/endpoints/messaging/messages/create.ts b/src/server/api/endpoints/messaging/messages/create.ts index 144c0ba71..d33d9e7e7 100644 --- a/src/server/api/endpoints/messaging/messages/create.ts +++ b/src/server/api/endpoints/messaging/messages/create.ts @@ -9,7 +9,6 @@ import { pack } from '../../../../../models/messaging-message'; import { publishUserStream } from '../../../../../stream'; import { publishMessagingStream, publishMessagingIndexStream } from '../../../../../stream'; import pushSw from '../../../../../push-sw'; -import config from '../../../../../config'; export const meta = { desc: { From e93503066cd2b200a1bfdb75a0651da628f57a52 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 1 Aug 2018 08:45:35 +0900 Subject: [PATCH 03/26] 5.9.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4647e3d89..c8d7f3a18 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "misskey", "author": "syuilo ", - "version": "5.8.0", - "clientVersion": "1.0.7664", + "version": "5.9.0", + "clientVersion": "1.0.7726", "codename": "nighthike", "main": "./built/index.js", "private": true, From bc34b4f1981a1c7356593708a5fbbf88a2c6032d Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 1 Aug 2018 01:40:10 +0000 Subject: [PATCH 04/26] fix(package): update @types/node to version 10.5.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c8d7f3a18..e73a156bf 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@types/mocha": "5.2.3", "@types/mongodb": "3.1.2", "@types/ms": "0.7.30", - "@types/node": "10.5.4", + "@types/node": "10.5.5", "@types/parse5": "5.0.0", "@types/portscanner": "2.1.0", "@types/pug": "2.0.4", From 2c3ea0cfeffd7bafed0b2eaaab8443acad29144a Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 1 Aug 2018 11:07:30 +0900 Subject: [PATCH 05/26] Fix #2042 --- src/server/api/stream/user-list.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/api/stream/user-list.ts b/src/server/api/stream/user-list.ts index 33cc2a1ee..30f94d525 100644 --- a/src/server/api/stream/user-list.ts +++ b/src/server/api/stream/user-list.ts @@ -8,6 +8,6 @@ export default function(request: websocket.request, connection: websocket.connec // Subscribe stream subscriber.on(`user-list-stream:${listId}`, data => { - connection.send(data); + connection.send(JSON.stringify(data)); }); } From 3636db3f852991707b45314222845a69f817f336 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Wed, 1 Aug 2018 12:09:59 -0400 Subject: [PATCH 06/26] Translated desktop/views/pages/share.vue --- locales/en.yml | 5 +++++ locales/ja.yml | 6 ++++++ src/client/app/desktop/views/pages/share.vue | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index febc4f691..f12520664 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -666,6 +666,11 @@ desktop/views/pages/selectdrive.vue: ok: "OK" cancel: "Cancel" upload: "Upload files from your device" + +desktop/views/pages/share.vue: + share-with: "Share with Misskey" + close: "Close" + desktop/views/pages/user-list.users.vue: users: "User" add-user: "Add a user" diff --git a/locales/ja.yml b/locales/ja.yml index 9e65066d9..1a2292dc6 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -717,6 +717,8 @@ desktop/views/components/received-follow-requests-window.vue: title: "フォロー申請" accept: "承認" reject: "拒否" + + desktop/views/components/user-lists-window.vue: title: "リスト" @@ -778,6 +780,10 @@ desktop/views/pages/selectdrive.vue: cancel: "キャンセル" upload: "PCからドライブにファイルをアップロード" +desktop/views/pages/share.vue: + share-with: "Misskeyで共有" + close: "閉じる" + desktop/views/pages/user-list.users.vue: users: "ユーザー" add-user: "ユーザーを追加" diff --git a/src/client/app/desktop/views/pages/share.vue b/src/client/app/desktop/views/pages/share.vue index e60434074..b1317f93e 100644 --- a/src/client/app/desktop/views/pages/share.vue +++ b/src/client/app/desktop/views/pages/share.vue @@ -1,12 +1,12 @@ From e42c8859b474c7ec8245e7d0b41185c956b96a31 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Wed, 1 Aug 2018 12:20:41 -0400 Subject: [PATCH 07/26] Translated desktop\views\pages\search.vue Needed some weird text hack. Might want to check it later. --- locales/en.yml | 7 +++++++ locales/ja.yml | 7 +++++++ src/client/app/desktop/views/pages/search.vue | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index f12520664..a888e58a6 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -667,6 +667,13 @@ desktop/views/pages/selectdrive.vue: cancel: "Cancel" upload: "Upload files from your device" +desktop/views/pages/search.vue: + not-available: "The search function can not be used." + not-found-quotes1: "\"" + not-found-quotes2: "\"" + not-found-text-english: "No posts were found for " + not-found-text-japanese: "." + desktop/views/pages/share.vue: share-with: "Share with Misskey" close: "Close" diff --git a/locales/ja.yml b/locales/ja.yml index 1a2292dc6..8113695f5 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -780,6 +780,13 @@ desktop/views/pages/selectdrive.vue: cancel: "キャンセル" upload: "PCからドライブにファイルをアップロード" +desktop/views/pages/search.vue: + not-available: "検索機能を利用することができません。" + not-found-quotes1: "「" + not-found-quotes2: "」" + not-found-text-english: "" + not-found-text-japanese: "に関する投稿は見つかりませんでした。" + desktop/views/pages/share.vue: share-with: "Misskeyで共有" close: "閉じる" diff --git a/src/client/app/desktop/views/pages/search.vue b/src/client/app/desktop/views/pages/search.vue index 2576c26cb..2db9617db 100644 --- a/src/client/app/desktop/views/pages/search.vue +++ b/src/client/app/desktop/views/pages/search.vue @@ -6,8 +6,8 @@
-

検索機能を利用することができません。

-

%fa:search%「{{ q }}」に関する投稿は見つかりませんでした。

+

%i18n:@not-available%

+

%fa:search%%i18n:@not-found-text-english%%i18n:@not-found-quotes1%{{ q }}%i18n:@not-found-quotes2%%i18n:@not-found-text-japanese%

From 9e251b3ea0a10da61dd8f066b8509dce983a726c Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 1 Aug 2018 16:09:29 +0000 Subject: [PATCH 08/26] fix(package): update sass-loader to version 7.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e73a156bf..a65b570f4 100644 --- a/package.json +++ b/package.json @@ -178,7 +178,7 @@ "rimraf": "2.6.2", "rndstr": "1.0.0", "s-age": "1.1.2", - "sass-loader": "7.0.3", + "sass-loader": "7.1.0", "seedrandom": "2.4.3", "sharp": "0.20.5", "showdown": "1.8.6", From 86d49c6704e1288e347a537ece065ff5820593e5 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Wed, 1 Aug 2018 14:14:53 -0400 Subject: [PATCH 09/26] Translated common/views/widgets/tips.vue Double lines. Might want to check that. --- locales/en.yml | 28 +++++++++++ locales/ja.yml | 27 +++++++++++ src/client/app/common/views/widgets/tips.vue | 50 ++++++++++---------- 3 files changed, 80 insertions(+), 25 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index a888e58a6..23a3942dd 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -261,6 +261,34 @@ common/views/widgets/slideshow.vue: folder-customize-mode: "To specify a folder, please exit customize mode" folder: "Please click and specify a folder" no-image: "There is no image in this folder" + +common/views/widgets/tips.vue: + tips-line1: "You can focus on the timeline with t." + tips-line2: "Open posting form with p or n." + tips-line3: "You can drag and drop files on the post form." + tips-line4: "You can paste an image from the clipboard into the submission form." + tips-line5: "You can upload files by dragging and dropping them to Drive." + tips-line6: "You can move a folder by dragging it within the Drive." + tips-line7: "You can move folders by dragging them within the Drive" + tips-line8: "Home can be customized from the settings widget." + tips-line9: "Misskey is licensed under AGPLv3." + tips-line10: "Using the Time Machine widget makes it easy to trace back to the past timeline." + tips-line11: "You can pin posts to user page by clicking on \"...\"" + tips-line12: "Drive capacity is 1 GB (by default)" + tips-line13: "All the files attached to the post are saved to Drive." + tips-line14: "While customizing the home, you can right click on the widget and change the design." + tips-line15: "You can also place widgets at the top of the timeline." + tips-line16: "Double click on a post to see details." + tips-line17: "Surrounding the text with ** ** will highlight it." + tips-line18: "By using the channel widget, you can quickly check frequently used channels." + tips-line19: "Several windows can be detached outside the browser." + tips-line20: "The percentage of the calendar widget shows the percentage of time elapsed." + tips-line21: "You can also use the API to develop bots." + tips-line22: "Misskey is also available via LINE." + tips-line23: "Mayu is so cute with its eyebrows." + tips-line24: "Misskey started in 2014." + tips-line25: "You can receive notification even if Misskey is not open in a compatible browser." + common/views/pages/follow.vue: signed-in-as: "Signed in as {}" following: "Following" diff --git a/locales/ja.yml b/locales/ja.yml index 8113695f5..1f76c9604 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -298,6 +298,33 @@ common/views/widgets/slideshow.vue: folder: "クリックしてフォルダを指定してください" no-image: "このフォルダには画像がありません" +common/views/widgets/tips.vue: + tips-line1: "tでタイムラインにフォーカスできます" + tips-line2: "pまたはnで投稿フォームを開きます" + tips-line3: "投稿フォームにはファイルをドラッグ&ドロップできます" + tips-line4: "投稿フォームにクリップボードにある画像データをペーストできます" + tips-line5: "ドライブにファイルをドラッグ&ドロップしてアップロードできます" + tips-line6: "ドライブでファイルをドラッグしてフォルダ移動できます" + tips-line7: "ドライブでフォルダをドラッグしてフォルダ移動できます" + tips-line8: "ホームは設定からカスタマイズできます" + tips-line9: "MisskeyはAGPLv3です" + tips-line10: "タイムマシンウィジェットを利用すると、簡単に過去のタイムラインに遡れます" + tips-line11: "投稿の ... をクリックして、投稿をユーザーページにピン留めできます" + tips-line12: "ドライブの容量は(デフォルトで)1GBです" + tips-line13: "投稿に添付したファイルは全てドライブに保存されます" + tips-line14: "ホームのカスタマイズ中、ウィジェットを右クリックしてデザインを変更できます" + tips-line15: "タイムライン上部にもウィジェットを設置できます" + tips-line16: "投稿をダブルクリックすると詳細が見れます" + tips-line17: "「**」でテキストを囲むと**強調表示**されます" + tips-line18: "チャンネルウィジェットを利用すると、よく利用するチャンネルを素早く確認できます" + tips-line19: "いくつかのウィンドウはブラウザの外に切り離すことができます" + tips-line20: "カレンダーウィジェットのパーセンテージは、経過の割合を示しています" + tips-line21: "APIを利用してbotの開発なども行えます" + tips-line22: "MisskeyはLINEを通じてでも利用できます" + tips-line23: "まゆかわいいよまゆ" + tips-line24: "Misskeyは2014年にサービスを開始しました" + tips-line25: "対応ブラウザではMisskeyを開いていなくても通知を受け取れます" + common/views/pages/follow.vue: signed-in-as: "{}としてサインイン中" following: "フォロー中" diff --git a/src/client/app/common/views/widgets/tips.vue b/src/client/app/common/views/widgets/tips.vue index 08e665f92..9df120129 100644 --- a/src/client/app/common/views/widgets/tips.vue +++ b/src/client/app/common/views/widgets/tips.vue @@ -9,31 +9,31 @@ import * as anime from 'animejs'; import define from '../../../common/define-widget'; const tips = [ - 'tでタイムラインにフォーカスできます', - 'pまたはnで投稿フォームを開きます', - '投稿フォームにはファイルをドラッグ&ドロップできます', - '投稿フォームにクリップボードにある画像データをペーストできます', - 'ドライブにファイルをドラッグ&ドロップしてアップロードできます', - 'ドライブでファイルをドラッグしてフォルダ移動できます', - 'ドライブでフォルダをドラッグしてフォルダ移動できます', - 'ホームは設定からカスタマイズできます', - 'MisskeyはAGPLv3です', - 'タイムマシンウィジェットを利用すると、簡単に過去のタイムラインに遡れます', - '投稿の ... をクリックして、投稿をユーザーページにピン留めできます', - 'ドライブの容量は(デフォルトで)1GBです', - '投稿に添付したファイルは全てドライブに保存されます', - 'ホームのカスタマイズ中、ウィジェットを右クリックしてデザインを変更できます', - 'タイムライン上部にもウィジェットを設置できます', - '投稿をダブルクリックすると詳細が見れます', - '「**」でテキストを囲むと**強調表示**されます', - 'チャンネルウィジェットを利用すると、よく利用するチャンネルを素早く確認できます', - 'いくつかのウィンドウはブラウザの外に切り離すことができます', - 'カレンダーウィジェットのパーセンテージは、経過の割合を示しています', - 'APIを利用してbotの開発なども行えます', - 'MisskeyはLINEを通じてでも利用できます', - 'まゆかわいいよまゆ', - 'Misskeyは2014年にサービスを開始しました', - '対応ブラウザではMisskeyを開いていなくても通知を受け取れます' + '%i18n:@tips-line1%', + '%i18n:@tips-line2%', + '%i18n:@tips-line3%', + '%i18n:@tips-line4%', + '%i18n:@tips-line5%', + '%i18n:@tips-line6%', + '%i18n:@tips-line7%', + '%i18n:@tips-line8%', + '%i18n:@tips-line9%', + '%i18n:@tips-line10%', + '%i18n:@tips-line11%', + '%i18n:@tips-line12%', + '%i18n:@tips-line13%', + '%i18n:@tips-line14%', + '%i18n:@tips-line15%', + '%i18n:@tips-line16%', + '%i18n:@tips-line17%', + '%i18n:@tips-line18%', + '%i18n:@tips-line19%', + '%i18n:@tips-line20%', + '%i18n:@tips-line21%', + '%i18n:@tips-line22%', + '%i18n:@tips-line23%', + '%i18n:@tips-line24%', + '%i18n:@tips-line25%' ] export default define({ From c5b682dc8976f42a91b2c44feb18228605b0a162 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Wed, 1 Aug 2018 14:25:55 -0400 Subject: [PATCH 10/26] common/views/widgets/calendar.vue Did weird formatting tricks. Hopefully should work. --- locales/en.yml | 14 ++++++++++++++ locales/ja.yml | 13 +++++++++++++ src/client/app/common/views/widgets/calendar.vue | 14 +++++++------- 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index 23a3942dd..7a1014940 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -237,6 +237,20 @@ common/views/widgets/broadcast.vue: no-broadcasts: "No announcements" have-a-nice-day: "Have a nice day!" next: "Next" + +common/views/widgets/calendar.vue: + year-english: "Year " + year-japanese: "" + month-english: "Month " + month-japanese: "" + day-english: "Day " + day-japanese: "" + weekday-english: "Weekday " + weekday-japanese: "" + today: "Today: " + this-month: "This month: " + this-year: "This year: " + common/views/widgets/donation.vue: title: "Request for donations" text: "To keep Misskey up and running, we have to spend money on our domain name, the server costs and so on. Since we don't receive money from advertisements, we count on donations from all of you. If you're interested in helping, contact {}. Thank you for your contribution!" diff --git a/locales/ja.yml b/locales/ja.yml index 1f76c9604..a542f7293 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -266,6 +266,19 @@ common/views/widgets/broadcast.vue: no-broadcasts: "お知らせはありません" have-a-nice-day: "良い一日を！" next: "次" + +common/views/widgets/calendar.vue: + year-english: "" + year-japanese: "年" + month-english: "" + month-japanese: "月" + day-english: "" + day-japanese: "日" + weekday-english: "" + weekday-japanese: "曜日" + today: "今日:" + this-month: "今月:" + this-year: "今年:" common/views/widgets/donation.vue: title: "寄付のお願い" diff --git a/src/client/app/common/views/widgets/calendar.vue b/src/client/app/common/views/widgets/calendar.vue index 9c8f1bff6..d928663bb 100644 --- a/src/client/app/common/views/widgets/calendar.vue +++ b/src/client/app/common/views/widgets/calendar.vue @@ -4,27 +4,27 @@

- {{ year }}年 - {{ month }}月 + %i18n:year-english%{{ year }}%i18n:year-japanese% + %i18n:month-english%{{ month }}%i18n:month-japanese%

-

{{ day }}日

-

{{ weekDay }}曜日

+

>%i18n:day-english%{{ day }}%i18n:day-japanese%

+

%i18n:weekday-english%{{ weekDay }}%i18n:weekday-japanese%

-

今日:{{ dayP.toFixed(1) }}%

+

%i18n:today%{{ dayP.toFixed(1) }}%

-

今月:{{ monthP.toFixed(1) }}%

+

%i18n:this-month%{{ monthP.toFixed(1) }}%

-

今年:{{ yearP.toFixed(1) }}%

+

%i18n:this-year%{{ yearP.toFixed(1) }}%

From d6fab5fd6c87489670a3617f1777b29caafb1740 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Wed, 1 Aug 2018 14:42:52 -0400 Subject: [PATCH 11/26] Translated desktop/views/components/settings.drive.vue --- locales/en.yml | 5 +++++ locales/ja.yml | 4 ++++ src/client/app/desktop/views/components/settings.drive.vue | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/locales/en.yml b/locales/en.yml index 7a1014940..0ee48eada 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -598,6 +598,11 @@ desktop/views/components/settings.api.vue: enter-password: "Please enter the password" desktop/views/components/settings.apps.vue: no-apps: "No linked applications" + +desktop/views/components/settings.drive.vue: + max: "Max " + in-use: " in use." + desktop/views/components/settings.mute.vue: no-users: "No muted users" desktop/views/components/settings.password.vue: diff --git a/locales/ja.yml b/locales/ja.yml index a542f7293..1f26e5018 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -682,6 +682,10 @@ desktop/views/components/settings.api.vue: desktop/views/components/settings.apps.vue: no-apps: "連携しているアプリケーションはありません" +desktop/views/components/settings.drive.vue: + max: "中" + in-use: "使用中" + desktop/views/components/settings.mute.vue: no-users: "ミュートしているユーザーはいません" diff --git a/src/client/app/desktop/views/components/settings.drive.vue b/src/client/app/desktop/views/components/settings.drive.vue index 8bb0c760a..e8a3cc968 100644 --- a/src/client/app/desktop/views/components/settings.drive.vue +++ b/src/client/app/desktop/views/components/settings.drive.vue @@ -2,7 +2,7 @@
From 5ab4d0c29b64d4941c3cf0b4dc150a124c4f99c1 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Wed, 1 Aug 2018 14:52:53 -0400 Subject: [PATCH 12/26] Translated desktop/views/pages/tag.vue More weird syntax fiddling. Should work nonetheless --- locales/en.yml | 6 ++++++ locales/ja.yml | 6 ++++++ src/client/app/desktop/views/pages/tag.vue | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/locales/en.yml b/locales/en.yml index 0ee48eada..493f70aae 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -724,6 +724,12 @@ desktop/views/pages/search.vue: desktop/views/pages/share.vue: share-with: "Share with Misskey" close: "Close" + +desktop/views/pages/tag.vue: + no-posts-found-english: "No posts were found for " + no-posts-found-japanese: "" + left-quote: "\"" + right-quote: "\"." desktop/views/pages/user-list.users.vue: users: "User" diff --git a/locales/ja.yml b/locales/ja.yml index 1f26e5018..fa8795e65 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -835,6 +835,12 @@ desktop/views/pages/share.vue: share-with: "Misskeyで共有" close: "閉じる" +desktop/views/pages/tag.vue: + no-posts-found-english: "" + no-posts-found-japanese: "に関する投稿は見つかりませんでした。" + left-quote: "「" + right-quote: "」" + desktop/views/pages/user-list.users.vue: users: "ユーザー" add-user: "ユーザーを追加" diff --git a/src/client/app/desktop/views/pages/tag.vue b/src/client/app/desktop/views/pages/tag.vue index 0b8fd81ac..19f7ad1c1 100644 --- a/src/client/app/desktop/views/pages/tag.vue +++ b/src/client/app/desktop/views/pages/tag.vue @@ -6,7 +6,7 @@
-

%fa:search%「{{ q }}」に関する投稿は見つかりませんでした。

+

%i18n:no-posts-found-english%%fa:search%%i18n:left-quote%{{ q }}%i18n:right-quote%%i18n:no-posts-found-japanese%

From fdaf483293e17eab916465e39bef683a750fca00 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Wed, 1 Aug 2018 14:54:57 -0400 Subject: [PATCH 13/26] Added i18n line and typo fix to desktop/views/pages/welcome.vue: --- locales/en.yml | 3 +++ locales/ja.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/locales/en.yml b/locales/en.yml index 493f70aae..ea81414a1 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -730,6 +730,9 @@ desktop/views/pages/tag.vue: no-posts-found-japanese: "" left-quote: "\"" right-quote: "\"." + +desktop/views/pages/welcome.vue: + powered-by-misskey: "Powered by Misskey." desktop/views/pages/user-list.users.vue: users: "User" diff --git a/locales/ja.yml b/locales/ja.yml index fa8795e65..41af0060a 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -841,6 +841,9 @@ desktop/views/pages/tag.vue: left-quote: "「" right-quote: "」" +desktop/views/pages/welcome.vue: + powered-by-misskey: "Powered by Misskey." + desktop/views/pages/user-list.users.vue: users: "ユーザー" add-user: "ユーザーを追加" From df74a4eb2072149eac74eab34cd9e186a567f2a3 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Wed, 1 Aug 2018 14:55:30 -0400 Subject: [PATCH 14/26] Forgot to add vue. here --- src/client/app/desktop/views/pages/welcome.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue index cac4007b4..1e5e06fbc 100644 --- a/src/client/app/desktop/views/pages/welcome.vue +++ b/src/client/app/desktop/views/pages/welcome.vue @@ -18,7 +18,7 @@

{{ name }}

Misskey

-

powerd by Misskey

+

%i18n:@powered-by-misskey%

📦 %i18n:@signup%
From 3ec3fa2d1eae9d97bc43486ed51a8dfff1b6a0c0 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Wed, 1 Aug 2018 15:04:00 -0400 Subject: [PATCH 15/26] Localized mobile/views/components/ui.header.vue Also added name i18n line, as to allow easier rebranding should there be any. --- locales/en.yml | 5 +++++ locales/ja.yml | 6 ++++-- src/client/app/mobile/views/components/ui.header.vue | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index ea81414a1..e2f087d26 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -13,6 +13,7 @@ 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!" + name: "Misskey" time: unknown: "unknown" future: "future" @@ -889,6 +890,10 @@ mobile/views/components/sub-note-content.vue: mobile/views/components/timeline.vue: empty: "No notes" load-more: "More" + +mobile/views/components/ui.header.vue: + welcome-back: "Welcome back, " + mobile/views/components/ui.nav.vue: timeline: "Timeline" notifications: "Notifications" diff --git a/locales/ja.yml b/locales/ja.yml index 41af0060a..4421befa8 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -6,7 +6,6 @@ common: misskey: "A ⭐ of fediverse" about-title: "A ⭐ of fediverse." about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた分散マイクロブログSNSです。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。" - customization-tips: title: "カスタマイズのヒント" paragraph1: "ホームのカスタマイズでは、ウィジェットを追加/削除したり、ドラッグ&ドロップして並べ替えたりすることができます。" @@ -14,7 +13,7 @@ common: paragraph3: "ウィジェットを削除するには、ヘッダーの「ゴミ箱」と書かれたエリアにウィジェットをドラッグ&ドロップします。" paragraph4: "カスタマイズを終了するには、右上の「完了」をクリックします。" gotit: "Got it!" - + name: "Misskey" time: unknown: "なぞのじかん" future: "未来" @@ -1033,6 +1032,9 @@ mobile/views/components/timeline.vue: empty: "投稿がありません" load-more: "もっと" +mobile/views/components/ui.header.vue: + welcome-back: "おかえりなさい、" + mobile/views/components/ui.nav.vue: timeline: "タイムライン" notifications: "通知" diff --git a/src/client/app/mobile/views/components/ui.header.vue b/src/client/app/mobile/views/components/ui.header.vue index c1ee70d10..794ec9a30 100644 --- a/src/client/app/mobile/views/components/ui.header.vue +++ b/src/client/app/mobile/views/components/ui.header.vue @@ -3,12 +3,12 @@
-

おかえりなさい、{{ $store.state.i | userName }}さん

+

%i18n:@welcome-back%{{ $store.state.i | userName }}さん

- Misskey + %i18n:common.name%

From 08afa44e09124388b1a30bbd27365d50ac15ffbc Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Wed, 1 Aug 2018 15:09:42 -0400 Subject: [PATCH 16/26] Localized mobile/views/pages/reversi.vue Also added common.name line, as to allow easier rebranding. --- locales/en.yml | 4 ++++ locales/ja.yml | 3 +++ src/client/app/mobile/views/pages/reversi.vue | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index e2f087d26..488659c3a 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -948,6 +948,10 @@ mobile/views/pages/note.vue: mobile/views/pages/notifications.vue: notifications: "Notifications" read-all: "Do you wish to mark all notifications as read?" + +mobile/views/pages/reversi.vue: + reversi: "Reversi" + mobile/views/pages/settings/settings.profile.vue: title: "Profile" name: "Name" diff --git a/locales/ja.yml b/locales/ja.yml index 4421befa8..324dd5b5e 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -1102,6 +1102,9 @@ mobile/views/pages/note.vue: mobile/views/pages/notifications.vue: notifications: "通知" read-all: "すべての通知を既読にしますか？" + +mobile/views/pages/reversi.vue: + reversi: "リバーシ" mobile/views/pages/settings/settings.profile.vue: title: "プロフィール" diff --git a/src/client/app/mobile/views/pages/reversi.vue b/src/client/app/mobile/views/pages/reversi.vue index 0cff1317a..a63f84aba 100644 --- a/src/client/app/mobile/views/pages/reversi.vue +++ b/src/client/app/mobile/views/pages/reversi.vue @@ -1,6 +1,6 @@ @@ -23,7 +23,7 @@ export default Vue.extend({ this.fetch(); }, mounted() { - document.title = 'Misskey リバーシ'; + document.title = '%i18n:common.name% %i18n:@reversi%'; document.documentElement.style.background = '#fff'; }, methods: { From bdde0c3c63f9579cb9f1281ca22722e7dac84a58 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Wed, 1 Aug 2018 16:37:36 -0400 Subject: [PATCH 17/26] Fixed welcome.vue build bug. --- locales/en.yml | 4 +--- locales/ja.yml | 4 +--- src/client/app/desktop/views/pages/welcome.vue | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index 488659c3a..3e2282b09 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -700,6 +700,7 @@ desktop/views/pages/welcome.vue: signin-button: "Log in" signup-button: "Sign up" timeline: "Timeline" + powered-by-misskey: "Powered by Misskey." desktop/views/pages/drive.vue: title: "Misskey storage" desktop/views/pages/favorites.vue: @@ -731,9 +732,6 @@ desktop/views/pages/tag.vue: no-posts-found-japanese: "" left-quote: "\"" right-quote: "\"." - -desktop/views/pages/welcome.vue: - powered-by-misskey: "Powered by Misskey." desktop/views/pages/user-list.users.vue: users: "User" diff --git a/locales/ja.yml b/locales/ja.yml index 324dd5b5e..052c5e2aa 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -803,6 +803,7 @@ desktop/views/pages/welcome.vue: signin-button: "やってる" signup-button: "やる" timeline: "タイムライン" + powered-by-misskey: "Powered by Misskey." desktop/views/pages/drive.vue: title: "Misskey Drive" @@ -840,9 +841,6 @@ desktop/views/pages/tag.vue: left-quote: "「" right-quote: "」" -desktop/views/pages/welcome.vue: - powered-by-misskey: "Powered by Misskey." - desktop/views/pages/user-list.users.vue: users: "ユーザー" add-user: "ユーザーを追加" diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue index 1e5e06fbc..7449a3e5a 100644 --- a/src/client/app/desktop/views/pages/welcome.vue +++ b/src/client/app/desktop/views/pages/welcome.vue @@ -8,7 +8,7 @@
- %i18n:common.misskey% {{ host }} + %i18n:common.name% {{ host }} %fa:user% {{ stats.originalUsersCount | number }} %fa:pencil-alt% {{ stats.originalNotesCount | number }} From 55d2ae2050a50cdc7f5b1ca0303739b48c5342a0 Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Wed, 1 Aug 2018 16:43:47 -0400 Subject: [PATCH 18/26] Translated mobile/views/pages/signup.vue --- locales/en.yml | 2 ++ locales/ja.yml | 3 +++ src/client/app/mobile/views/pages/signup.vue | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/locales/en.yml b/locales/en.yml index 3e2282b09..b8bab12c3 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -924,6 +924,8 @@ mobile/views/pages/drive.vue: more: "Load more" mobile/views/pages/followers.vue: followers-of: "Followers of {}" +mobile/views/pages/signup.vue: + lets-start: "Let's start! 📦" mobile/views/pages/following.vue: following-of: "Following of {}" mobile/views/pages/home.vue: diff --git a/locales/ja.yml b/locales/ja.yml index 052c5e2aa..5b4468352 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -1068,6 +1068,9 @@ mobile/views/pages/user-lists.vue: mobile/views/pages/drive.vue: drive: "ドライブ" more: "もっと見る" + +mobile/views/pages/signup.vue: + lets-start: "📦 始めましょう" mobile/views/pages/followers.vue: followers-of: "{}のフォロワー" diff --git a/src/client/app/mobile/views/pages/signup.vue b/src/client/app/mobile/views/pages/signup.vue index 238d386ef..aac2ee431 100644 --- a/src/client/app/mobile/views/pages/signup.vue +++ b/src/client/app/mobile/views/pages/signup.vue @@ -1,6 +1,6 @@ From 9652440579370b9302e2e30082d4bcd89255913f Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Wed, 1 Aug 2018 17:30:35 -0400 Subject: [PATCH 19/26] Translated mobile/views/pages/welcome.vue --- locales/en.yml | 7 +++++++ locales/ja.yml | 9 +++++++++ src/client/app/mobile/views/pages/tag.vue | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/locales/en.yml b/locales/en.yml index b8bab12c3..e2b6d8a69 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -926,6 +926,13 @@ mobile/views/pages/followers.vue: followers-of: "Followers of {}" mobile/views/pages/signup.vue: lets-start: "Let's start! 📦" +mobile/views/pages/tag.vue: + no-posts-found-japanese: "" + no-posts-found-english: "No posts were found for " + left-quote: "\"" + right-quote: "\"." +mobile/views/pages/welcome.vue: + signup: "Sign up." mobile/views/pages/following.vue: following-of: "Following of {}" mobile/views/pages/home.vue: diff --git a/locales/ja.yml b/locales/ja.yml index 5b4468352..a55941eaa 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -1084,6 +1084,15 @@ mobile/views/pages/home.vue: hybrid: "ソーシャル" global: "グローバル" +mobile/views/pages/tag.vue: + no-posts-found-japanese: "に関する投稿は見つかりませんでした。" + no-posts-found-english: "" + left-quote: "「" + right-quote: "」" + +mobile/views/pages/welcome.vue: + signup: "新規登録" + mobile/views/pages/messaging.vue: messaging: "メッセージ" diff --git a/src/client/app/mobile/views/pages/tag.vue b/src/client/app/mobile/views/pages/tag.vue index b4c993e66..c94fcec7d 100644 --- a/src/client/app/mobile/views/pages/tag.vue +++ b/src/client/app/mobile/views/pages/tag.vue @@ -3,7 +3,7 @@ %fa:hashtag%{{ $route.params.tag }}
-

%fa:search%「{{ q }}」に関する投稿は見つかりませんでした。

+

%fa:search%%i18n:@no-posts-found-english%%i18n:@left-quote%{{ q }}%i18n:@right-quote%%i18n:@no-posts-found-japanese%

From b608e594af42dbe3ceb1a37f97eb64c0472e4a9e Mon Sep 17 00:00:00 2001 From: gutfuckllc <40531868+gutfuckllc@users.noreply.github.com> Date: Wed, 1 Aug 2018 17:30:54 -0400 Subject: [PATCH 20/26] Translated mobile/views/pages/welcome.vue --- src/client/app/mobile/views/pages/welcome.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/app/mobile/views/pages/welcome.vue b/src/client/app/mobile/views/pages/welcome.vue index ec21588ad..d7c874af9 100644 --- a/src/client/app/mobile/views/pages/welcome.vue +++ b/src/client/app/mobile/views/pages/welcome.vue @@ -6,7 +6,7 @@

{{ name || 'unidentified' }}

- +