Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 23:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rev update

Browse source
This commit is contained in:
zotlabs 2020-03-09 22:08:11 -07:00
parent eff078feaa
commit a7011469e3
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -16,7 +16,7 @@ use Zotlabs\Daemon\Master;
* @brief This file defines some global constants and includes the central App class.
*/
define ( 'STD_VERSION', '20.03.06' );
define ( 'STD_VERSION', '20.03.10' );
define ( 'ZOT_REVISION', '6.0' );
define ( 'DB_UPDATE_VERSION', 1237 );

9
include/conversation.php
View file

@ -86,7 +86,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
function localize_item(&$item){
if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){
if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE) || $item['verb'] === 'Announce'){
if (! $item['obj']) {
return;
@ -147,7 +147,7 @@ function localize_item(&$item){
case ACTIVITY_OBJ_NOTE:
default:
$post_type = t('status');
$post_type = t('post');
if($obj['id'] != $obj['parent'])
$post_type = t('comment');
break;
@ -168,6 +168,9 @@ function localize_item(&$item){
elseif(activity_match($item['verb'],ACTIVITY_DISLIKE)) {
$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
}
elseif ($item['verb'] === 'Announce') {
$bodyverb = t('%1$s repeated %2$s\'s %3$s');
}
// short version, in notification strings the author will be displayed separately
@ -178,7 +181,7 @@ function localize_item(&$item){
$shortbodyverb = t('doesn\'t like %1$s\'s %2$s');
}
elseif ($item['verb'] === 'Announce') {
$shortbodyverb = t('shared %1$s\'s %2$s');
$shortbodyverb = t('repeated %1$s\'s %2$s');
}
if ($shortbodyverb) {

2
include/text.php
View file

@ -1773,7 +1773,7 @@ function format_poll($item,$s,$opts) {
$output .= EOL . '<div>' . $message . '</div>';
if ($activated and $commentable) {
$output .= EOL . '<input type="button" class="btn btn-std btn-success" name="vote" value="vote" onclick="submitPoll(' . $item['id'] . '); return false;">'. '</form>';
$output .= EOL . '<input type="button" class="btn btn-std btn-success" name="vote" value="' . t('vote') . '" onclick="submitPoll(' . $item['id'] . '); return false;">'. '</form>';
}