diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-02-24 08:42:25 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-02-24 08:42:25 +0100 |
| commit | f6d024cb3f2663cd1d61e5fc18546adb93b9a7db (patch) | |
| tree | d4067d517bfa67c20e9bae0a41d3a882f419735d /Zotlabs/Module/Profile_photo.php | |
| parent | 1c750dac4187c3872e29c79f0c0856ec8a29331e (diff) | |
| parent | e6f9f284bf04f0dc0471fa08d7dac118effe4ccb (diff) | |
| download | volse-hubzilla-f6d024cb3f2663cd1d61e5fc18546adb93b9a7db.tar.gz volse-hubzilla-f6d024cb3f2663cd1d61e5fc18546adb93b9a7db.tar.bz2 volse-hubzilla-f6d024cb3f2663cd1d61e5fc18546adb93b9a7db.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Profile_photo.php')
| -rw-r--r-- | Zotlabs/Module/Profile_photo.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index 222b92721..c772f0ed3 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -441,14 +441,17 @@ class Profile_photo extends \Zotlabs\Web\Controller { '$importfile' => (($importing) ? \App::$data['importfile'] : ''), '$lbl_upfile' => t('Upload File:'), '$lbl_profiles' => t('Select a profile:'), - '$title' => (($importing) ? t('Use Photo for Profile') : t('Upload Profile Photo')), + '$title' => (($importing) ? t('Use Photo for Profile') : t('Change Profile Photo')), '$submit' => (($importing) ? t('Use') : t('Upload')), '$profiles' => $profiles, '$single' => ((count($profiles) == 1) ? true : false), '$profile0' => $profiles[0], + '$embedPhotos' => t('Use a photo from your albums'), + '$embedPhotosModalTitle' => t('Use a photo from your albums'), + '$embedPhotosModalCancel' => t('Cancel'), + '$embedPhotosModalOK' => t('OK'), '$form_security_token' => get_form_security_token("profile_photo"), - // FIXME - yuk - '$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . z_root() . '">' . t('skip this step') . '</a>' : '<a href="'. z_root() . '/photos/' . \App::$channel['channel_address'] . '">' . t('select a photo from your photo albums') . '</a>') + '$select' => t('Select existing photo'), )); call_hooks('profile_photo_content_end', $o); |