diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-13 09:18:39 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-13 09:18:39 +0200 |
| commit | e963714ad6346e7c89ad15c2dfaff1636ebb1795 (patch) | |
| tree | 6ea94ce95ad7f114a07e2fbdc9f3d375cbb9d2e4 /include/conversation.php | |
| parent | ef95c68b4f33102145837a0f87981f4e8a8c8876 (diff) | |
| parent | 6d4188f05e2a8e92508b1d38e4b7ef5156ba6c42 (diff) | |
| download | volse-hubzilla-e963714ad6346e7c89ad15c2dfaff1636ebb1795.tar.gz volse-hubzilla-e963714ad6346e7c89ad15c2dfaff1636ebb1795.tar.bz2 volse-hubzilla-e963714ad6346e7c89ad15c2dfaff1636ebb1795.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index 518193b08..bf29048b6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1143,6 +1143,8 @@ function status_editor($a, $x, $popup = false) { $weblink = (($mimetype === 'text/bbcode') ? t('Insert web link') : false); if(x($x, 'hide_weblink')) $weblink = false; + + $embedPhotos = t('Embed image from photo albums'); $writefiles = (($mimetype === 'text/bbcode') ? perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage') : false); if(x($x, 'hide_attach')) @@ -1178,6 +1180,12 @@ function status_editor($a, $x, $popup = false) { '$whereareu' => t('Where are you right now?'), '$editor_autocomplete'=> ((x($x,'editor_autocomplete')) ? $x['editor_autocomplete'] : ''), '$bbco_autocomplete'=> ((x($x,'bbco_autocomplete')) ? $x['bbco_autocomplete'] : ''), + '$modalchooseimages' => t('Choose images to embed'), + '$modalchoosealbum' => t('Choose an album'), + '$modaldiffalbum' => t('Choose a different album...'), + '$modalerrorlist' => t('Error getting album list'), + '$modalerrorlink' => t('Error getting photo link'), + '$modalerroralbum' => t('Error getting album'), )); $tpl = get_markup_template('jot.tpl'); @@ -1219,6 +1227,10 @@ function status_editor($a, $x, $popup = false) { '$code' => t('Code'), '$attach' => t('Attach file'), '$weblink' => $weblink, + '$embedPhotos' => $embedPhotos, + '$embedPhotosModalTitle' => t('Embed an image from your albums'), + '$embedPhotosModalCancel' => t('Cancel'), + '$embedPhotosModalOK' => t('OK'), '$setloc' => $setloc, '$voting' => t('Toggle voting'), '$feature_voting' => $feature_voting, |