Ticket #5653 - Notifications: Make notifications more accurate. Tasks.

modules/boonex/russian/data/langs/bx_tasks/ru.xml

@@ -546,7 +546,6 @@
     <string name="_bx_tasks_txt_action_completed"><![CDATA[выполнено]]></string>
     <string name="_bx_tasks_txt_action_reopened"><![CDATA[открыто заново]]></string>
     <string name="_bx_tasks_txt_sample_comment_single"><![CDATA[комментарий к заданию]]></string>
-    <string name="_bx_tasks_txt_sample_comment_single_short"><![CDATA[комментарий]]></string>
     <string name="_bx_tasks_txt_sample_vote_single"><![CDATA[голос за задание]]></string>
     <string name="_bx_tasks_txt_sample_reaction_single"><![CDATA[реакция '{0}' к заданию]]></string>
     <string name="_bx_tasks_txt_sample_score_up_single"><![CDATA[голос за задание]]></string>
@@ -603,15 +602,14 @@
     <string name="_bx_tasks_alert_action_expired_personal"><![CDATA[Задание устарело]]></string>
     <string name="_bx_tasks_alert_action_assigned_personal"><![CDATA[Задание назначено]]></string>
 
-    <string name="_bx_tasks_txt_subobject_added_in_context"><![CDATA[<b class="bx-ntfs-content-entry">{entry_caption}</b> в <b class="bx-ntfs-content-profile">{owner_name}</b> - {subentry_sample}]]></string>
-    <string name="_bx_tasks_txt_notification_completed"><![CDATA[<b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} было завершено]]></string>
-    <string name="_bx_tasks_txt_notification_completed_in_context"><![CDATA[<b class="bx-ntfs-content-profile">{owner_name}</b>'s {entry_sample} <b class="bx-ntfs-content-entry">{entry_caption}</b> было завершено]]></string>
-    <string name="_bx_tasks_txt_notification_reopened"><![CDATA[<b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} было открыто заново]]></string>
-    <string name="_bx_tasks_txt_notification_reopened_in_context"><![CDATA[<b class="bx-ntfs-content-profile">{owner_name}</b>'s {entry_sample} <b class="bx-ntfs-content-entry">{entry_caption}</b> было открыто заново]]></string>
+    <string name="_bx_tasks_txt_notification_completed"><![CDATA[{author_name_wrapped} - <b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} было завершено]]></string>
+    <string name="_bx_tasks_txt_notification_completed_in_context"><![CDATA[{author_name_wrapped} - <b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} было завершено в <b class="bx-ntfs-content-profile">{owner_name}</b>]]></string>
+    <string name="_bx_tasks_txt_notification_reopened"><![CDATA[{author_name_wrapped} - <b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} было открыто заново]]></string>
+    <string name="_bx_tasks_txt_notification_reopened_in_context"><![CDATA[{author_name_wrapped} - <b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} было открыто заново в <b class="bx-ntfs-content-profile">{owner_name}</b>]]></string>
     <string name="_bx_tasks_txt_notification_expired"><![CDATA[<b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} устарело]]></string>
-    <string name="_bx_tasks_txt_notification_expired_in_context"><![CDATA[<b class="bx-ntfs-content-profile">{owner_name}</b>'s {entry_sample} <b class="bx-ntfs-content-entry">{entry_caption}</b> устарело]]></string>
-    <string name="_bx_tasks_txt_notification_assigned"><![CDATA[<b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} было назначено на <b class="bx-ntfs-content-profile">{entry_author_name}</b>]]></string>
-    <string name="_bx_tasks_txt_notification_assigned_in_context"><![CDATA[<b class="bx-ntfs-content-profile">{owner_name}</b>'s {entry_sample} <b class="bx-ntfs-content-entry">{entry_caption}</b> было назначено на <b class="bx-ntfs-content-profile">{entry_author_name}</b>]]></string>
+    <string name="_bx_tasks_txt_notification_expired_in_context"><![CDATA[<b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} устарело в <b class="bx-ntfs-content-profile">{owner_name}</b>]]></string>
+    <string name="_bx_tasks_txt_notification_assigned"><![CDATA[{author_name_wrapped} - <b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} было назначено на <b class="bx-ntfs-content-profile">{entry_author_name}</b>]]></string>
+    <string name="_bx_tasks_txt_notification_assigned_in_context"><![CDATA[{author_name_wrapped} - <b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} было назначено на <b class="bx-ntfs-content-profile">{entry_author_name}</b> в <b class="bx-ntfs-content-profile">{owner_name}</b>]]></string>
 
     <!-- Timeline -->
     <string name="_bx_tasks_alert_action_completed"><![CDATA[завершено]]></string>

modules/boonex/tasks/classes/BxTasksModule.php

@@ -932,19 +932,6 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
         return $aResult; 
     }
 
-    public function serviceGetNotificationsComment($aEvent)
-    {
-        $aResult = parent::serviceGetNotificationsComment($aEvent);
-
-        if((int)$aEvent['object_privacy_view'] < 0)
-            $aResult = array_merge($aResult, [
-                'subentry_sample' => '_bx_tasks_txt_sample_comment_single_short',
-                'lang_key' => '_bx_tasks_txt_subobject_added_in_context'
-            ]);
-
-        return $aResult;
-    }
-
     public function serviceGetNotificationsCompleted($aEvent)
     {
         return $this->_serviceGetNotificationsByAction($aEvent, 'completed');
@@ -1415,7 +1402,7 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
         if($oConnection) {
             $aProfileIds = $oConnection->getConnectedContent($iContentId);
             if(!empty($aProfileIds) && is_array($aProfileIds))
-                foreach($aProfileIds as $iProfileId){
+                foreach($aProfileIds as $iProfileId) {
                     /**
                      * @hooks
                      * @hookdef hook-bx_tasks-expired 'bx_tasks', 'expired' - hook on task unassigned to profile
@@ -1428,7 +1415,7 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
                      *      - `privacy_view` - [string] privacy view value
                      * @hook @ref hook-bx_tasks-expired
                      */
-                    bx_alert($this->getName(), 'expired', $iContentId, false, array(
+                    bx_alert($this->getName(), 'expired', $iContentId, getParam('sys_profile_bot'), array(
                         'object_author_id' => $iProfileId,
                         'privacy_view' => $aContentInfo[$CNF['FIELD_ALLOW_VIEW_TO']]
                     ));

modules/boonex/tasks/install/langs/en.xml

@@ -553,7 +553,6 @@
     <string name="_bx_tasks_txt_action_completed"><![CDATA[completed]]></string>
     <string name="_bx_tasks_txt_action_reopened"><![CDATA[reopened]]></string>
     <string name="_bx_tasks_txt_sample_comment_single"><![CDATA[comment to task]]></string>
-    <string name="_bx_tasks_txt_sample_comment_single_short"><![CDATA[comment]]></string>
     <string name="_bx_tasks_txt_sample_vote_single"><![CDATA[vote to task]]></string>
     <string name="_bx_tasks_txt_sample_reaction_single"><![CDATA['{0}' reaction to task]]></string>
     <string name="_bx_tasks_txt_sample_score_up_single"><![CDATA[score up vote to task]]></string>
@@ -617,15 +616,14 @@
     <string name="_bx_tasks_alert_action_expired_personal"><![CDATA[Expire task]]></string>
     <string name="_bx_tasks_alert_action_assigned_personal"><![CDATA[Assign task]]></string>
 
-    <string name="_bx_tasks_txt_subobject_added_in_context"><![CDATA[<b class="bx-ntfs-content-entry">{entry_caption}</b> in <b class="bx-ntfs-content-profile">{owner_name}</b> has got a {subentry_sample}]]></string>
-    <string name="_bx_tasks_txt_notification_completed"><![CDATA[<b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} was completed]]></string>
-    <string name="_bx_tasks_txt_notification_completed_in_context"><![CDATA[<b class="bx-ntfs-content-profile">{owner_name}</b>'s {entry_sample} <b class="bx-ntfs-content-entry">{entry_caption}</b> was completed]]></string>
-    <string name="_bx_tasks_txt_notification_reopened"><![CDATA[<b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} was reopened]]></string>
-    <string name="_bx_tasks_txt_notification_reopened_in_context"><![CDATA[<b class="bx-ntfs-content-profile">{owner_name}</b>'s {entry_sample} <b class="bx-ntfs-content-entry">{entry_caption}</b> was reopened]]></string>
+    <string name="_bx_tasks_txt_notification_completed"><![CDATA[{author_name_wrapped} completed {entry_sample} <b class="bx-ntfs-content-entry">{entry_caption}</b>]]></string>
+    <string name="_bx_tasks_txt_notification_completed_in_context"><![CDATA[{author_name_wrapped} completed {entry_sample} <b class="bx-ntfs-content-entry">{entry_caption}</b> in <b class="bx-ntfs-content-profile">{owner_name}</b>]]></string>
+    <string name="_bx_tasks_txt_notification_reopened"><![CDATA[{author_name_wrapped} reopened {entry_sample} <b class="bx-ntfs-content-entry">{entry_caption}</b>]]></string>
+    <string name="_bx_tasks_txt_notification_reopened_in_context"><![CDATA[{author_name_wrapped} reopened {entry_sample} <b class="bx-ntfs-content-entry">{entry_caption}</b> in <b class="bx-ntfs-content-profile">{owner_name}</b>]]></string>
     <string name="_bx_tasks_txt_notification_expired"><![CDATA[<b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} expired]]></string>
-    <string name="_bx_tasks_txt_notification_expired_in_context"><![CDATA[<b class="bx-ntfs-content-profile">{owner_name}</b>'s {entry_sample} <b class="bx-ntfs-content-entry">{entry_caption}</b> expired]]></string>
-    <string name="_bx_tasks_txt_notification_assigned"><![CDATA[<b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} was assigned to <b class="bx-ntfs-content-profile">{entry_author_name}</b>]]></string>
-    <string name="_bx_tasks_txt_notification_assigned_in_context"><![CDATA[<b class="bx-ntfs-content-profile">{owner_name}</b>'s {entry_sample} <b class="bx-ntfs-content-entry">{entry_caption}</b> was assigned to <b class="bx-ntfs-content-profile">{entry_author_name}</b>]]></string>
+    <string name="_bx_tasks_txt_notification_expired_in_context"><![CDATA[<b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} expired in <b class="bx-ntfs-content-profile">{owner_name}</b>]]></string>
+    <string name="_bx_tasks_txt_notification_assigned"><![CDATA[{author_name_wrapped} assigned <b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} to <b class="bx-ntfs-content-profile">{entry_author_name}</b>]]></string>
+    <string name="_bx_tasks_txt_notification_assigned_in_context"><![CDATA[{author_name_wrapped} assigned <b class="bx-ntfs-content-entry">{entry_caption}</b> {entry_sample} to <b class="bx-ntfs-content-profile">{entry_author_name}</b> in <b class="bx-ntfs-content-profile">{owner_name}</b>]]></string>
 
     <!-- Timeline -->
     <string name="_bx_tasks_alert_action_completed"><![CDATA[completed]]></string>