From 1855ab60f193fc5b434a311213b08a0c249a5162 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 4 Nov 2018 23:00:43 +0900 Subject: [PATCH] Resolve #3098 --- .config/example.yml | 3 -- locales/ja-JP.yml | 12 ++++++-- src/client/app/admin/views/instance.vue | 22 +++++++++++++-- src/config/load.ts | 2 -- src/config/types.ts | 2 -- src/models/meta.ts | 28 +++++++++++++++++++ src/server/api/endpoints/admin/update-meta.ts | 22 +++++++++++++++ src/server/api/endpoints/meta.ts | 4 +-- src/server/api/mastodon.ts | 4 +-- 9 files changed, 82 insertions(+), 17 deletions(-) diff --git a/.config/example.yml b/.config/example.yml index 5b085e2a5..c0afcc4a6 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -1,6 +1,3 @@ -name: example-instance-name # Name of your instance -description: example-description # Description of your instance - maintainer: name: example-maitainer-name # Your name url: http://example.com/ # Your contact (http or mailto) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index a835b1451..fceb46247 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1071,10 +1071,16 @@ admin/views/dashboard.vue: instances: "インスタンス" this-instance: "このインスタンス" federated: "連合" + +admin/views/instance.vue: + instance: "インスタンス" + instance-name: "インスタンス名" + instance-description: "インスタンスの紹介" + banner-url: "バナー画像URL" + disableRegistration: "ユーザー登録の受付を停止する" + disableLocalTimeline: "ローカルタイムラインを無効にする" invite: "招待" - banner-url: "Banner URL" - disableRegistration: "Disable new user registration" - disableLocalTimeline: "Disable the local timeline" + save: "保存" admin/views/charts.vue: title: "チャート" diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue index 1278f38a9..b63179c20 100644 --- a/src/client/app/admin/views/instance.vue +++ b/src/client/app/admin/views/instance.vue @@ -1,9 +1,11 @@