Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
342
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
27
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TransFem.org
Sharkey
Commits
77921928
Commit
77921928
authored
7 years ago
by
syuilo
Browse files
Options
Downloads
Patches
Plain Diff
✌️
parent
510eba46
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
locales/en.yml
+12
-1
12 additions, 1 deletion
locales/en.yml
locales/ja.yml
+11
-0
11 additions, 0 deletions
locales/ja.yml
src/web/app/desktop/tags/settings.tag
+8
-8
8 additions, 8 deletions
src/web/app/desktop/tags/settings.tag
with
31 additions
and
9 deletions
locales/en.yml
+
12
−
1
View file @
77921928
...
@@ -288,6 +288,15 @@ desktop:
...
@@ -288,6 +288,15 @@ desktop:
mk-ui-header-notifications
:
mk-ui-header-notifications
:
title
:
"
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
:
mk-password-setting
:
reset
:
"
Change
your
password"
reset
:
"
Change
your
password"
enter-current-password
:
"
Enter
the
current
password"
enter-current-password
:
"
Enter
the
current
password"
...
@@ -297,7 +306,9 @@ desktop:
...
@@ -297,7 +306,9 @@ desktop:
changed
:
"
Password
updated
successfully"
changed
:
"
Password
updated
successfully"
mk-2fa-setting
:
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."
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"
register
:
"
Register
a
device"
enter-password
:
"
Enter
the
password"
enter-password
:
"
Enter
the
password"
...
...
This diff is collapsed.
Click to expand it.
locales/ja.yml
+
11
−
0
View file @
77921928
...
@@ -288,6 +288,15 @@ desktop:
...
@@ -288,6 +288,15 @@ desktop:
mk-ui-header-notifications
:
mk-ui-header-notifications
:
title
:
"
通知"
title
:
"
通知"
mk-profile-setting
:
avatar
:
"
アバター"
choice-avatar
:
"
画像を選択"
name
:
"
名前"
location
:
"
場所"
description
:
"
自己紹介"
birthday
:
"
誕生日"
save
:
"
保存"
mk-password-setting
:
mk-password-setting
:
reset
:
"
パスワードを変更する"
reset
:
"
パスワードを変更する"
enter-current-password
:
"
現在のパスワードを入力してください"
enter-current-password
:
"
現在のパスワードを入力してください"
...
@@ -298,6 +307,8 @@ desktop:
...
@@ -298,6 +307,8 @@ desktop:
mk-2fa-setting
:
mk-2fa-setting
:
intro
:
"
二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
intro
:
"
二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
detail
:
"
詳細..."
url
:
"
https://www.google.co.jp/intl/ja/landing/2step/"
caution
:
"
登録したデバイスを紛失するなどした場合、Misskeyにサインインできなくなりますのでご注意ください。"
caution
:
"
登録したデバイスを紛失するなどした場合、Misskeyにサインインできなくなりますのでご注意ください。"
register
:
"
デバイスを登録する"
register
:
"
デバイスを登録する"
enter-password
:
"
パスワードを入力してください"
enter-password
:
"
パスワードを入力してください"
...
...
This diff is collapsed.
Click to expand it.
src/web/app/desktop/tags/settings.tag
+
8
−
8
View file @
77921928
...
@@ -130,26 +130,26 @@
...
@@ -130,26 +130,26 @@
<mk-profile-setting>
<mk-profile-setting>
<label class="avatar ui from group">
<label class="avatar ui from group">
<p>
アバター
</p><img class="avatar" src={ I.avatar_url + '?thumbnail&size=64' } alt="avatar"/>
<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 }>
画像を選択
</button>
<button class="ui" onclick={ avatar }>
%i18n:desktop.tags.mk-profile-setting.choice-avatar%
</button>
</label>
</label>
<label class="ui from group">
<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"/>
<input ref="accountName" type="text" value={ I.name } class="ui"/>
</label>
</label>
<label class="ui from group">
<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"/>
<input ref="accountLocation" type="text" value={ I.profile.location } class="ui"/>
</label>
</label>
<label class="ui from group">
<label class="ui from group">
<p>
自己紹介
</p>
<p>
%i18n:desktop.tags.mk-profile-setting.description%
</p>
<textarea ref="accountDescription" class="ui">{ I.description }</textarea>
<textarea ref="accountDescription" class="ui">{ I.description }</textarea>
</label>
</label>
<label class="ui from group">
<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"/>
<input ref="accountBirthday" type="date" value={ I.profile.birthday } class="ui"/>
</label>
</label>
<button class="ui primary" onclick={ updateAccount }>
保存
</button>
<button class="ui primary" onclick={ updateAccount }>
%i18n:desktop.tags.mk-profile-setting.save%
</button>
<style>
<style>
:scope
:scope
display block
display block
...
@@ -259,7 +259,7 @@
...
@@ -259,7 +259,7 @@
</mk-password-setting>
</mk-password-setting>
<mk-2fa-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>
<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>
<p if={ !data }><button onclick={ register } class="ui primary">%i18n:desktop.tags.mk-2fa-setting.register%</button></p>
<div if={ data }>
<div if={ data }>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment