From 06b66f020916eb73919c64278e07fe51d80ecc3e Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 7 Nov 2018 01:12:26 +0900 Subject: メンテナ情報をDBに保存するように MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/app/admin/views/instance.vue | 11 +++++++++++ src/client/app/common/views/components/signup.vue | 2 +- src/client/app/common/views/widgets/donation.vue | 2 +- src/client/app/common/views/widgets/server.info.vue | 2 +- src/client/app/desktop/views/components/settings.vue | 2 +- src/client/app/desktop/views/pages/welcome.vue | 2 +- src/client/app/mobile/views/pages/welcome.vue | 2 +- 7 files changed, 17 insertions(+), 6 deletions(-) (limited to 'src/client') diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue index 5acb493332..c92326aa07 100644 --- a/src/client/app/admin/views/instance.vue +++ b/src/client/app/admin/views/instance.vue @@ -7,6 +7,11 @@ %i18n:@instance-description% %i18n:@banner-url% +
+
%i18n:@maintainer-config%
+ %i18n:@maintainer-name% + %i18n:@maintainer-email% +
%i18n:@max-note-text-length%
@@ -56,6 +61,8 @@ import Vue from "vue"; export default Vue.extend({ data() { return { + maintainerName: null, + maintainerEmail: null, disableRegistration: false, disableLocalTimeline: false, bannerUrl: null, @@ -75,6 +82,8 @@ export default Vue.extend({ created() { (this as any).os.getMeta().then(meta => { + this.maintainerName = meta.maintainer.name; + this.maintainerEmail = meta.maintainer.email; this.bannerUrl = meta.bannerUrl; this.name = meta.name; this.description = meta.description; @@ -103,6 +112,8 @@ export default Vue.extend({ updateMeta() { (this as any).api('admin/update-meta', { + maintainerName: this.maintainerName, + maintainerEmail: this.maintainerEmail, disableRegistration: this.disableRegistration, disableLocalTimeline: this.disableLocalTimeline, bannerUrl: this.bannerUrl, diff --git a/src/client/app/common/views/components/signup.vue b/src/client/app/common/views/components/signup.vue index 91a09e14fb..d743202c27 100644 --- a/src/client/app/common/views/components/signup.vue +++ b/src/client/app/common/views/components/signup.vue @@ -4,7 +4,7 @@ %i18n:@invitation-code% -

+

%i18n:@username% diff --git a/src/client/app/common/views/widgets/donation.vue b/src/client/app/common/views/widgets/donation.vue index 4ef1557f97..3321b768e1 100644 --- a/src/client/app/common/views/widgets/donation.vue +++ b/src/client/app/common/views/widgets/donation.vue @@ -5,7 +5,7 @@

%i18n:@title%

{{ '%i18n:@text%'.substr(0, '%i18n:@text%'.indexOf('{')) }} - {{ meta.maintainer.name }} + {{ meta.maintainer.name }} {{ '%i18n:@text%'.substr('%i18n:@text%'.indexOf('}') + 1) }}

diff --git a/src/client/app/common/views/widgets/server.info.vue b/src/client/app/common/views/widgets/server.info.vue index d243629506..3cb1748128 100644 --- a/src/client/app/common/views/widgets/server.info.vue +++ b/src/client/app/common/views/widgets/server.info.vue @@ -1,6 +1,6 @@