Merge pull request from ineffyble/add-back-link-to-settings

Add a 'Back to Mastodon' link to footer of settings pages
signup-info-prompt
Eugen 2017-01-15 02:15:37 +01:00 committed by GitHub
commit 777f527d86
2 changed files with 2 additions and 0 deletions
app/views/settings/shared
config/locales

View File

@ -5,3 +5,4 @@
%li= link_to t('settings.preferences'), settings_preferences_path
- if controller_name != 'registrations'
%li= link_to t('auth.change_password'), edit_user_registration_path
%li= link_to t('settings.back'), root_path

View File

@ -90,6 +90,7 @@ en:
settings:
edit_profile: Edit profile
preferences: Preferences
back: Back to Mastodon
stream_entries:
click_to_show: Click to show
favourited: favourited a post by