From 0d6ccd489dce89c2920bc806216b9c2585fe1a88 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 27 May 2018 22:39:20 +0900 Subject: [PATCH] :v: --- locales/ja.yml | 46 +++++--- src/client/app/common/views/widgets/index.ts | 2 + src/client/app/common/views/widgets/memo.vue | 110 ++++++++++++++++++ .../app/desktop/views/components/home.vue | 39 ++++--- src/client/app/mobile/views/pages/widgets.vue | 23 ++-- src/client/app/store.ts | 3 +- 6 files changed, 173 insertions(+), 50 deletions(-) create mode 100644 src/client/app/common/views/widgets/memo.vue diff --git a/locales/ja.yml b/locales/ja.yml index ab87494f93..90764f7e60 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -43,6 +43,28 @@ common: update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。" my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。" + widgets: + profile: "プロフィール" + calendar: "カレンダー" + timemachine: "カレンダー(タイムマシン)" + activity: "アクティビティ" + rss: "RSSリーダー" + memo: "メモ" + trends: "トレンド" + photo-stream: "フォトストリーム" + slideshow: "スライドショー" + version: "バージョン" + broadcast: "ブロードキャスト" + notifications: "通知" + users: "おすすめユーザー" + polls: "投票" + post-form: "投稿フォーム" + messaging: "メッセージ" + server: "サーバー情報" + donation: "寄付のお願い" + nav: "ナビゲーション" + tips: "ヒント" + common/views/components/connect-failed.vue: title: "サーバーに接続できません" description: "インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから{再度お試し}ください。" @@ -201,6 +223,11 @@ common/views/widgets/server.vue: title: "サーバー情報" toggle: "表示を切り替え" +common/views/widgets/memo.vue: + title: "メモ" + memo: "ここに書いて!" + save: "保存" + desktop/views/components/activity.chart.vue: total: "Black ... Total" notes: "Blue ... Notes" @@ -319,25 +346,6 @@ desktop/views/components/game-window.vue: desktop/views/components/home.vue: done: "完了" add-widget: "ウィジェットを追加:" - profile: "プロフィール" - calendar: "カレンダー" - timemachine: "カレンダー(タイムマシン)" - activity: "アクティビティ" - rss: "RSSリーダー" - trends: "トレンド" - photostream: "フォトストリーム" - slideshow: "スライドショー" - version: "バージョン" - broadcast: "ブロードキャスト" - notifications: "通知" - users: "おすすめユーザー" - polls: "投票" - post-form: "投稿フォーム" - messaging: "メッセージ" - server: "サーバー情報" - donation: "寄付のお願い" - nav: "ナビゲーション" - tips: "ヒント" add: "追加" desktop/views/input-dialog.vue: diff --git a/src/client/app/common/views/widgets/index.ts b/src/client/app/common/views/widgets/index.ts index 9107d90ce7..7ef4e02092 100644 --- a/src/client/app/common/views/widgets/index.ts +++ b/src/client/app/common/views/widgets/index.ts @@ -3,6 +3,7 @@ import Vue from 'vue'; import wVersion from './version.vue'; import wRss from './rss.vue'; import wServer from './server.vue'; +import wMemo from './memo.vue'; import wBroadcast from './broadcast.vue'; import wCalendar from './calendar.vue'; import wPhotoStream from './photo-stream.vue'; @@ -19,5 +20,6 @@ Vue.component('mkw-tips', wTips); Vue.component('mkw-donation', wDonation); Vue.component('mkw-broadcast', wBroadcast); Vue.component('mkw-server', wServer); +Vue.component('mkw-memo', wMemo); Vue.component('mkw-rss', wRss); Vue.component('mkw-version', wVersion); diff --git a/src/client/app/common/views/widgets/memo.vue b/src/client/app/common/views/widgets/memo.vue new file mode 100644 index 0000000000..3f599c82a0 --- /dev/null +++ b/src/client/app/common/views/widgets/memo.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/src/client/app/desktop/views/components/home.vue b/src/client/app/desktop/views/components/home.vue index 9d34575e55..f51fed7454 100644 --- a/src/client/app/desktop/views/components/home.vue +++ b/src/client/app/desktop/views/components/home.vue @@ -6,25 +6,26 @@

%i18n:@add-widget%

diff --git a/src/client/app/mobile/views/pages/widgets.vue b/src/client/app/mobile/views/pages/widgets.vue index 03abcabe8f..9d047fa635 100644 --- a/src/client/app/mobile/views/pages/widgets.vue +++ b/src/client/app/mobile/views/pages/widgets.vue @@ -8,17 +8,18 @@