harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica
2014-06-03 13:46:32 -07:00
parent c034cb5d71 30b355fa0d
commit 2ada33e2a0
10 changed files with 6054 additions and 6192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ItemObject.php
View File

@@ -313,7 +313,7 @@ class Item extends BaseObject {
if(($nb_children > 2) || ($thread_level > 1)) {
$result['children'][0]['comment_firstcollapsed'] = true;
$result['children'][0]['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
$result['children'][0]['hide_text'] = t('[+] show more comments');
$result['children'][0]['hide_text'] = t('[+] show all');
if($thread_level > 1) {
$result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
}

8
include/js_strings.php
View File

@@ -4,10 +4,10 @@ function js_strings() {
return replace_macros(get_markup_template('js_strings.tpl'), array(
'$delitem' => t('Delete this item?'),
'$comment' => t('Comment'),
'$showmore' => t('[+] show more comments'),
'$showfewer' => t('[-] show fewer comments'),
'$divgrowmore' => t('[+] show more'),
'$divgrowless' => t('[-] show less'),
'$showmore' => t('[+] show all'),
'$showfewer' => t('[-] show less'),
'$divgrowmore' => t('[+] expand post'),
'$divgrowless' => t('[-] collapse post'),
'$pwshort' => t("Password too short"),
'$pwnomatch' => t("Passwords do not match"),
'$everybody' => t('everybody'),