vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update settings to re-use admin layout, one big navigation tree, improve settings forms

Browse source
This commit is contained in:
Eugen Rochko 2017-01-28 03:56:10 +01:00
parent 04bce0cdf2
commit f4bc9620a9
22 changed files with 169 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/locales/en.yml
View file

@ -31,10 +31,11 @@ en:
applications:
invalid_url: The provided URL is invalid
auth:
change_password: Change password
change_password: Credentials
didnt_get_confirmation: Didn't receive confirmation instructions?
forgot_password: Forgot your password?
login: Log in
logout: Logout
register: Sign up
resend_confirmation: Resend confirmation instructions
reset_password: Reset password
@ -93,6 +94,7 @@ en:
back: Back to Mastodon
edit_profile: Edit profile
preferences: Preferences
settings: Settings
two_factor_auth: Two-factor Authentication
statuses:
over_character_limit: character limit of %{max} exceeded

4
config/locales/simple_form.en.yml
View file

@ -3,7 +3,11 @@ en:
simple_form:
hints:
defaults:
avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 120x120px
display_name: At most 30 characters
header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px
locked: Requires you to manually approve followers and defaults post privacy to followers-only
note: At most 160 characters
labels:
defaults:
avatar: Avatar