X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Feditpost.php;h=d6539e10782a55da57068903c8ccc8ef0265572d;hb=6f6b1f95c855eb1e06aa73aaab8ddefd8eb970da;hp=b44afe245f5daeb54a617c87b4e1d9217bf870e9;hpb=9ecb9842858541db669e6ee61627e8526bf4c719;p=friendica.git
diff --git a/mod/editpost.php b/mod/editpost.php
index b44afe245f..d6539e1078 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -28,9 +28,12 @@ function editpost_content(&$a) {
return;
}
- $plaintext = false;
- if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
- $plaintext = true;
+/* $plaintext = false;
+ if( local_user() && intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext') )
+ $plaintext = true;*/
+ $plaintext = true;
+ if( local_user() && feature_enabled(local_user(),'richtext') )
+ $plaintext = false;
$o .= '
' . t('Edit post') . '
';
@@ -102,13 +105,19 @@ function editpost_content(&$a) {
'$action' => 'item',
'$share' => t('Edit'),
'$upload' => t('Upload photo'),
+ '$shortupload' => t('upload photo'),
'$attach' => t('Attach file'),
+ '$shortattach' => t('attach file'),
'$weblink' => t('Insert web link'),
- '$youtube' => t('Insert YouTube video'),
- '$video' => t('Insert Vorbis [.ogg] video'),
- '$audio' => t('Insert Vorbis [.ogg] audio'),
+ '$shortweblink' => t('web link'),
+ '$video' => t('Insert video link'),
+ '$shortvideo' => t('video link'),
+ '$audio' => t('Insert audio link'),
+ '$shortaudio' => t('audio link'),
'$setloc' => t('Set your location'),
+ '$shortsetloc' => t('set location'),
'$noloc' => t('Clear browser location'),
+ '$shortnoloc' => t('clear location'),
'$wait' => t('Please wait'),
'$permset' => t('Permission settings'),
'$ptyp' => $itm[0]['type'],
@@ -124,7 +133,7 @@ function editpost_content(&$a) {
'$title' => $itm[0]['title'],
'$placeholdertitle' => t('Set title'),
'$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
- '$placeholdercategory' => t('Categories (comma-separated list)'),
+ '$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''),
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$lockstate' => $lockstate,
'$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb),
@@ -133,6 +142,8 @@ function editpost_content(&$a) {
'$preview' => t('Preview'),
'$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename),
+ '$cancel' => t('Cancel'),
+ '$rand_num' => random_digits(12)
));
return $o;