diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-11-11 12:43:52 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-11-11 12:43:52 +0900 |
| commit | a59f53e6da98003f995088b2727a8c7bd76be77e (patch) | |
| tree | c2f8e4c238baab68f008fdf2c3e494bc5539673f /src/client/app/common | |
| parent | Fix chart engine (diff) | |
| parent | show self host in unicode (#3200) (diff) | |
| download | misskey-a59f53e6da98003f995088b2727a8c7bd76be77e.tar.gz misskey-a59f53e6da98003f995088b2727a8c7bd76be77e.tar.bz2 misskey-a59f53e6da98003f995088b2727a8c7bd76be77e.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/client/app/common')
4 files changed, 8 insertions, 4 deletions
diff --git a/src/client/app/common/views/components/acct.vue b/src/client/app/common/views/components/acct.vue index 542fbb4296..69259ab60f 100644 --- a/src/client/app/common/views/components/acct.vue +++ b/src/client/app/common/views/components/acct.vue @@ -8,11 +8,12 @@ <script lang="ts"> import Vue from 'vue'; import { host } from '../../../config'; +import { toUnicode } from 'punycode'; export default Vue.extend({ props: ['user', 'detail'], data() { return { - host + host: toUnicode(host) }; } }); diff --git a/src/client/app/common/views/components/profile-editor.vue b/src/client/app/common/views/components/profile-editor.vue index 8bb1841dc1..034c3bed8c 100644 --- a/src/client/app/common/views/components/profile-editor.vue +++ b/src/client/app/common/views/components/profile-editor.vue @@ -73,12 +73,13 @@ import Vue from 'vue'; import i18n from '../../../i18n'; import { apiUrl, host } from '../../../config'; +import { toUnicode } from 'punycode'; export default Vue.extend({ i18n: i18n('common/views/components/profile-editor.vue'), data() { return { - host, + host: toUnicode(host), name: null, username: null, location: null, diff --git a/src/client/app/common/views/components/signin.vue b/src/client/app/common/views/components/signin.vue index 21ff45ab5a..e02e613750 100644 --- a/src/client/app/common/views/components/signin.vue +++ b/src/client/app/common/views/components/signin.vue @@ -21,6 +21,7 @@ import Vue from 'vue'; import i18n from '../../../i18n'; import { apiUrl, host } from '../../../config'; +import { toUnicode } from 'punycode'; export default Vue.extend({ i18n: i18n('common/views/components/signin.vue'), @@ -39,7 +40,7 @@ export default Vue.extend({ password: '', token: '', apiUrl, - host + host: toUnicode(host) }; }, methods: { diff --git a/src/client/app/common/views/components/signup.vue b/src/client/app/common/views/components/signup.vue index 00580ef32e..03ba30c08a 100644 --- a/src/client/app/common/views/components/signup.vue +++ b/src/client/app/common/views/components/signup.vue @@ -46,12 +46,13 @@ import Vue from 'vue'; import i18n from '../../../i18n'; const getPasswordStrength = require('syuilo-password-strength'); import { host, url } from '../../../config'; +import { toUnicode } from 'punycode'; export default Vue.extend({ i18n: i18n('common/views/components/signup.vue'), data() { return { - host, + host: toUnicode(host), username: '', password: '', retypedPassword: '', |