From 87d3a06dcd6a76120789c050dd6a0c7111bf7224 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 8 Apr 2019 23:05:41 +0900 Subject: [PATCH] revert rename --- locales/ja-JP.yml | 6 +++--- .../app/common/views/deck/deck.column-core.vue | 2 +- .../app/common/views/deck/deck.tl-column.vue | 4 ++-- src/client/app/common/views/deck/deck.tl.vue | 6 +++--- src/client/app/common/views/deck/deck.vue | 6 +++--- .../app/desktop/views/home/timeline.core.vue | 6 +++--- src/client/app/desktop/views/home/timeline.vue | 6 +++--- .../app/mobile/views/pages/home.timeline.vue | 6 +++--- src/client/app/mobile/views/pages/home.vue | 10 +++++----- src/docs/stream.ja-JP.md | 2 +- .../{social-timeline.ts => hybrid-timeline.ts} | 2 +- .../{social-timeline.ts => hybrid-timeline.ts} | 2 +- src/server/api/stream/channels/index.ts | 4 ++-- test/streaming.ts | 14 +++++++------- 14 files changed, 38 insertions(+), 38 deletions(-) rename src/server/api/endpoints/notes/{social-timeline.ts => hybrid-timeline.ts} (98%) rename src/server/api/stream/channels/{social-timeline.ts => hybrid-timeline.ts} (97%) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index a36817688c..927eefb5ba 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1088,7 +1088,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" - social: "ソーシャル" + hybrid: "ソーシャル" global: "グローバル" mentions: "あなた宛て" messages: "ダイレクト投稿" @@ -1665,7 +1665,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" - social: "ソーシャル" + hybrid: "ソーシャル" global: "グローバル" mentions: "あなた宛て" messages: "ダイレクト投稿" @@ -1735,7 +1735,7 @@ deck: widgets: "ウィジェット" home: "ホーム" local: "ローカル" - social: "ソーシャル" + hybrid: "ソーシャル" hashtag: "ハッシュタグ" global: "グローバル" mentions: "あなた宛て" diff --git a/src/client/app/common/views/deck/deck.column-core.vue b/src/client/app/common/views/deck/deck.column-core.vue index e3f92dea16..974c58235d 100644 --- a/src/client/app/common/views/deck/deck.column-core.vue +++ b/src/client/app/common/views/deck/deck.column-core.vue @@ -3,7 +3,7 @@ - + diff --git a/src/client/app/common/views/deck/deck.tl-column.vue b/src/client/app/common/views/deck/deck.tl-column.vue index f6a9ee5286..5ab8ccb12f 100644 --- a/src/client/app/common/views/deck/deck.tl-column.vue +++ b/src/client/app/common/views/deck/deck.tl-column.vue @@ -3,7 +3,7 @@