diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-17 07:08:48 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-17 07:08:48 +0100 |
| commit | f4f5095e19badcc85453182b86bff97f57228257 (patch) | |
| tree | af391e8f809c3ab7ae183c72a364ba09fd16702e /mod/network.php | |
| parent | 0c16d033efd4ee878ab94318e7980d373ad3994d (diff) | |
| parent | b3050d3bc8fc812f0579982e1c866ab07499e0a8 (diff) | |
| download | volse-hubzilla-f4f5095e19badcc85453182b86bff97f57228257.tar.gz volse-hubzilla-f4f5095e19badcc85453182b86bff97f57228257.tar.bz2 volse-hubzilla-f4f5095e19badcc85453182b86bff97f57228257.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/network.php')
| -rw-r--r-- | mod/network.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mod/network.php b/mod/network.php index 32c7216d4..abdf59c48 100644 --- a/mod/network.php +++ b/mod/network.php @@ -92,6 +92,8 @@ function network_content(&$a, $update = 0) { '$upload' => t('Upload photo'), '$weblink' => t('Insert web link'), '$youtube' => t('Insert YouTube video'), + '$video' => t('Insert Vorbis [.ogg] video'), + '$audio' => t('Insert Vorbis [.ogg] audio'), '$setloc' => t('Set your location'), '$noloc' => t('Clear browser location'), '$wait' => t('Please wait'), @@ -217,6 +219,7 @@ function network_content(&$a, $update = 0) { $cmnt_tpl = load_view_file('view/comment_item.tpl'); $like_tpl = load_view_file('view/like.tpl'); + $noshare_tpl = load_view_file('view/like_noshare.tpl'); $tpl = load_view_file('view/wall_item.tpl'); $wallwall = load_view_file('view/wallwall_item.tpl'); @@ -360,10 +363,11 @@ function network_content(&$a, $update = 0) { $likebuttons = ''; if($item['id'] == $item['parent']) { - $likebuttons = replace_macros($like_tpl,array( + $likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array( '$id' => $item['id'], '$likethis' => t("I like this \x28toggle\x29"), '$nolike' => t("I don't like this \x28toggle\x29"), + '$share' => t('Share'), '$wait' => t('Please wait') )); } |