From 7792192848ca3442474377403fc99e4e94709750 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 9 Dec 2017 20:45:08 +0900
Subject: [PATCH] :v:
---
locales/en.yml | 13 ++++++++++++-
locales/ja.yml | 11 +++++++++++
src/web/app/desktop/tags/settings.tag | 16 ++++++++--------
3 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/locales/en.yml b/locales/en.yml
index 16f68ab632..b1fe4a50b3 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -288,6 +288,15 @@ desktop:
mk-ui-header-notifications:
title: "Notifications"
+ mk-profile-setting:
+ avatar: "Avatar"
+ choice-avatar: "Choice an image"
+ name: "Name"
+ location: "Location"
+ description: "Description"
+ birthday: "Birthday"
+ save: "Update profile"
+
mk-password-setting:
reset: "Change your password"
enter-current-password: "Enter the current password"
@@ -297,7 +306,9 @@ desktop:
changed: "Password updated successfully"
mk-2fa-setting:
- intro: "If you set up 2-step verification, you will need not only a password at sign-in but also a pre-registered physical device (such as your smartphone), which will improve security."
+ intro: "If you set up 2-step verification, you will need not only a password at sign-in but also a pre-registered physical device (such as your smartphone), which will improve security. "
+ detail: "See details..."
+ url: "https://www.google.com/landing/2step/"
caution: "As a caveat, security improves, but you can not sign in to Misskey if you lose a registered device, etc."
register: "Register a device"
enter-password: "Enter the password"
diff --git a/locales/ja.yml b/locales/ja.yml
index f50e50a5ce..12f5580e2d 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -288,6 +288,15 @@ desktop:
mk-ui-header-notifications:
title: "通知"
+ mk-profile-setting:
+ avatar: "アバター"
+ choice-avatar: "画像を選択"
+ name: "名前"
+ location: "場所"
+ description: "自己紹介"
+ birthday: "誕生日"
+ save: "保存"
+
mk-password-setting:
reset: "パスワードを変更する"
enter-current-password: "現在のパスワードを入力してください"
@@ -298,6 +307,8 @@ desktop:
mk-2fa-setting:
intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
+ detail: "詳細..."
+ url: "https://www.google.co.jp/intl/ja/landing/2step/"
caution: "登録したデバイスを紛失するなどした場合、Misskeyにサインインできなくなりますのでご注意ください。"
register: "デバイスを登録する"
enter-password: "パスワードを入力してください"
diff --git a/src/web/app/desktop/tags/settings.tag b/src/web/app/desktop/tags/settings.tag
index b6e50cdb42..63458baa2c 100644
--- a/src/web/app/desktop/tags/settings.tag
+++ b/src/web/app/desktop/tags/settings.tag
@@ -130,26 +130,26 @@
<mk-profile-setting>
<label class="avatar ui from group">
- <p>アバター</p><img class="avatar" src={ I.avatar_url + '?thumbnail&size=64' } alt="avatar"/>
- <button class="ui" onclick={ avatar }>画像を選択</button>
+ <p>%i18n:desktop.tags.mk-profile-setting.avatar%</p><img class="avatar" src={ I.avatar_url + '?thumbnail&size=64' } alt="avatar"/>
+ <button class="ui" onclick={ avatar }>%i18n:desktop.tags.mk-profile-setting.choice-avatar%</button>
</label>
<label class="ui from group">
- <p>名前</p>
+ <p>%i18n:desktop.tags.mk-profile-setting.name%</p>
<input ref="accountName" type="text" value={ I.name } class="ui"/>
</label>
<label class="ui from group">
- <p>場所</p>
+ <p>%i18n:desktop.tags.mk-profile-setting.location%</p>
<input ref="accountLocation" type="text" value={ I.profile.location } class="ui"/>
</label>
<label class="ui from group">
- <p>自己紹介</p>
+ <p>%i18n:desktop.tags.mk-profile-setting.description%</p>
<textarea ref="accountDescription" class="ui">{ I.description }</textarea>
</label>
<label class="ui from group">
- <p>誕生日</p>
+ <p>%i18n:desktop.tags.mk-profile-setting.birthday%</p>
<input ref="accountBirthday" type="date" value={ I.profile.birthday } class="ui"/>
</label>
- <button class="ui primary" onclick={ updateAccount }>保存</button>
+ <button class="ui primary" onclick={ updateAccount }>%i18n:desktop.tags.mk-profile-setting.save%</button>
<style>
:scope
display block
@@ -259,7 +259,7 @@
</mk-password-setting>
<mk-2fa-setting>
- <p>%i18n:desktop.tags.mk-2fa-setting.intro%</p>
+ <p>%i18n:desktop.tags.mk-2fa-setting.intro%<a href="%i18n:desktop.tags.mk-2fa-setting.url%" target="_blank">%i18n:desktop.tags.mk-2fa-setting.detail%</a></p>
<div class="ui info warn"><p>%fa:exclamation-triangle%%i18n:desktop.tags.mk-2fa-setting.caution%</p></div>
<p if={ !data }><button onclick={ register } class="ui primary">%i18n:desktop.tags.mk-2fa-setting.register%</button></p>
<div if={ data }>