diff --git a/locales/en-US.yml b/locales/en-US.yml index 91be94fbf..19bff4372 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -32,6 +32,7 @@ instance: "Instance" settings: "Settings" profile: "Profile" timeline: "Timeline" +globalTimeline: "Global" noAccountDescription: "This user has not written a profile description" login: "Login" loginWaiting: "Logging in" diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index da517e336..b1cc9ec67 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -34,6 +34,7 @@ instance: "インスタンス" settings: "設定" profile: "プロフィール" timeline: "タイムライン" +globalTimeline: "グローバル" noAccountDescription: "自己紹介はありません" login: "ログイン" loginWaiting: "ログイン中" diff --git a/src/client/app.ui.vue b/src/client/app.ui.vue index f190281b0..d22ca132e 100644 --- a/src/client/app.ui.vue +++ b/src/client/app.ui.vue @@ -47,7 +47,8 @@
- + +
diff --git a/src/client/pages/index.global.timeline.vue b/src/client/pages/index.global.timeline.vue new file mode 100644 index 000000000..ef796fc78 --- /dev/null +++ b/src/client/pages/index.global.timeline.vue @@ -0,0 +1,46 @@ + + + diff --git a/src/client/pages/index.global.vue b/src/client/pages/index.global.vue new file mode 100644 index 000000000..aa4b8e34f --- /dev/null +++ b/src/client/pages/index.global.vue @@ -0,0 +1,30 @@ + + + diff --git a/src/client/pages/index.vue b/src/client/pages/index.vue index 732d9b71c..2010b1b33 100644 --- a/src/client/pages/index.vue +++ b/src/client/pages/index.vue @@ -5,10 +5,12 @@