diff --git a/locales/en.yml b/locales/en.yml index e7d878f20a..a2bd9aa1be 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -50,6 +50,15 @@ common: my-token-regenerated: "Your token is just regenerated, so you will signout." tags: + mk-nav-links: + about: "About" + stats: "Stats" + status: "Status" + wiki: "Wiki" + donors: "Donors" + repository: "Repository" + develop: "Developers" + mk-messaging-form: attach-from-local: "Attach file from your pc" attach-from-drive: "Attach file from the drive" @@ -256,15 +265,6 @@ desktop: cancel: "Cancel" upload: "Upload a file(s) from you PC" - mk-nav-home-widget: - about: "About" - stats: "Stats" - status: "Status" - wiki: "Wiki" - donors: "Donors" - repository: "Repository" - develop: "Developers" - mk-ui-header-nav: home: "Home" messaging: "Messages" @@ -408,6 +408,8 @@ desktop: title: "Are you sure you want to repost this post?" mk-user: + last-used-at: "Last used at" + photos: title: "Photos" loading: "Loading" diff --git a/locales/ja.yml b/locales/ja.yml index f386a38249..d0292e8c42 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -50,6 +50,15 @@ common: my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。" tags: + mk-nav-links: + about: "Misskeyについて" + stats: "統計" + status: "ステータス" + wiki: "Wiki" + donors: "ドナー" + repository: "リポジトリ" + develop: "開発者" + mk-messaging-form: attach-from-local: "PCからファイルを添付する" attach-from-drive: "ドライブからファイルを添付する" @@ -256,15 +265,6 @@ desktop: cancel: "キャンセル" upload: "PCからドライブにファイルをアップロード" - mk-nav-home-widget: - about: "Misskeyについて" - stats: "統計" - status: "ステータス" - wiki: "Wiki" - donors: "ドナー" - repository: "リポジトリ" - develop: "開発者" - mk-ui-header-nav: home: "ホーム" messaging: "メッセージ" @@ -408,6 +408,8 @@ desktop: title: "この投稿をRepostしますか?" mk-user: + last-used-at: "最終アクセス" + photos: title: "フォト" loading: "読み込み中" diff --git a/src/web/app/common/tags/index.ts b/src/web/app/common/tags/index.ts index 35a9f4586e..2f4e1181d4 100644 --- a/src/web/app/common/tags/index.ts +++ b/src/web/app/common/tags/index.ts @@ -28,3 +28,4 @@ require('./reaction-picker.tag'); require('./reactions-viewer.tag'); require('./reaction-icon.tag'); require('./post-menu.tag'); +require('./nav-links.tag'); diff --git a/src/web/app/common/tags/nav-links.tag b/src/web/app/common/tags/nav-links.tag new file mode 100644 index 0000000000..b09e376b34 --- /dev/null +++ b/src/web/app/common/tags/nav-links.tag @@ -0,0 +1,7 @@ + + %i18n:common.tags.mk-nav-links.about%%i18n:common.tags.mk-nav-links.stats%%i18n:common.tags.mk-nav-links.status%%i18n:common.tags.mk-nav-links.wiki%%i18n:common.tags.mk-nav-links.donors%%i18n:common.tags.mk-nav-links.repository%%i18n:common.tags.mk-nav-links.develop%Follow us on + + diff --git a/src/web/app/desktop/assets/index.jpg b/src/web/app/desktop/assets/index.jpg new file mode 100644 index 0000000000..10c412efe2 Binary files /dev/null and b/src/web/app/desktop/assets/index.jpg differ diff --git a/src/web/app/desktop/tags/home-widgets/nav.tag b/src/web/app/desktop/tags/home-widgets/nav.tag index f179005734..61c0b4cb55 100644 --- a/src/web/app/desktop/tags/home-widgets/nav.tag +++ b/src/web/app/desktop/tags/home-widgets/nav.tag @@ -1,4 +1,5 @@ -%i18n:desktop.tags.mk-nav-home-widget.about%%i18n:desktop.tags.mk-nav-home-widget.stats%%i18n:desktop.tags.mk-nav-home-widget.status%%i18n:desktop.tags.mk-nav-home-widget.wiki%%i18n:desktop.tags.mk-nav-home-widget.donors%%i18n:desktop.tags.mk-nav-home-widget.repository%%i18n:desktop.tags.mk-nav-home-widget.develop%Follow us on + + + + + +
+

+

{ user ? user.name : 'アカウント' }

+

+ +
+
or
+ Misskeyについて + + +
+ + + + + + diff --git a/src/web/app/desktop/tags/pages/entrance/signin.tag b/src/web/app/desktop/tags/pages/entrance/signin.tag deleted file mode 100644 index 0b33412496..0000000000 --- a/src/web/app/desktop/tags/pages/entrance/signin.tag +++ /dev/null @@ -1,134 +0,0 @@ - -
-

-

{ user ? user.name : 'アカウント' }

-

- -
-
or
- Misskeyについて - - -
diff --git a/src/web/app/desktop/tags/pages/entrance/signup.tag b/src/web/app/desktop/tags/pages/entrance/signup.tag deleted file mode 100644 index 0722d82a65..0000000000 --- a/src/web/app/desktop/tags/pages/entrance/signup.tag +++ /dev/null @@ -1,47 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/tags/user.tag b/src/web/app/desktop/tags/user.tag index f01d2a039b..d944bb33a7 100644 --- a/src/web/app/desktop/tags/user.tag +++ b/src/web/app/desktop/tags/user.tag @@ -610,6 +610,7 @@ +

%i18n:desktop.tags.mk-user.last-used-at%:

@@ -619,6 +620,7 @@ +