/**
* @file include/conversation.php
*/
+
use Friendica\App;
use Friendica\Content\ContactSelector;
use Friendica\Content\Feature;
+use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
-use Friendica\Object\Thread;
use Friendica\Object\Post;
-
-require_once "include/bbcode.php";
-require_once "include/acl_selectors.php";
+use Friendica\Object\Thread;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
+use Friendica\Util\XML;
function item_extract_images($body) {
$img_st_close++; // make it point to AFTER the closing bracket
$img_end += $img_start;
- if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
+ if (!strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
// This is an embedded image
$saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - ($img_start + $img_st_close));
$newbody = '';
$cnt = 1;
- $pos = get_bb_tag_pos($origbody, 'url', 1);
+ $pos = BBCode::getTagPosition($origbody, 'url', 0);
while ($pos !== false && $cnt < 1000) {
$search = '/\[url\=(.*?)\]\[!#saved_image([0-9]*)#!\]\[\/url\]' . '/is';
$newbody .= $subject;
$cnt++;
- $pos = get_bb_tag_pos($origbody, 'url', 1);
+ // Isn't this supposed to use $cnt value for $occurrences? - @MrPetovan
+ $pos = BBCode::getTagPosition($origbody, 'url', 0);
}
$newbody .= $origbody;
case ACTIVITY_POST:
switch ($obj['object-type']) {
case ACTIVITY_OBJ_EVENT:
- $post_type = t('event');
+ $post_type = L10n::t('event');
break;
default:
- $post_type = t('status');
+ $post_type = L10n::t('status');
}
break;
default:
if ($obj['resource-id']) {
- $post_type = t('photo');
+ $post_type = L10n::t('photo');
$m = [];
preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
$rr['plink'] = $m[1];
} else {
- $post_type = t('status');
+ $post_type = L10n::t('status');
}
}
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
if (activity_match($item['verb'], ACTIVITY_LIKE)) {
- $bodyverb = t('%1$s likes %2$s\'s %3$s');
+ $bodyverb = L10n::t('%1$s likes %2$s\'s %3$s');
}
elseif (activity_match($item['verb'], ACTIVITY_DISLIKE)) {
- $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
+ $bodyverb = L10n::t('%1$s doesn\'t like %2$s\'s %3$s');
}
elseif (activity_match($item['verb'], ACTIVITY_ATTEND)) {
- $bodyverb = t('%1$s attends %2$s\'s %3$s');
+ $bodyverb = L10n::t('%1$s attends %2$s\'s %3$s');
}
elseif (activity_match($item['verb'], ACTIVITY_ATTENDNO)) {
- $bodyverb = t('%1$s doesn\'t attend %2$s\'s %3$s');
+ $bodyverb = L10n::t('%1$s doesn\'t attend %2$s\'s %3$s');
}
elseif (activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) {
- $bodyverb = t('%1$s attends maybe %2$s\'s %3$s');
+ $bodyverb = L10n::t('%1$s attends maybe %2$s\'s %3$s');
}
$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
- $obj = parse_xml_string($xmlhead.$item['object']);
- $links = parse_xml_string($xmlhead."<links>".unxmlify($obj->link)."</links>");
+ $obj = XML::parseString($xmlhead.$item['object']);
+ $links = XML::parseString($xmlhead."<links>".unxmlify($obj->link)."</links>");
$Bname = $obj->title;
$Blink = ""; $Bphoto = "";
$Bphoto = '[url=' . Profile::zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]';
}
- $item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
+ $item['body'] = L10n::t('%1$s is now friends with %2$s', $A, $B)."\n\n\n".$Bphoto;
}
if (stristr($item['verb'], ACTIVITY_POKE)) {
$verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
- if (! $verb) {
+ if (!$verb) {
return;
}
if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) {
$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
- $obj = parse_xml_string($xmlhead.$item['object']);
- $links = parse_xml_string($xmlhead."<links>".unxmlify($obj->link)."</links>");
+ $obj = XML::parseString($xmlhead.$item['object']);
+ $links = XML::parseString($xmlhead."<links>".unxmlify($obj->link)."</links>");
$Bname = $obj->title;
$Blink = "";
* we can't have a translation string with three positions but no distinguishable text
* So here is the translate string.
*/
- $txt = t('%1$s poked %2$s');
+ $txt = L10n::t('%1$s poked %2$s');
// now translate the verb
$poked_t = trim(sprintf($txt, "", ""));
- $txt = str_replace( $poked_t, t($verb), $txt);
+ $txt = str_replace( $poked_t, L10n::t($verb), $txt);
// then do the sprintf on the translation string
case ACTIVITY_POST:
switch ($obj['object-type']) {
case ACTIVITY_OBJ_EVENT:
- $post_type = t('event');
+ $post_type = L10n::t('event');
break;
default:
- $post_type = t('status');
+ $post_type = L10n::t('status');
}
break;
default:
if ($obj['resource-id']) {
- $post_type = t('photo');
+ $post_type = L10n::t('photo');
$m=[]; preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
$rr['plink'] = $m[1];
} else {
- $post_type = t('status');
+ $post_type = L10n::t('status');
}
// Let's break everthing ... ;-)
break;
}
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
- $parsedobj = parse_xml_string($xmlhead.$item['object']);
+ $parsedobj = XML::parseString($xmlhead.$item['object']);
$tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content);
- $item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag );
+ $item['body'] = L10n::t('%1$s tagged %2$s\'s %3$s with %4$s', $author, $objauthor, $plink, $tag );
}
if (activity_match($item['verb'], ACTIVITY_FAVORITE)) {
$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
- $obj = parse_xml_string($xmlhead.$item['object']);
+ $obj = XML::parseString($xmlhead.$item['object']);
if (strlen($obj->id)) {
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($obj->id),
$Blink = $target['author-link'];
$A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]';
$B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]';
- $P = '[url=' . $target['plink'] . ']' . t('post/item') . '[/url]';
- $item['body'] = sprintf( t('%1$s marked %2$s\'s %3$s as favorite'), $A, $B, $P)."\n";
+ $P = '[url=' . $target['plink'] . ']' . L10n::t('post/item') . '[/url]';
+ $item['body'] = L10n::t('%1$s marked %2$s\'s %3$s as favorite', $A, $B, $P)."\n";
}
}
}
$matches = null;
if (preg_match_all('/@\[url=(.*?)\]/is', $item['body'], $matches, PREG_SET_ORDER)) {
foreach ($matches as $mtch) {
- if (! strpos($mtch[1], 'zrl=')) {
+ if (!strpos($mtch[1], 'zrl=')) {
$item['body'] = str_replace($mtch[0], '@[url=' . Profile::zrl($mtch[1]) . ']', $item['body']);
}
}
$photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is";
if (preg_match($photo_pattern, $item['body'])) {
$photo_replace = '[url=' . Profile::zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5' . '[/img][/url]';
- $item['body'] = bb_tag_preg_replace($photo_pattern, $photo_replace, 'url', $item['body']);
+ $item['body'] = BBCode::pregReplaceInTag($photo_pattern, $photo_replace, 'url', $item['body']);
}
// add sparkle links to appropriate permalinks
if ($total > 0) {
foreach ($item['children'] as $child) {
- if (! visible_activity($child)) {
+ if (!visible_activity($child)) {
$total --;
}
$total += count_descendants($child);
}
if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) {
- if (! (($item['self']) && ($item['uid'] == local_user()))) {
+ if (!($item['self'] && ($item['uid'] == local_user()))) {
return false;
}
}
`item`.`forum_mode`,
`item`.`mention`,
`item`.`global`,
-`item`.`gcontact-id`,
`item`.`shadow`,
*/
return "`item`.`author-id`, `item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`,
`item`.`owner-id`, `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
`item`.`contact-id`, `item`.`uid`, `item`.`id`, `item`.`parent`,
- `item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`,
+ `item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`, `item`.`content-warning`,
`item`.`commented`, `item`.`created`, `item`.`edited`, `item`.`received`,
`item`.`verb`, `item`.`object-type`, `item`.`postopts`, `item`.`plink`,
`item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`,
* that are based on unique features of the calling module.
*
*/
-function conversation(App $a, $items, $mode, $update, $preview = false) {
- require_once 'include/bbcode.php';
+function conversation(App $a, $items, $mode, $update, $preview = false, $order = 'commented') {
require_once 'mod/proxy.php';
$ssl_state = ((local_user()) ? true : false);
$previewing = (($preview) ? ' preview ' : '');
if ($mode === 'network') {
+ $items = conversation_add_children($items, false, $order);
$profile_owner = local_user();
if (!$update) {
/*
. " var profile_page = 1; </script>";
}
} elseif ($mode === 'community') {
- if (!$community_readonly) {
- $items = community_add_items($items);
- }
+ $items = conversation_add_children($items, true, $order);
$profile_owner = 0;
if (!$update) {
$live_update_div = '<div id="live-community"></div>' . "\r\n"
$items = $cb['items'];
$conv_responses = [
- 'like' => ['title' => t('Likes','title')], 'dislike' => ['title' => t('Dislikes','title')],
- 'attendyes' => ['title' => t('Attending','title')], 'attendno' => ['title' => t('Not attending','title')], 'attendmaybe' => ['title' => t('Might attend','title')]
+ 'like' => ['title' => L10n::t('Likes','title')], 'dislike' => ['title' => L10n::t('Dislikes','title')],
+ 'attendyes' => ['title' => L10n::t('Attending','title')], 'attendno' => ['title' => L10n::t('Not attending','title')], 'attendmaybe' => ['title' => L10n::t('Might attend','title')]
];
// array with html for each thread (parent+comments)
$page_template = get_markup_template("conversation.tpl");
if ($items && count($items)) {
- $community_readonly = ($mode === 'community');
-
- // Currently behind a config value. This allows the commenting and sharing of every public item.
- if (Config::get('system', 'comment_public')) {
- if ($mode === 'community') {
- $community_readonly = false;
- $writable = true;
- } else {
- $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
- }
+ if ($mode === 'community') {
+ $writable = true;
} else {
- $writable = false;
+ $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
}
if (!local_user()) {
$writable = false;
}
- if (in_array($mode, ['network-new', 'search', 'contact-posts']) || $community_readonly) {
+ if (in_array($mode, ['network-new', 'search', 'contact-posts'])) {
/*
* "New Item View" on network page or search page results
* - just loop through the items and format them minimally for display
*/
- /// @TODO old lost code?
- // $tpl = get_markup_template('search_item.tpl');
$tpl = 'search_item.tpl';
foreach ($items as $item) {
+ if (!visible_activity($item)) {
+ continue;
+ }
+
if ($arr_blocked) {
$blocked = false;
foreach ($arr_blocked as $b) {
continue;
}
- $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
- if ($item['author-link'] && (! $item['author-name'])) {
+ $profile_name = (strlen($item['author-name']) ? $item['author-name'] : $item['name']);
+ if ($item['author-link'] && !$item['author-name']) {
$profile_name = $item['author-link'];
}
$drop = [
'dropping' => $dropping,
'pagedrop' => $page_dropping,
- 'select' => t('Select'),
- 'delete' => t('Delete'),
+ 'select' => L10n::t('Select'),
+ 'delete' => L10n::t('Delete'),
];
$star = false;
list($categories, $folders) = get_cats_and_terms($item);
$profile_name_e = $profile_name;
- $item['title_e'] = $item['title'];
+
+ if (!empty($item['content-warning']) && PConfig::get(local_user(), 'system', 'disable_cw', false)) {
+ $title_e = ucfirst($item['content-warning']);
+ } else {
+ $title_e = $item['title'];
+ }
+
$body_e = $body;
$tags_e = $tags;
$hashtags_e = $hashtags;
'guid' => (($preview) ? 'Q0' : $item['guid']),
'network' => $item['item_network'],
'network_name' => ContactSelector::networkToName($item['item_network'], $profile_link),
- 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
+ 'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
'profile_url' => $profile_link,
'item_photo_menu' => item_photo_menu($item),
'name' => $profile_name_e,
'sparkle' => $sparkle,
'lock' => $lock,
'thumb' => System::removedBaseUrl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)),
- 'title' => $item['title_e'],
+ 'title' => $title_e,
'body' => $body_e,
'tags' => $tags_e,
'hashtags' => $hashtags_e,
'mentions' => $mentions_e,
- 'txt_cats' => t('Categories:'),
- 'txt_folders' => t('Filed under:'),
+ 'txt_cats' => L10n::t('Categories:'),
+ 'txt_folders' => L10n::t('Filed under:'),
'has_cats' => ((count($categories)) ? 'true' : ''),
'has_folders' => ((count($folders)) ? 'true' : ''),
'categories' => $categories,
'folders' => $folders,
'text' => strip_tags($body_e),
- 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
- 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
+ 'localtime' => DateTimeFormat::local($item['created'], 'r'),
+ 'ago' => (($item['app']) ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
'location' => $location_e,
'indent' => '',
'owner_name' => $owner_name_e,
'like' => '',
'dislike' => '',
'comment' => '',
- 'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> t('View in context')]),
+ 'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> L10n::t('View in context')]),
'previewing' => $previewing,
- 'wait' => t('Please wait'),
+ 'wait' => L10n::t('Please wait'),
'thread_level' => 1,
];
continue;
}
- if (! visible_activity($item)) {
+ if (!visible_activity($item)) {
continue;
}
'$baseurl' => System::baseUrl($ssl_state),
'$return_path' => $a->query_string,
'$live_update' => $live_update_div,
- '$remove' => t('remove'),
+ '$remove' => L10n::t('remove'),
'$mode' => $mode,
'$user' => $a->user,
'$threads' => $threads,
- '$dropping' => ($page_dropping && Feature::isEnabled(local_user(), 'multi_delete') ? t('Delete Selected Items') : False),
+ '$dropping' => ($page_dropping && Feature::isEnabled(local_user(), 'multi_delete') ? L10n::t('Delete Selected Items') : False),
]);
return $o;
*
* @return array items with parents and comments
*/
-function community_add_items($parents) {
- $max_comments = Config::get("system", "max_comments", 100);
+function conversation_add_children($parents, $block_authors, $order) {
+ $max_comments = Config::get('system', 'max_comments', 100);
+
+ if ($max_comments > 0) {
+ $limit = ' LIMIT '.intval($max_comments + 1);
+ } else {
+ $limit = '';
+ }
$items = [];
+ $block_sql = $block_authors ? "AND NOT `author`.`hidden` AND NOT `author`.`blocked`" : "";
+
foreach ($parents AS $parent) {
$thread_items = dba::p(item_query()." AND `item`.`uid` = ?
- AND `item`.`parent-uri` = ?
- ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1),
+ AND `item`.`parent-uri` = ? $block_sql
+ ORDER BY `item`.`commented` DESC" . $limit,
local_user(),
$parent['uri']
);
}
}
- $items = conv_sort($items, "`commented`");
+ $items = conv_sort($items, $order);
return $items;
}
}
}
}
- if (! $best_url) {
+ if (!$best_url) {
if ($url != '') {
$best_url = $url;
} elseif (strlen($item['author-link'])) {
$photos_link = '';
$posts_link = '';
- if ((local_user()) && local_user() == $item['uid'] && $item['parent'] == $item['id'] && (! $item['self'])) {
+ if (local_user() && local_user() == $item['uid'] && $item['parent'] == $item['id'] && !$item['self']) {
$sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;';
}
if (local_user()) {
$menu = [
- t('Follow Thread') => $sub_link,
- t('View Status') => $status_link,
- t('View Profile') => $profile_link,
- t('View Photos') => $photos_link,
- t('Network Posts') => $posts_link,
- t('View Contact') => $contact_url,
- t('Send PM') => $pm_url
+ L10n::t('Follow Thread') => $sub_link,
+ L10n::t('View Status') => $status_link,
+ L10n::t('View Profile') => $profile_link,
+ L10n::t('View Photos') => $photos_link,
+ L10n::t('Network Posts') => $posts_link,
+ L10n::t('View Contact') => $contact_url,
+ L10n::t('Send PM') => $pm_url
];
if ($network == NETWORK_DFRN) {
- $menu[t("Poke")] = $poke_link;
+ $menu[L10n::t("Poke")] = $poke_link;
}
if ((($cid == 0) || ($rel == CONTACT_IS_FOLLOWER)) &&
in_array($item['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])) {
- $menu[t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
+ $menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
}
} else {
- $menu = [t('View Profile') => $item['author-link']];
+ $menu = [L10n::t('View Profile') => $item['author-link']];
}
$args = ['item' => $item, 'menu' => $menu];
return;
}
- if ((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) {
+ if (activity_match($item['verb'], $verb) && ($item['id'] != $item['parent'])) {
$url = $item['author-link'];
- if ((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'], $item['url']))) {
+ if (local_user() && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && !$item['self'] && link_compare($item['author-link'], $item['url'])) {
$url = 'redir/' . $item['contact-id'];
$sparkle = ' class="sparkle" ';
} else {
$url = '<a href="'. $url . '"'. $sparkle .'>' . htmlentities($item['author-name']) . '</a>';
- if (! $item['thr-parent']) {
+ if (!$item['thr-parent']) {
$item['thr-parent'] = $item['parent-uri'];
}
- if (! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l']))
- && (is_array($conv_responses[$mode][$item['thr-parent'] . '-l'])))) {
+ if (!(isset($conv_responses[$mode][$item['thr-parent'] . '-l'])
+ && is_array($conv_responses[$mode][$item['thr-parent'] . '-l']))) {
$conv_responses[$mode][$item['thr-parent'] . '-l'] = [];
}
continue;
}
- if (! isset($conv_responses[$mode][$item['thr-parent']])) {
+ if (!isset($conv_responses[$mode][$item['thr-parent']])) {
$conv_responses[$mode][$item['thr-parent']] = 1;
} else {
$conv_responses[$mode][$item['thr-parent']] ++;
* @param array $arr = array of pre-linked names of likers/dislikers
* @param string $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe'
* @param int $id = item id
- * @return formatted text
+ * @return string formatted text
*/
function format_like($cnt, array $arr, $type, $id) {
$o = '';
// list which show all likers
switch ($type) {
case 'like' :
- $phrase = sprintf( t('%s likes this.'), $likers);
+ $phrase = L10n::t('%s likes this.', $likers);
break;
case 'dislike' :
- $phrase = sprintf( t('%s doesn\'t like this.'), $likers);
+ $phrase = L10n::t('%s doesn\'t like this.', $likers);
break;
case 'attendyes' :
- $phrase = sprintf( t('%s attends.'), $likers);
+ $phrase = L10n::t('%s attends.', $likers);
break;
case 'attendno' :
- $phrase = sprintf( t('%s doesn\'t attend.'), $likers);
+ $phrase = L10n::t('%s doesn\'t attend.', $likers);
break;
case 'attendmaybe' :
- $phrase = sprintf( t('%s attends maybe.'), $likers);
+ $phrase = L10n::t('%s attends maybe.', $likers);
break;
}
}
$arr = array_slice($arr, 0, MAX_LIKERS - 1);
}
if ($total < MAX_LIKERS) {
- $last = t('and') . ' ' . $arr[count($arr)-1];
+ $last = L10n::t('and') . ' ' . $arr[count($arr)-1];
$arr2 = array_slice($arr, 0, -1);
$str = implode(', ', $arr2) . ' ' . $last;
}
if ($total >= MAX_LIKERS) {
$str = implode(', ', $arr);
- $str .= sprintf( t(', and %d other people'), $total - MAX_LIKERS );
+ $str .= L10n::t('and %d other people', $total - MAX_LIKERS );
}
$likers = $str;
switch ($type) {
case 'like':
- $phrase = sprintf( t('<span %1$s>%2$d people</span> like this'), $spanatts, $cnt);
- $explikers = sprintf( t('%s like this.'), $likers);
+ $phrase = L10n::t('<span %1$s>%2$d people</span> like this', $spanatts, $cnt);
+ $explikers = L10n::t('%s like this.', $likers);
break;
case 'dislike':
- $phrase = sprintf( t('<span %1$s>%2$d people</span> don\'t like this'), $spanatts, $cnt);
- $explikers = sprintf( t('%s don\'t like this.'), $likers);
+ $phrase = L10n::t('<span %1$s>%2$d people</span> don\'t like this', $spanatts, $cnt);
+ $explikers = L10n::t('%s don\'t like this.', $likers);
break;
case 'attendyes':
- $phrase = sprintf( t('<span %1$s>%2$d people</span> attend'), $spanatts, $cnt);
- $explikers = sprintf( t('%s attend.'), $likers);
+ $phrase = L10n::t('<span %1$s>%2$d people</span> attend', $spanatts, $cnt);
+ $explikers = L10n::t('%s attend.', $likers);
break;
case 'attendno':
- $phrase = sprintf( t('<span %1$s>%2$d people</span> don\'t attend'), $spanatts, $cnt);
- $explikers = sprintf( t('%s don\'t attend.'), $likers);
+ $phrase = L10n::t('<span %1$s>%2$d people</span> don\'t attend', $spanatts, $cnt);
+ $explikers = L10n::t('%s don\'t attend.', $likers);
break;
case 'attendmaybe':
- $phrase = sprintf( t('<span %1$s>%2$d people</span> attend maybe'), $spanatts, $cnt);
- $explikers = sprintf( t('%s anttend maybe.'), $likers);
+ $phrase = L10n::t('<span %1$s>%2$d people</span> attend maybe', $spanatts, $cnt);
+ $explikers = L10n::t('%s attend maybe.', $likers);
break;
}
'$baseurl' => System::baseUrl(true),
'$geotag' => $geotag,
'$nickname' => $x['nickname'],
- '$ispublic' => t('Visible to <strong>everybody</strong>'),
- '$linkurl' => t('Please enter a link URL:'),
- '$vidurl' => t("Please enter a video link/URL:"),
- '$audurl' => t("Please enter an audio link/URL:"),
- '$term' => t('Tag term:'),
- '$fileas' => t('Save to Folder:'),
- '$whereareu' => t('Where are you right now?'),
- '$delitems' => t('Delete item(s)?')
+ '$ispublic' => L10n::t('Visible to <strong>everybody</strong>'),
+ '$linkurl' => L10n::t('Please enter a link URL:'),
+ '$vidurl' => L10n::t("Please enter a video link/URL:"),
+ '$audurl' => L10n::t("Please enter an audio link/URL:"),
+ '$term' => L10n::t('Tag term:'),
+ '$fileas' => L10n::t('Save to Folder:'),
+ '$whereareu' => L10n::t('Where are you right now?'),
+ '$delitems' => L10n::t("Delete item\x28s\x29?")
]);
$tpl = get_markup_template('jot-end.tpl');
'$baseurl' => System::baseUrl(true),
'$geotag' => $geotag,
'$nickname' => $x['nickname'],
- '$ispublic' => t('Visible to <strong>everybody</strong>'),
- '$linkurl' => t('Please enter a link URL:'),
- '$vidurl' => t("Please enter a video link/URL:"),
- '$audurl' => t("Please enter an audio link/URL:"),
- '$term' => t('Tag term:'),
- '$fileas' => t('Save to Folder:'),
- '$whereareu' => t('Where are you right now?')
+ '$ispublic' => L10n::t('Visible to <strong>everybody</strong>'),
+ '$linkurl' => L10n::t('Please enter a link URL:'),
+ '$vidurl' => L10n::t("Please enter a video link/URL:"),
+ '$audurl' => L10n::t("Please enter an audio link/URL:"),
+ '$term' => L10n::t('Tag term:'),
+ '$fileas' => L10n::t('Save to Folder:'),
+ '$whereareu' => L10n::t('Where are you right now?')
]);
$jotplugins = '';
$tpl = get_markup_template("jot.tpl");
$o .= replace_macros($tpl,[
+ '$new_post' => L10n::t('New Post'),
'$return_path' => $query_str,
'$action' => 'item',
- '$share' => defaults($x, 'button', t('Share')),
- '$upload' => t('Upload photo'),
- '$shortupload' => t('upload photo'),
- '$attach' => t('Attach file'),
- '$shortattach' => t('attach file'),
- '$weblink' => t('Insert web link'),
- '$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'),
+ '$share' => defaults($x, 'button', L10n::t('Share')),
+ '$upload' => L10n::t('Upload photo'),
+ '$shortupload' => L10n::t('upload photo'),
+ '$attach' => L10n::t('Attach file'),
+ '$shortattach' => L10n::t('attach file'),
+ '$weblink' => L10n::t('Insert web link'),
+ '$shortweblink' => L10n::t('web link'),
+ '$video' => L10n::t('Insert video link'),
+ '$shortvideo' => L10n::t('video link'),
+ '$audio' => L10n::t('Insert audio link'),
+ '$shortaudio' => L10n::t('audio link'),
+ '$setloc' => L10n::t('Set your location'),
+ '$shortsetloc' => L10n::t('set location'),
+ '$noloc' => L10n::t('Clear browser location'),
+ '$shortnoloc' => L10n::t('clear location'),
'$title' => defaults($x, 'title', ''),
- '$placeholdertitle' => t('Set title'),
+ '$placeholdertitle' => L10n::t('Set title'),
'$category' => defaults($x, 'category', ''),
- '$placeholdercategory' => Feature::isEnabled(local_user(), 'categories') ? t('Categories (comma-separated list)') : '',
- '$wait' => t('Please wait'),
- '$permset' => t('Permission settings'),
- '$shortpermset' => t('permissions'),
+ '$placeholdercategory' => Feature::isEnabled(local_user(), 'categories') ? L10n::t("Categories \x28comma-separated list\x29") : '',
+ '$wait' => L10n::t('Please wait'),
+ '$permset' => L10n::t('Permission settings'),
+ '$shortpermset' => L10n::t('permissions'),
'$ptyp' => $notes_cid ? 'note' : 'wall',
'$content' => defaults($x, 'content', ''),
'$post_id' => defaults($x, 'post_id', ''),
'$defloc' => $x['default_location'],
'$visitor' => $x['visitor'],
'$pvisit' => $notes_cid ? 'none' : $x['visitor'],
- '$public' => t('Public post'),
+ '$public' => L10n::t('Public post'),
'$lockstate' => $x['lockstate'],
'$bang' => $x['bang'],
'$profile_uid' => $x['profile_uid'],
- '$preview' => Feature::isEnabled($x['profile_uid'], 'preview') ? t('Preview') : '',
+ '$preview' => Feature::isEnabled($x['profile_uid'], 'preview') ? L10n::t('Preview') : '',
'$jotplugins' => $jotplugins,
'$notes_cid' => $notes_cid,
- '$sourceapp' => t($a->sourcename),
- '$cancel' => t('Cancel'),
+ '$sourceapp' => L10n::t($a->sourcename),
+ '$cancel' => L10n::t('Cancel'),
'$rand_num' => random_digits(12),
// ACL permissions box
'$acl' => $x['acl'],
- '$group_perms' => t('Post to Groups'),
- '$contact_perms' => t('Post to Contacts'),
- '$private' => t('Private post'),
+ '$group_perms' => L10n::t('Post to Groups'),
+ '$contact_perms' => L10n::t('Post to Contacts'),
+ '$private' => L10n::t('Private post'),
'$is_private' => $private_post,
'$public_link' => $public_post_link,
//jot nav tab (used in some themes)
- '$message' => t('Message'),
- '$browser' => t('Browser'),
+ '$message' => L10n::t('Message'),
+ '$browser' => L10n::t('Browser'),
]);
*/
function smart_flatten_conversation(array $parent)
{
- if (! isset($parent['children']) || count($parent['children']) == 0) {
+ if (!isset($parent['children']) || count($parent['children']) == 0) {
return $parent;
}
foreach ($response_verbs as $v) {
$ret[$v] = [];
$ret[$v]['count'] = defaults($conv_responses[$v], $item['uri'], '');
- $ret[$v]['list'] = defaults($conv_responses[$v], $item['uri'] . '-l', '');
+ $ret[$v]['list'] = defaults($conv_responses[$v], $item['uri'] . '-l', []);
$ret[$v]['self'] = defaults($conv_responses[$v], $item['uri'] . '-self', '0');
if (count($ret[$v]['list']) > MAX_LIKERS) {
$ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS);
array_push($ret[$v]['list_part'], '<a href="#" data-toggle="modal" data-target="#' . $v . 'Modal-'
- . (($ob) ? $ob->getId() : $item['id']) . '"><b>' . t('View all') . '</b></a>');
+ . (($ob) ? $ob->getId() : $item['id']) . '"><b>' . L10n::t('View all') . '</b></a>');
} else {
$ret[$v]['list_part'] = '';
}
{
switch ($v) {
case 'like':
- $return = tt('Like', 'Likes', $count);
+ $return = L10n::tt('Like', 'Likes', $count);
break;
case 'dislike':
- $return = tt('Dislike', 'Dislikes', $count);
+ $return = L10n::tt('Dislike', 'Dislikes', $count);
break;
case 'attendyes':
- $return = tt('Attending', 'Attending', $count);
+ $return = L10n::tt('Attending', 'Attending', $count);
break;
case 'attendno':
- $return = tt('Not Attending', 'Not Attending', $count);
+ $return = L10n::tt('Not Attending', 'Not Attending', $count);
break;
case 'attendmaybe':
- $return = tt('Undecided', 'Undecided', $count);
+ $return = L10n::tt('Undecided', 'Undecided', $count);
break;
}
projects / friendica.git / blobdiff