Ticket #428

modules/base/notifications/classes/BxBaseModNotificationsModule.php

@@ -59,15 +59,22 @@ class BxBaseModNotificationsModule extends BxDolModule
             if($aHandler['type'] != BX_BASE_MOD_NTFS_HANDLER_TYPE_INSERT)
                 continue;
 
-			$aModule = array();
-			if(!empty($aHandler['module_name']))
-            	$aModule = $this->_oDb->getModuleByName($aHandler['module_name']);
-
-            if(empty($aModule))
-                $aModule['title'] = _t($sLangPrefix . '_alert_module_' . $aHandler['alert_unit']);
-
-			$sAction = !empty($aHandler['alert_action']) ? ' (' . _t($sLangPrefix . '_alert_action_' . $aHandler['alert_action']) . ')' : '';
-            $aResults[$aHandler['id']] = $aModule['title'] . $sAction;
+			$_sUnit = '_' . $aHandler['alert_unit'];
+			$sUnit = _t($_sUnit);
+			if(strcmp($_sUnit, $sUnit) == 0)
+				$sUnit = _t($sLangPrefix . '_alert_module_' . $aHandler['alert_unit']);
+
+			$sAction = '';
+            if(!empty($aHandler['alert_action'])) {
+            	$_sAction = '_' . $aHandler['alert_unit'] . '_alert_action_' . $aHandler['alert_action'];
+            	$sAction = _t($_sAction);
+            	if(strcmp($_sAction, $sAction) == 0)
+					$sAction = _t($sLangPrefix . '_alert_action_' . $aHandler['alert_action']);
+
+            	$sAction = ' (' . $sAction . ')';
+            }
+
+            $aResults[$aHandler['id']] = $sUnit . $sAction;
         }
 
         asort($aResults);

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

@@ -234,7 +234,9 @@
     <string name="_bx_events_txt_private_group"><![CDATA[Private event]]></string>
     <string name="_bx_events_txt_from_time_to_time"><![CDATA[{0} - {1}]]></string>
 
+	<string name="_bx_events_alert_action_fan_added"><![CDATA[member joined]]></string>
     <string name="_bx_events_txt_ntfs_fan_added"><![CDATA[<a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> event has got new member - <a href="{subentry_url}">{subentry_sample}</a>]]></string>
+    <string name="_bx_events_alert_action_join_request"><![CDATA[join request]]></string>
     <string name="_bx_events_txt_ntfs_join_request"><![CDATA[<a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> event has new request from <a href="{subentry_url}">{subentry_sample}</a>]]></string>
     <string name="_bx_events_txt_ntfs_timeline_post_common"><![CDATA[New post in <a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> event timeline  from <a href="{subentry_url}">{subentry_sample}</a>]]></string>
 

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

@@ -207,7 +207,9 @@
     <string name="_bx_groups_txt_from_admins"><![CDATA[From Admins]]></string>
     <string name="_bx_groups_txt_private_group"><![CDATA[Private group]]></string>
 
+	<string name="_bx_groups_alert_action_fan_added"><![CDATA[member joined]]></string>
     <string name="_bx_groups_txt_ntfs_fan_added"><![CDATA[<a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> group has got new member - <a href="{subentry_url}">{subentry_sample}</a>]]></string>
+    <string name="_bx_groups_alert_action_join_request"><![CDATA[join request]]></string>
     <string name="_bx_groups_txt_ntfs_join_request"><![CDATA[<a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> group has new request from <a href="{subentry_url}">{subentry_sample}</a>]]></string>
     <string name="_bx_groups_txt_ntfs_timeline_post_common"><![CDATA[New post in <a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> group timeline  from <a href="{subentry_url}">{subentry_sample}</a>]]></string>
 

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

@@ -24,10 +24,10 @@
 	<string name="_bx_ntfs_alert_action_added"><![CDATA[add]]></string>
 	<string name="_bx_ntfs_alert_action_commentPost"><![CDATA[add comment]]></string>
 	<string name="_bx_ntfs_alert_action_doVote"><![CDATA[add vote]]></string>
+	<string name="_bx_ntfs_alert_action_timeline_post_common"><![CDATA[post to timeline]]></string> 
+
+	<string name="_bx_ntfs_alert_module_sys_profiles_subscriptions"><![CDATA[Profiles Subscriptions]]></string>
 	<string name="_bx_ntfs_alert_action_connection_added"><![CDATA[add connection]]></string>
-	<string name="_bx_ntfs_alert_action_fan_added"><![CDATA[member joined]]></string>
-    <string name="_bx_ntfs_alert_action_join_request"><![CDATA[join request]]></string>
-    <string name="_bx_ntfs_alert_action_timeline_post_common"><![CDATA[post to timeline]]></string>
 
 	<string name="_bx_ntfs_txt_msg_no_results"><![CDATA[Empty]]></string>
 	<string name="_bx_ntfs_txt_object_added"><![CDATA[<a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> added a new {entry_sample} <a href="{entry_url}">{entry_caption}</a>]]></string>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="en" flag="gb" title="English">
-
 	<string name="_bx_orgs"><![CDATA[Organizations]]></string>
+	<string name="_bx_organizations"><![CDATA[Organizations]]></string>
 
 	<string name="_bx_orgs_option_autoapproval"><![CDATA[Activate all organizations after creation automatically]]></string>
 	<string name="_bx_orgs_option_default_acl_level"><![CDATA[Default level to assign after organizations's profile creation]]></string>

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

@@ -232,7 +232,9 @@
     <string name="_bx_events_txt_private_group"><![CDATA[Приватная группа]]></string>
     <string name="_bx_events_txt_from_time_to_time"><![CDATA[{0} - {1}]]></string>
 
+	<string name="_bx_events_alert_action_fan_added"><![CDATA[присоединение нового участника]]></string>
     <string name="_bx_events_txt_ntfs_fan_added"><![CDATA[У <a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> события новый участник - <a href="{subentry_url}">{subentry_sample}</a>]]></string>
+    <string name="_bx_events_alert_action_join_request"><![CDATA[запрос на присоединение к событию]]></string>
     <string name="_bx_events_txt_ntfs_join_request"><![CDATA[У <a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> события новый запрос на присоединение от <a href="{subentry_url}">{subentry_sample}</a>]]></string>
     <string name="_bx_events_txt_ntfs_timeline_post_common"><![CDATA[В <a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> событии новая публикация от <a href="{subentry_url}">{subentry_sample}</a>]]></string>
 

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

@@ -206,7 +206,9 @@
     <string name="_bx_groups_txt_from_admins"><![CDATA[Из админов]]></string>
     <string name="_bx_groups_txt_private_group"><![CDATA[Приватная группа]]></string>
 
+	<string name="_bx_groups_alert_action_fan_added"><![CDATA[присоединение нового участника]]></string>
     <string name="_bx_groups_txt_ntfs_fan_added"><![CDATA[В группу "<a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a>" добавился новый член - <a href="{subentry_url}">{subentry_sample}</a>]]></string>
+    <string name="_bx_groups_alert_action_join_request"><![CDATA[запрос на присоединение к событию]]></string>
     <string name="_bx_groups_txt_ntfs_join_request"><![CDATA[В группу "<a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a>" хочет присоединиться новый член - <a href="{subentry_url}">{subentry_sample}</a>]]></string>
     <string name="_bx_groups_txt_ntfs_timeline_post_common"><![CDATA[В группе <a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> новая публикация от <a href="{subentry_url}">{subentry_sample}</a>]]></string>
 

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

@@ -24,10 +24,10 @@
 	<string name="_bx_ntfs_alert_action_added"><![CDATA[добавить]]></string>
 	<string name="_bx_ntfs_alert_action_commentPost"><![CDATA[добавить коментарий]]></string>
 	<string name="_bx_ntfs_alert_action_doVote"><![CDATA[добавить голос]]></string>
-	<string name="_bx_ntfs_alert_action_connection_added"><![CDATA[добавить связь]]></string>
-	<string name="_bx_ntfs_alert_action_fan_added"><![CDATA[присоединение нового участника]]></string>
-    <string name="_bx_ntfs_alert_action_join_request"><![CDATA[запрос на присоединение к событию]]></string>
-    <string name="_bx_ntfs_alert_action_timeline_post_common"><![CDATA[сообщение на линейке]]></string>
+	<string name="_bx_ntfs_alert_action_timeline_post_common"><![CDATA[сообщение на линейке]]></string>
+
+	<string name="_bx_ntfs_alert_module_sys_profiles_subscriptions"><![CDATA[Подписки профайлов]]></string>
+	<string name="_bx_ntfs_alert_action_connection_added"><![CDATA[добавить связь]]></string>	
 
 	<string name="_bx_ntfs_txt_msg_no_results"><![CDATA[Пусто]]></string>
 	<string name="_bx_ntfs_txt_object_added"><![CDATA[<a class="bx-ntfs-content-profile" href="{owner_link}">{owner_name}</a> добавил новое {entry_sample} <a href="{entry_url}">{entry_caption}</a>]]></string>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="ru" flag="ru" title="Russian">
-
 	<string name="_bx_orgs"><![CDATA[Организации]]></string>
+	<string name="_bx_organizations"><![CDATA[Организации]]></string>
 
 	<string name="_bx_orgs_option_autoapproval"><![CDATA[Автоматически активировать все организации после создания]]></string>
 	<string name="_bx_orgs_option_default_acl_level"><![CDATA[Уровень, назначаемый созданному профилю организации по умолчанию]]></string>