logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: c7ee2ed83100e40247fc35be8b138befc44175bc
parent: f0721ed83b7ebdb43d9a643a086508078bf1466e
Author: Shpuld Shpludson <shp@cock.li>
Date:   Sun,  3 Feb 2019 07:05:38 +0000

Merge branch '238-add-avatar-size-suggestion' into 'develop'

Add avatar size instruction notice

Closes #238

See merge request pleroma/pleroma-fe!512

Diffstat:

Msrc/components/user_settings/user_settings.vue1+
Msrc/i18n/en.json1+
2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue @@ -41,6 +41,7 @@ </div> <div class="setting-item"> <h2>{{$t('settings.avatar')}}</h2> + <p class="visibility-notice">{{$t('settings.avatar_size_instruction')}}</p> <p>{{$t('settings.current_avatar')}}</p> <img :src="user.profile_image_url_original" class="old-avatar"></img> <p>{{$t('settings.set_new_avatar')}}</p> diff --git a/src/i18n/en.json b/src/i18n/en.json @@ -118,6 +118,7 @@ "delete_account_description": "Permanently delete your account and all your messages.", "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.", "delete_account_instructions": "Type your password in the input below to confirm account deletion.", + "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.", "export_theme": "Save preset", "filtering": "Filtering", "filtering_explanation": "All statuses containing these words will be muted, one per line",