diff options
| author | friendica <info@friendica.com> | 2014-06-03 13:46:32 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-06-03 13:46:32 -0700 |
| commit | 2ada33e2a03e64231af44f42569052a1b8ae4197 (patch) | |
| tree | 828c5582e8e2aa789b761c42d1a44aae61693173 /include | |
| parent | c034cb5d71bec9c6ce789b52147897e8d581a70c (diff) | |
| parent | 30b355fa0dec7eceb52851f37a61b4c5c21fe829 (diff) | |
| download | volse-hubzilla-2ada33e2a03e64231af44f42569052a1b8ae4197.tar.gz volse-hubzilla-2ada33e2a03e64231af44f42569052a1b8ae4197.tar.bz2 volse-hubzilla-2ada33e2a03e64231af44f42569052a1b8ae4197.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/ItemObject.php | 2 | ||||
| -rw-r--r-- | include/js_strings.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 72d6444f8..a5870ef91 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -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; } diff --git a/include/js_strings.php b/include/js_strings.php index 4fbcbe841..0990e1ff7 100644 --- a/include/js_strings.php +++ b/include/js_strings.php @@ -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'), |