TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "streamline wording"

Browse Source 
This reverts commit e2c477d775.
This commit is contained in:
Mario
2025-05-03 15:52:30 +00:00
parent e2c477d775
commit ee3fc54be6
7 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Zotlabs/Lib/Enotify.php
View File

@@ -848,8 +848,8 @@ class Enotify {
}
else {
$itemem_text = (($item['item_thread_top'])
? (($item['obj_type'] === 'Question') ? t('started a poll') : t('started a conversation'))
: (($item['obj_type'] === 'Answer') ? sprintf( t('answered %s\'s poll'), '[bdi]' . $item['owner']['xchan_name'] . '[/bdi]') : sprintf( t('posted in %s\'s conversation'), '[bdi]' . $item['owner']['xchan_name'] . '[/bdi]'))
? (($item['obj_type'] === 'Question') ? t('created a new poll') : t('created a new post'))
: (($item['obj_type'] === 'Answer') ? sprintf( t('voted on %s\'s poll'), '[bdi]' . $item['owner']['xchan_name'] . '[/bdi]') : sprintf( t('commented on %s\'s post'), '[bdi]' . $item['owner']['xchan_name'] . '[/bdi]'))
);
if(in_array($item['obj_type'], ['Document', 'Video', 'Audio', 'Image'])) {
@@ -861,7 +861,12 @@ class Enotify {
if($item['edited'] > $item['created']) {
$edit = true;
$itemem_text = sprintf( t('edited a message dated %s'), relative_date($item['created']));
if($item['item_thread_top']) {
$itemem_text = sprintf( t('edited a post dated %s'), relative_date($item['created']));
}
else {
$itemem_text = sprintf( t('edited a comment dated %s'), relative_date($item['created']));
}
}

2
Zotlabs/Module/Sse_bs.php
View File

@@ -305,7 +305,7 @@ class Sse_bs extends Controller {
$item_normal = item_normal();
// Filter internal follow activities and strerams add/remove activities
$item_normal .= " AND item.verb NOT IN ('Add', 'Remove', 'Follow', 'Ignore', '" . dbesc(ACTIVITY_FOLLOW) . "') ";
$item_normal .= " AND verb NOT IN ('Add', 'Remove', 'Follow', 'Ignore', '" . dbesc(ACTIVITY_FOLLOW) . "') ";
if ($notifications) {
$items = q("SELECT item.*, tp.uuid AS thr_parent_uuid FROM item

10
Zotlabs/Widget/Messages.php
View File

@@ -42,14 +42,14 @@ class Messages {
'$feature_file' => feature_enabled(local_channel(), 'filing'),
'$file_tags' => $file_tags,
'$strings' => [
'messages_title' => t('Public and restricted conversations'),
'direct_messages_title' => t('Private conversations'),
'starred_messages_title' => t('Starred conversations'),
'messages_title' => t('Public and restricted messages'),
'direct_messages_title' => t('Direct messages'),
'starred_messages_title' => t('Starred messages'),
'filed_messages_title' => t('Filed messages'),
'notice_messages_title' => t('Notices'),
'loading' => t('Loading'),
'empty' => t('No conversations'),
'unseen_count' => t('Unseen reactions'),
'empty' => t('No messages'),
'unseen_count' => t('Unseen'),
'filter' => t('Filter by name or address'),
'file_filter' => t('Filter by file name')
]

30
Zotlabs/Widget/Notifications.php
View File

@@ -21,7 +21,7 @@ class Notifications {
'icon' => 'grid-3x3',
'severity' => 'secondary',
'label' => t('Network'),
'title' => t('Unseen network activity'),
'title' => t('New network activity notifications'),
'viewall' => [
'url' => 'network',
'label' => t('Network stream')
@@ -30,7 +30,7 @@ class Notifications {
'label' => t('Mark all notifications read')
],
'filter' => [
'posts_label' => t('Show conversations only'),
'posts_label' => t('Show new posts only'),
'name_label' => t('Filter by name or address')
]
];
@@ -40,17 +40,17 @@ class Notifications {
'type' => 'home',
'icon' => 'house',
'severity' => 'danger',
'label' => t('Channel'),
'title' => t('Unseen channel activity'),
'label' => t('Home'),
'title' => t('New home activity notifications'),
'viewall' => [
'url' => 'channel/' . $channel['channel_address'],
'label' => t('Channel stream')
'label' => t('Home stream')
],
'markall' => [
'label' => t('Mark all notifications seen')
],
'filter' => [
'posts_label' => t('Show conversations only'),
'posts_label' => t('Show new posts only'),
'name_label' => t('Filter by name or address')
]
];
@@ -59,17 +59,17 @@ class Notifications {
'type' => 'dm',
'icon' => 'envelope',
'severity' => 'danger',
'label' => t('Private'),
'title' => t('Unseen private activity'),
'label' => t('Direct Messages'),
'title' => t('New direct messages notifications'),
'viewall' => [
'url' => 'network/?dm=1',
'label' => t('Private stream')
'label' => t('Direct messages stream')
],
'markall' => [
'label' => t('Mark all read')
'label' => t('Mark all notifications read')
],
'filter' => [
'posts_label' => t('Show conversations only'),
'posts_label' => t('Show new posts only'),
'name_label' => t('Filter by name or address')
]
];
@@ -94,7 +94,7 @@ class Notifications {
'icon' => 'people',
'severity' => 'danger',
'label' => t('New Connections'),
'title' => t('New connections'),
'title' => t('New connections notifications'),
'viewall' => [
'url' => 'connections',
'label' => t('View all connections')
@@ -106,15 +106,15 @@ class Notifications {
'icon' => 'folder',
'severity' => 'danger',
'label' => t('Files'),
'title' => t('New files'),
'title' => t('New files notifications'),
];
$notifications[] = [
'type' => 'notify',
'icon' => 'exclamation-circle',
'severity' => 'danger',
'label' => t('Notifications'),
'title' => t('New notifications'),
'label' => t('Notices'),
'title' => t('Notices'),
'viewall' => [
'url' => 'notifications/system',
'label' => t('View all notices')

4
include/conversation.php
View File

@@ -177,7 +177,9 @@ function localize_item(&$item){
case ACTIVITY_OBJ_NOTE:
case 'Note':
default:
$post_type = t('message');
$post_type = t('post');
if(((isset($obj['parent']) && isset($obj['id']) && $obj['id'] != $obj['parent'])) || isset($obj['inReplyTo']))
$post_type = t('comment');
break;
}

4
include/text.php
View File

@@ -2380,9 +2380,9 @@ function item_post_type($item) {
$post_type = t('event');
break;
default:
$post_type = t('conversation');
$post_type = t('post');
if($item['mid'] != $item['parent_mid'])
$post_type = t('message');
$post_type = t('comment');
break;
}

4
view/css/conversation.css
View File

@@ -199,10 +199,10 @@ a.wall-item-name-link {
.item-highlight-fade {
background-color: var(--bs-primary-bg-subtle);
animation: fadeBgOut .3s 1.5s backwards;
animation: fadeBgIn 1s .5s backwards;
}
@keyframes fadeBgOut {
@keyframes fadeBgIn {
from { background-color: var(--bs-primary-bg-subtle); }
to { background-color: none; }
}