strip duplicate code blocks bb2d*

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 10b34ebe68a6eec0e8a0f104bf6ea935bf4ee9ae..dec70c1a958f4d723bdb3b6ea72a876d890eec9c 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -466,6 +466,8 @@ function conversation(&$a, $items, $mode, $update) {
                                                'classdo' => (($item['starred']) ? "hidden" : ""),
                                                'classundo' => (($item['starred']) ? "" : "hidden"),
                                                'starred' =>  t('starred'),
+                                               'tagger' => t("add tag"),
+                                               'classtagger' => "",
                                        );
                                }
 
@@ -540,7 +542,7 @@ function conversation(&$a, $items, $mode, $update) {
                                        '$osparkle' => $osparkle,
                                        '$sparkle' => $sparkle,
                                        '$title' => template_escape($item['title']),
-                                       '$ago' => ((($item['app']) && ($item['id'] == $item['parent'])) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
+                                       '$ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
                                        '$lock' => $lock,
                                        '$location' => template_escape($location),
                                        '$indent' => $indent,
@@ -745,9 +747,9 @@ function status_editor($a,$x, $notes_cid = 0) {
                        '$nickname' => $x['nickname'],
                        '$ispublic' => t('Visible to <strong>everybody</strong>'),
                        '$linkurl' => t('Please enter a link URL:'),
-                       '$utubeurl' => t('Please enter a YouTube link:'),
-                       '$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
-                       '$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
+                       '$vidurl' => t("Please enter a video link/URL:"),
+                       '$audurl' => t("Please enter an audio link/URL:"),
+                       '$term' => t('Tag term:'),
                        '$whereareu' => t('Where are you right now?'),
                        '$title' => t('Enter a title for this item') 
                ));
@@ -795,9 +797,8 @@ function status_editor($a,$x, $notes_cid = 0) {
                        '$upload' => t('Upload photo'),
                        '$attach' => 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'),
+                       '$video' => t('Insert video link'),
+                       '$audio' => t('Insert audio link'),
                        '$setloc' => t('Set your location'),
                        '$noloc' => t('Clear browser location'),
                        '$title' => t('Set title'),