1
0
Эх сурвалжийг харах

Ticket #2973 - Usage in Organizations and Spaces.

AntonLV 6 жил өмнө
parent
commit
b317d9a75a

+ 4 - 2
modules/boonex/organizations/classes/BxOrgsConfig.php

@@ -102,6 +102,7 @@ class BxOrgsConfig extends BxBaseModGroupsConfig
             'PARAM_MULTICAT_ENABLED' => true,
             'PARAM_MULTICAT_AUTO_ACTIVATION_FOR_CATEGORIES' => 'bx_organizations_auto_activation_for_categories',
             'PARAM_PER_PAGE_FOR_FAVORITES_LISTS' => 'bx_organizations_per_page_for_favorites_lists',
+            'PARAM_USE_IN' => 'bx_organizations_internal_notifications',
 
             // objects
             'OBJECT_STORAGE' => 'bx_organizations_pics',
@@ -215,6 +216,7 @@ class BxOrgsConfig extends BxBaseModGroupsConfig
             	'txt_private_group' => '_bx_orgs_txt_private_organization',
                 'txt_group_participants' => '_bx_orgs_ps_group_title_participants',
                 'txt_N_fans' => '_bx_orgs_txt_N_friends',
+                'txt_ntfs_join_invitation' => '_bx_orgs_txt_ntfs_join_invitation',
             	'txt_ntfs_join_request' => '_bx_orgs_txt_ntfs_join_request',
                 'txt_ntfs_fan_added' => '_bx_orgs_txt_ntfs_fan_added',
             	'txt_ntfs_timeline_post_common' => '_bx_orgs_txt_ntfs_timeline_post_common',
@@ -235,12 +237,12 @@ class BxOrgsConfig extends BxBaseModGroupsConfig
             	'menu_item_manage_all' => '_bx_orgs_menu_item_title_manage_all',
             	'grid_action_err_delete' => '_bx_orgs_grid_action_err_delete',
             	'grid_txt_account_manager' => '_bx_orgs_grid_txt_account_manager',
-				'filter_item_active' => '_bx_orgs_grid_filter_item_title_adm_active',
+                'filter_item_active' => '_bx_orgs_grid_filter_item_title_adm_active',
             	'filter_item_pending' => '_bx_orgs_grid_filter_item_title_adm_pending',
             	'filter_item_suspended' => '_bx_orgs_grid_filter_item_title_adm_suspended',
                 'filter_item_unconfirmed' => '_bx_orgs_grid_filter_item_title_adm_unconfirmed',
             	'filter_item_select_one_filter1' => '_bx_orgs_grid_filter_item_title_adm_select_one_filter1',
-				'filter_item_select_one_filter2' => '_bx_orgs_grid_filter_item_title_adm_select_one_filter2',
+                'filter_item_select_one_filter2' => '_bx_orgs_grid_filter_item_title_adm_select_one_filter2',
             	'txt_browse_favorites' => '_bx_orgs_page_title_browse_favorites',
             	'option_redirect_aadd_profile' => '_bx_orgs_option_redirect_aadd_profile',
             	'option_redirect_aadd_last' => '_bx_orgs_option_redirect_aadd_last',

+ 35 - 32
modules/boonex/organizations/install/langs/en.xml

@@ -1,34 +1,35 @@
 <?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_cmts"><![CDATA[Organizations' Comments]]></string>
+    <string name="_bx_orgs"><![CDATA[Organizations]]></string>
+    <string name="_bx_organizations"><![CDATA[Organizations]]></string>
+    <string name="_bx_orgs_cmts"><![CDATA[Organizations' Comments]]></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>
-  <string name="_bx_orgs_option_enable_profile_activation_letter"><![CDATA[Enable profile activation letter]]></string>
-  <string name="_bx_orgs_option_redirect_aadd"><![CDATA[Redirect after organizations's profile creation to]]></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>
+    <string name="_bx_orgs_option_enable_profile_activation_letter"><![CDATA[Enable profile activation letter]]></string>
+    <string name="_bx_orgs_option_redirect_aadd"><![CDATA[Redirect after organizations's profile creation to]]></string>
     <string name="_bx_orgs_option_redirect_aadd_profile"><![CDATA[Profile Page]]></string>
     <string name="_bx_orgs_option_redirect_aadd_last"><![CDATA[Last Page]]></string>
     <string name="_bx_orgs_option_redirect_aadd_custom"><![CDATA[Custom Page]]></string>
     <string name="_bx_orgs_option_redirect_aadd_custom_url"><![CDATA[URL for 'Custom Page' redirect]]></string>
-	<string name="_bx_orgs_option_num_connections_quick"><![CDATA[Number of items in friends block]]></string>
-	<string name="_bx_orgs_option_per_page_browse"><![CDATA[Number of items per page]]></string>
+    <string name="_bx_orgs_option_num_connections_quick"><![CDATA[Number of items in friends block]]></string>
+    <string name="_bx_orgs_option_per_page_browse"><![CDATA[Number of items per page]]></string>
     <string name="_bx_orgs_option_num_rss"><![CDATA[Number of items in RSS feed]]></string>
     <string name="_bx_orgs_option_searchable_fields"><![CDATA[Searchable fields for keyword search]]></string>
     <string name="_bx_orgs_option_public_subscriptions"><![CDATA[Public following list]]></string>
     <string name="_bx_orgs_option_public_subscribed_me"><![CDATA[Public followers list]]></string>
     <string name="_bx_orgs_option_auto_activation_for_categories"><![CDATA[Auto-Activation For Categories]]></string>
     <string name="_bx_orgs_option_per_page_for_favorites_lists"><![CDATA[Number of favorite lists per page]]></string>
+    <string name="_bx_orgs_option_internal_notifications"><![CDATA[Use internal notifications]]></string>
 
-	<string name="_bx_orgs_form_profile"><![CDATA[Organizations]]></string>
-	<string name="_bx_orgs_form_profile_display_add"><![CDATA[Add Organization]]></string>
-	<string name="_bx_orgs_form_profile_display_edit"><![CDATA[Edit Organization]]></string>
-	<string name="_bx_orgs_form_profile_display_edit_cover"><![CDATA[Edit Cover]]></string>
-	<string name="_bx_orgs_form_profile_display_delete"><![CDATA[Delete Organization]]></string>
-	<string name="_bx_orgs_form_profile_display_view"><![CDATA[View Organization]]></string>
-	<string name="_bx_orgs_form_profile_display_view_full"><![CDATA[Full View Organization]]></string>
-	<string name="_bx_orgs_form_profile_display_invite"><![CDATA[Invite to Organization]]></string>
+    <string name="_bx_orgs_form_profile"><![CDATA[Organizations]]></string>
+    <string name="_bx_orgs_form_profile_display_add"><![CDATA[Add Organization]]></string>
+    <string name="_bx_orgs_form_profile_display_edit"><![CDATA[Edit Organization]]></string>
+    <string name="_bx_orgs_form_profile_display_edit_cover"><![CDATA[Edit Cover]]></string>
+    <string name="_bx_orgs_form_profile_display_delete"><![CDATA[Delete Organization]]></string>
+    <string name="_bx_orgs_form_profile_display_view"><![CDATA[View Organization]]></string>
+    <string name="_bx_orgs_form_profile_display_view_full"><![CDATA[Full View Organization]]></string>
+    <string name="_bx_orgs_form_profile_display_invite"><![CDATA[Invite to Organization]]></string>
     <string name="_bx_orgs_form_profile_input_sys_do_submit"><![CDATA[Submit]]></string>
     <string name="_bx_orgs_form_profile_input_sys_join_confirm"><![CDATA[Join confirmation]]></string>
     <string name="_bx_orgs_form_profile_input_join_confirm"><![CDATA[Join confirmation]]></string>
@@ -49,23 +50,23 @@
     <string name="_bx_orgs_form_profile_input_sys_org_desc"><![CDATA[Description]]></string>
     <string name="_bx_orgs_form_profile_input_org_desc"><![CDATA[Description]]></string>
     <string name="_bx_orgs_form_profile_input_sys_org_cat"><![CDATA[Category]]></string>
-	<string name="_bx_orgs_form_profile_input_org_cat"><![CDATA[Category]]></string>
+    <string name="_bx_orgs_form_profile_input_org_cat"><![CDATA[Category]]></string>
     <string name="_bx_orgs_form_profile_input_org_cat_err"><![CDATA[Category field is mandatory]]></string>
-  <string name="_bx_orgs_form_entry_input_sys_multicat"><![CDATA[Categories]]></string>
-  <string name="_bx_orgs_form_entry_input_multicat"><![CDATA[Categories]]></string>
-  <string name="_bx_orgs_form_entry_input_multicat_err"><![CDATA[Please select category]]></string>
-	<string name="_bx_orgs_form_profile_input_sys_picture"><![CDATA[Profile Picture]]></string>
-	<string name="_bx_orgs_form_profile_input_picture"><![CDATA[Upload a profile picture]]></string>
-	<string name="_bx_orgs_form_profile_input_picture_err"><![CDATA[Profile picture is mandatory.]]></string>
-	<string name="_bx_orgs_form_profile_input_picture_search"><![CDATA[With photo]]></string>
+    <string name="_bx_orgs_form_entry_input_sys_multicat"><![CDATA[Categories]]></string>
+    <string name="_bx_orgs_form_entry_input_multicat"><![CDATA[Categories]]></string>
+    <string name="_bx_orgs_form_entry_input_multicat_err"><![CDATA[Please select category]]></string>
+    <string name="_bx_orgs_form_profile_input_sys_picture"><![CDATA[Profile Picture]]></string>
+    <string name="_bx_orgs_form_profile_input_picture"><![CDATA[Upload a profile picture]]></string>
+    <string name="_bx_orgs_form_profile_input_picture_err"><![CDATA[Profile picture is mandatory.]]></string>
+    <string name="_bx_orgs_form_profile_input_picture_search"><![CDATA[With photo]]></string>
     <string name="_bx_orgs_form_profile_input_online_search"><![CDATA[Online only]]></string>
-	<string name="_bx_orgs_form_profile_input_sys_cover"><![CDATA[Cover Picture]]></string>
-	<string name="_bx_orgs_form_profile_input_cover"><![CDATA[Upload New Cover Picture]]></string>
-	<string name="_bx_orgs_form_profile_input_sys_delete_confirm"><![CDATA[Delete confirmation]]></string>
-	<string name="_bx_orgs_form_profile_input_delete_confirm"><![CDATA[I am sure I want to delete this profile]]></string>
-	<string name="_bx_orgs_form_profile_input_delete_confirm_info"><![CDATA[This action can not be undone.]]></string>
-	<string name="_bx_orgs_form_profile_input_delete_confirm_error"><![CDATA[Please check this checkbox if you really want to delete your profile.]]></string>
-	<string name="_bx_orgs_form_profile_input_sys_profile_email"><![CDATA[Email]]></string>
+    <string name="_bx_orgs_form_profile_input_sys_cover"><![CDATA[Cover Picture]]></string>
+    <string name="_bx_orgs_form_profile_input_cover"><![CDATA[Upload New Cover Picture]]></string>
+    <string name="_bx_orgs_form_profile_input_sys_delete_confirm"><![CDATA[Delete confirmation]]></string>
+    <string name="_bx_orgs_form_profile_input_delete_confirm"><![CDATA[I am sure I want to delete this profile]]></string>
+    <string name="_bx_orgs_form_profile_input_delete_confirm_info"><![CDATA[This action can not be undone.]]></string>
+    <string name="_bx_orgs_form_profile_input_delete_confirm_error"><![CDATA[Please check this checkbox if you really want to delete your profile.]]></string>
+    <string name="_bx_orgs_form_profile_input_sys_profile_email"><![CDATA[Email]]></string>
     <string name="_bx_orgs_form_profile_input_profile_email"><![CDATA[Email]]></string>
     <string name="_bx_orgs_form_profile_input_sys_profile_status"><![CDATA[Status]]></string>
     <string name="_bx_orgs_form_profile_input_profile_status"><![CDATA[Status]]></string>
@@ -395,10 +396,12 @@
     <string name="_bx_orgs_role_moderator"><![CDATA[Moderator]]></string>
 
     <string name="_bx_organizations_alert_action_fan_added"><![CDATA[member joined]]></string>
+    <string name="_bx_organizations_alert_action_join_invitation_notif"><![CDATA[join invitation]]></string>
     <string name="_bx_organizations_alert_action_join_request"><![CDATA[join request]]></string>
     <string name="_bx_organizations_alert_action_profile_cover_changed"><![CDATA[cover changed]]></string>
     <string name="_bx_organizations_alert_action_profile_picture_changed"><![CDATA[picture changed]]></string>
     <string name="_bx_orgs_txt_ntfs_fan_added"><![CDATA[Organization <b class="bx-ntfs-content-profile">{owner_name}</b> has got a member <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
+    <string name="_bx_orgs_txt_ntfs_join_invitation"><![CDATA[<b class="bx-ntfs-content-profile">{owner_name}</b> organization's representative invites <b class="bx-ntfs-content-entry">{subentry_sample}</b> to join organization]]></string>
     <string name="_bx_orgs_txt_ntfs_join_request"><![CDATA[Organization <b class="bx-ntfs-content-profile">{owner_name}</b> has a join request from <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
     <string name="_bx_orgs_txt_ntfs_timeline_post_common"><![CDATA[New post <b class="bx-ntfs-content-entry">{subentry_sample}</b> in <b class="bx-ntfs-content-profile">{owner_name}</b> organization timeline]]></string>
 

+ 2 - 1
modules/boonex/organizations/install/sql/enable.sql

@@ -25,7 +25,8 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `e
 ('bx_organizations_public_subscriptions', '', @iCategId, '_bx_orgs_option_public_subscriptions', 'checkbox', '', '', '', 30),
 ('bx_organizations_public_subscribed_me', '', @iCategId, '_bx_orgs_option_public_subscribed_me', 'checkbox', '', '', '', 31),
 ('bx_organizations_enable_profile_activation_letter', 'on', @iCategId, '_bx_orgs_option_enable_profile_activation_letter', 'checkbox', '', '', '', 32),
-('bx_organizations_auto_activation_for_categories', 'on', @iCategId, '_bx_orgs_option_auto_activation_for_categories', 'checkbox', '', '', '', 35);
+('bx_organizations_auto_activation_for_categories', 'on', @iCategId, '_bx_orgs_option_auto_activation_for_categories', 'checkbox', '', '', '', 35),
+('bx_organizations_internal_notifications', '', @iCategId, '_bx_orgs_option_internal_notifications', 'checkbox', '', '', '', 40);
 
 -- PAGES
 

+ 36 - 34
modules/boonex/russian/data/langs/bx_events/ru.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="ru" flag="ru" title="Russian">
+    <string name="_bx_events"><![CDATA[События]]></string>
+    <string name="_bx_events_cmts"><![CDATA[События - Комментарии]]></string>
 
-	<string name="_bx_events"><![CDATA[События]]></string>
-	<string name="_bx_events_cmts"><![CDATA[События - Комментарии]]></string>
-
-	<string name="_bx_events_option_num_connections_quick"><![CDATA[Количество элементов в блоке друзей]]></string>
+    <string name="_bx_events_option_num_connections_quick"><![CDATA[Количество элементов в блоке друзей]]></string>
     <string name="_bx_events_option_per_page_browse"><![CDATA[Количество элементов на странице]]></string>
-	<string name="_bx_events_option_num_rss"><![CDATA[Количество элементов в ленте RSS]]></string>
+    <string name="_bx_events_option_num_rss"><![CDATA[Количество элементов в ленте RSS]]></string>
     <string name="_bx_events_option_time_format"><![CDATA[Формат времени]]></string>
     <string name="_bx_events_option_short_date_format"><![CDATA[Короткий формат даты]]></string>
     <string name="_bx_events_option_datetime_format"><![CDATA[Формат даты со временем]]></string>
@@ -14,17 +13,18 @@
     <string name="_bx_events_option_searchable_fields"><![CDATA[Поля для поиска]]></string>
     <string name="_bx_events_option_public_subscribed_me"><![CDATA[Открытый список заинтересованных пользователей]]></string>
     <string name="_bx_events_option_per_page_for_favorites_lists"><![CDATA[Количество списков избранного на странице]]></string>
-
-	<string name="_bx_events_form_profile"><![CDATA[События]]></string>
-	<string name="_bx_events_form_profile_display_add"><![CDATA[Добавление события]]></string>
-	<string name="_bx_events_form_profile_display_edit"><![CDATA[Редактирование события]]></string>
-	<string name="_bx_events_form_profile_display_edit_cover"><![CDATA[Редактирование обложки]]></string>
-	<string name="_bx_events_form_profile_display_delete"><![CDATA[Удаление события]]></string>
-	<string name="_bx_events_form_profile_display_view"><![CDATA[Просмотр события]]></string>
+    <string name="_bx_events_option_internal_notifications"><![CDATA[Использовать встроенную нотификацию]]></string>
+
+    <string name="_bx_events_form_profile"><![CDATA[События]]></string>
+    <string name="_bx_events_form_profile_display_add"><![CDATA[Добавление события]]></string>
+    <string name="_bx_events_form_profile_display_edit"><![CDATA[Редактирование события]]></string>
+    <string name="_bx_events_form_profile_display_edit_cover"><![CDATA[Редактирование обложки]]></string>
+    <string name="_bx_events_form_profile_display_delete"><![CDATA[Удаление события]]></string>
+    <string name="_bx_events_form_profile_display_view"><![CDATA[Просмотр события]]></string>
     <string name="_bx_events_form_profile_display_view_full"><![CDATA[Полный просмотр события]]></string>
     <string name="_bx_events_form_profile_display_invite"><![CDATA[Приглашение на событие]]></string>
     <string name="_bx_events_form_profile_input_author"><![CDATA[Автор]]></string>
-	<string name="_bx_events_form_profile_input_sys_do_submit"><![CDATA[Выполнить]]></string>
+    <string name="_bx_events_form_profile_input_sys_do_submit"><![CDATA[Выполнить]]></string>
     <string name="_bx_events_form_profile_input_sys_join_confirm"><![CDATA[Подтверждение регистрации]]></string>
     <string name="_bx_events_form_profile_input_join_confirm"><![CDATA[Подтверждение регистрации]]></string>
     <string name="_bx_events_form_profile_input_sys_allow_view_to"><![CDATA[Доступено для]]></string>
@@ -40,17 +40,17 @@
     <string name="_bx_events_form_profile_input_sys_event_desc"><![CDATA[Описание]]></string>
     <string name="_bx_events_form_profile_input_event_desc"><![CDATA[Описание]]></string>
     <string name="_bx_events_form_profile_input_sys_event_cat"><![CDATA[Категория]]></string>
-	<string name="_bx_events_form_profile_input_event_cat"><![CDATA[Категория]]></string>
+    <string name="_bx_events_form_profile_input_event_cat"><![CDATA[Категория]]></string>
     <string name="_bx_events_form_profile_input_event_cat_err"><![CDATA[Поле категории обязатаельное]]></string>
-	<string name="_bx_events_form_profile_input_sys_picture"><![CDATA[Картинка события]]></string>
-	<string name="_bx_events_form_profile_input_picture"><![CDATA[Загрузить новую картинку события]]></string>
-	<string name="_bx_events_form_profile_input_picture_err"><![CDATA[Картинка события обязательна]]></string>
-	<string name="_bx_events_form_profile_input_sys_cover"><![CDATA[Картинка обложки]]></string>
-	<string name="_bx_events_form_profile_input_cover"><![CDATA[Загрузить новую картинку обложки]]></string>
-	<string name="_bx_events_form_profile_input_sys_delete_confirm"><![CDATA[Подтверждение на удаление]]></string>
-	<string name="_bx_events_form_profile_input_delete_confirm"><![CDATA[Я уверен, что хочу удалить эту группу]]></string>
-	<string name="_bx_events_form_profile_input_delete_confirm_info"><![CDATA[Это действие не может быть отменено.]]></string>
-	<string name="_bx_events_form_profile_input_delete_confirm_error"><![CDATA[Пожалуйста, отметьте этот флажок, если действительно хотите удалить группу.]]></string>
+    <string name="_bx_events_form_profile_input_sys_picture"><![CDATA[Картинка события]]></string>
+    <string name="_bx_events_form_profile_input_picture"><![CDATA[Загрузить новую картинку события]]></string>
+    <string name="_bx_events_form_profile_input_picture_err"><![CDATA[Картинка события обязательна]]></string>
+    <string name="_bx_events_form_profile_input_sys_cover"><![CDATA[Картинка обложки]]></string>
+    <string name="_bx_events_form_profile_input_cover"><![CDATA[Загрузить новую картинку обложки]]></string>
+    <string name="_bx_events_form_profile_input_sys_delete_confirm"><![CDATA[Подтверждение на удаление]]></string>
+    <string name="_bx_events_form_profile_input_delete_confirm"><![CDATA[Я уверен, что хочу удалить эту группу]]></string>
+    <string name="_bx_events_form_profile_input_delete_confirm_info"><![CDATA[Это действие не может быть отменено.]]></string>
+    <string name="_bx_events_form_profile_input_delete_confirm_error"><![CDATA[Пожалуйста, отметьте этот флажок, если действительно хотите удалить группу.]]></string>
     <string name="_bx_events_form_profile_input_sys_reoccurring"><![CDATA[Повторяющееся событие]]></string>
     <string name="_bx_events_form_profile_input_reoccurring"><![CDATA[Повторяющееся событие]]></string>
     <string name="_bx_events_form_profile_input_reoccurring_add_interval"><![CDATA[Добавить повторяющийся интервал]]></string>
@@ -332,26 +332,28 @@
     <string name="_bx_events_txt_all_entries_in"><![CDATA[<a href="{0}">Все события в {1} ({2})</a>]]></string>
     <string name="_bx_events_txt_account_suspended"><![CDATA[Это событие заблокировано.]]></string>
     <string name="_bx_events_txt_N_fans"><![CDATA[{0} участников]]></string>
-    <string name="_bx_groups_txt_role"><![CDATA[Роль]]></string>
+    <string name="_bx_events_txt_role"><![CDATA[Роль]]></string>
     <string name="_bx_events_txt_sample_single"><![CDATA[событие]]></string>
     <string name="_bx_events_txt_sample_single_with_article"><![CDATA[событие]]></string>
     <string name="_bx_events_txt_sample_comment_single"><![CDATA[комментарий к событию]]></string>
     <string name="_bx_events_txt_sample_vote_single"><![CDATA[голос за событие]]></string>
     <string name="_bx_events_txt_sample_score_up_single"><![CDATA[голос за событие]]></string>
     <string name="_bx_events_txt_sample_score_down_single"><![CDATA[голос против события]]></string>
-    <string name="_bx_groups_txt_set_role"><![CDATA[Задать роль]]></string>
+    <string name="_bx_events_txt_set_role"><![CDATA[Задать роль]]></string>
     <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_txt_invite_popup_text"><![CDATA[Вы были приглашены на это собыите.  Нажмите кнопку ниже чтобы принять приглашение.]]></string>
+    <string name="_bx_events_txt_invite_popup_text"><![CDATA[Вы были приглашены на это собыите.  Нажмите кнопку ниже чтобы принять приглашение.]]></string>
     <string name="_bx_events_txt_invite_popup_title"><![CDATA[Приглашение на собыите]]></string>
     <string name="_bx_events_txt_invite_popup_button_accept"><![CDATA[Принять]]></string>
     <string name="_bx_events_txt_invite_popup_button_decline"><![CDATA[Отклонить]]></string>
     <string name="_bx_events_txt_invite_popup_error_invitation_absent"><![CDATA[Извините, произошла ошибка. Вы не можете присоединиться к этому событию. Приглашение устарело или удалено.]]></string>
     <string name="_bx_events_txt_invite_popup_error_invitation_wrong_user"><![CDATA[Извините, произошла ошибка. Вы не можете присоединиться к этому событию. Приглашение адресовано не Вам.]]></string>
 
-	<string name="_bx_events_alert_action_fan_added"><![CDATA[присоединение нового участника]]></string>
+    <string name="_bx_events_alert_action_fan_added"><![CDATA[присоединение нового участника]]></string>
     <string name="_bx_events_txt_ntfs_fan_added"><![CDATA[У события <b class="bx-ntfs-content-profile">{owner_name}</b> новый участник <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
+    <string name="_bx_events_alert_action_join_invitation_notif"><![CDATA[приглашение вступить в группу]]></string>
     <string name="_bx_events_alert_action_join_request"><![CDATA[запрос на присоединение к событию]]></string>
+    <string name="_bx_events_txt_ntfs_join_invitation"><![CDATA[Представитель события <b class="bx-ntfs-content-profile">{owner_name}</b> пригласил <b class="bx-ntfs-content-entry">{subentry_sample}</b> присоединиться к событию]]></string>
     <string name="_bx_events_txt_ntfs_join_request"><![CDATA[У события <b class="bx-ntfs-content-profile">{owner_name}</b> новый запрос на присоединение от <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
     <string name="_bx_events_txt_ntfs_timeline_post_common"><![CDATA[В событии <b class="bx-ntfs-content-profile">{owner_name}</b> новая публикация <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
 
@@ -380,10 +382,10 @@
     <string name="_bx_events_cat_Workshop"><![CDATA[Умелые ручки]]></string>
     <string name="_bx_events_cat_Other"><![CDATA[Другое]]></string>
 
-    <string name="_bx_groups_pre_lists_roles"><![CDATA[Роли в событиях]]></string>
-    <string name="_bx_groups_role_regular"><![CDATA[Обычный]]></string>
-    <string name="_bx_groups_role_administrator"><![CDATA[Администратор]]></string>
-    <string name="_bx_groups_role_moderator"><![CDATA[Модератор]]></string>
+    <string name="_bx_events_pre_lists_roles"><![CDATA[Роли в событиях]]></string>
+    <string name="_bx_events_role_regular"><![CDATA[Обычный]]></string>
+    <string name="_bx_events_role_administrator"><![CDATA[Администратор]]></string>
+    <string name="_bx_events_role_moderator"><![CDATA[Модератор]]></string>
 
     <string name="_bx_events_pre_lists_repeat_year"><![CDATA[Повторять: год]]></string>
     <string name="_bx_events_cat_repeat_year_every_year"><![CDATA[Каждый год]]></string>
@@ -470,9 +472,9 @@
 <p><a href="{InviterUrl}">{InviterDisplayName}</a> пригласил Вас на событие <a href="{EntryUrl}">{EntryTitle}</a>.</p>
 {email_footer}]]></string>
 
-    <string name="_bx_groups_email_set_role"><![CDATA[Изменение статуса в событии]]></string>
-    <string name="_bx_groups_email_set_role_subject"><![CDATA[Ваш статус в событии был изменен]]></string>
-    <string name="_bx_groups_email_set_role_body"><![CDATA[{email_header}
+    <string name="_bx_events_email_set_role"><![CDATA[Изменение статуса в событии]]></string>
+    <string name="_bx_events_email_set_role_subject"><![CDATA[Ваш статус в событии был изменен]]></string>
+    <string name="_bx_events_email_set_role_body"><![CDATA[{email_header}
 <p>Ваш статус в событии <a href="{EntryUrl}">{EntryTitle}</a> был изменен на <b>{Role}</b>.</p>
 {email_footer}]]></string>
 

+ 26 - 24
modules/boonex/russian/data/langs/bx_groups/ru.xml

@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="ru" flag="ru" title="Russian">
+    <string name="_bx_groups"><![CDATA[Группы]]></string>
+    <string name="_bx_groups_cmts"><![CDATA[Группы - Комментарии]]></string>
 
-	<string name="_bx_groups"><![CDATA[Группы]]></string>
-	<string name="_bx_groups_cmts"><![CDATA[Группы - Комментарии]]></string>
-
-	<string name="_bx_groups_option_num_connections_quick"><![CDATA[Количество элементов в блоке друзей]]></string>
-	<string name="_bx_groups_option_per_page_browse"><![CDATA[Количество элементов на странице]]></string>
+    <string name="_bx_groups_option_num_connections_quick"><![CDATA[Количество элементов в блоке друзей]]></string>
+    <string name="_bx_groups_option_per_page_browse"><![CDATA[Количество элементов на странице]]></string>
     <string name="_bx_groups_option_num_rss"><![CDATA[Количество элементов в ленте RSS]]></string>
     <string name="_bx_groups_option_searchable_fields"><![CDATA[Поля для поиска]]></string>
     <string name="_bx_groups_option_members_mode"><![CDATA[Спец. режим для членов группы]]></string>
     <string name="_bx_groups_option_members_mode_multi_roles"><![CDATA[Множественные роли]]></string>
     <string name="_bx_groups_option_members_mode_paid_join"><![CDATA[Платное присоединение]]></string>
     <string name="_bx_groups_option_per_page_for_favorites_lists"><![CDATA[Количество списков избранного на странице]]></string>
+    <string name="_bx_groups_option_internal_notifications"><![CDATA[Использовать встроенную нотификацию]]></string>
 
-	<string name="_bx_groups_form_profile"><![CDATA[Группы]]></string>
-	<string name="_bx_groups_form_profile_display_add"><![CDATA[Добавление группы]]></string>
-	<string name="_bx_groups_form_profile_display_edit"><![CDATA[Редактирование группы]]></string>
-	<string name="_bx_groups_form_profile_display_edit_cover"><![CDATA[Редактирование обложки]]></string>
-	<string name="_bx_groups_form_profile_display_delete"><![CDATA[Удаление группы]]></string>
-	<string name="_bx_groups_form_profile_display_view"><![CDATA[Просмотр группы]]></string>
+    <string name="_bx_groups_form_profile"><![CDATA[Группы]]></string>
+    <string name="_bx_groups_form_profile_display_add"><![CDATA[Добавление группы]]></string>
+    <string name="_bx_groups_form_profile_display_edit"><![CDATA[Редактирование группы]]></string>
+    <string name="_bx_groups_form_profile_display_edit_cover"><![CDATA[Редактирование обложки]]></string>
+    <string name="_bx_groups_form_profile_display_delete"><![CDATA[Удаление группы]]></string>
+    <string name="_bx_groups_form_profile_display_view"><![CDATA[Просмотр группы]]></string>
     <string name="_bx_groups_form_profile_display_view_full"><![CDATA[Полный просмотр группы]]></string>
     <string name="_bx_groups_form_profile_display_invite"><![CDATA[Приглашение в группу]]></string>
     <string name="_bx_groups_form_entry_input_author"><![CDATA[Автор]]></string>
-	<string name="_bx_groups_form_profile_input_sys_do_submit"><![CDATA[Выполнить]]></string>
+    <string name="_bx_groups_form_profile_input_sys_do_submit"><![CDATA[Выполнить]]></string>
     <string name="_bx_groups_form_profile_input_sys_join_confirm"><![CDATA[Подтверждение регистрации]]></string>
     <string name="_bx_groups_form_profile_input_join_confirm"><![CDATA[Подтверждение регистрации]]></string>
     <string name="_bx_groups_form_profile_input_sys_allow_view_to"><![CDATA[Доступена для]]></string>
@@ -38,20 +38,20 @@
     <string name="_bx_groups_form_profile_input_sys_group_desc"><![CDATA[Описание]]></string>
     <string name="_bx_groups_form_profile_input_group_desc"><![CDATA[Описание]]></string>
     <string name="_bx_groups_form_profile_input_sys_group_cat"><![CDATA[Категория]]></string>
-	<string name="_bx_groups_form_profile_input_group_cat"><![CDATA[Категория]]></string>
+    <string name="_bx_groups_form_profile_input_group_cat"><![CDATA[Категория]]></string>
     <string name="_bx_groups_form_profile_input_group_cat_err"><![CDATA[Поле категории необходимо]]></string>
-	<string name="_bx_groups_form_profile_input_sys_picture"><![CDATA[Картинка группы]]></string>
-	<string name="_bx_groups_form_profile_input_picture"><![CDATA[Загрузить новую картинку группы]]></string>
-	<string name="_bx_groups_form_profile_input_picture_err"><![CDATA[Необходима картинка группы.]]></string>
-	<string name="_bx_groups_form_profile_input_sys_cover"><![CDATA[Картинка обложки]]></string>
-	<string name="_bx_groups_form_profile_input_cover"><![CDATA[Загрузить новую картинку обложки]]></string>
-	<string name="_bx_groups_form_profile_input_sys_delete_confirm"><![CDATA[Подтверждение на удаление]]></string>
-	<string name="_bx_groups_form_profile_input_delete_confirm"><![CDATA[Я уверен, что хочу удалить эту группу]]></string>
-	<string name="_bx_groups_form_profile_input_delete_confirm_info"><![CDATA[Это действие не может быть отменено.]]></string>
-	<string name="_bx_groups_form_profile_input_delete_confirm_error"><![CDATA[Пожалуйста, отметьте этот флажок, если действительно хотите удалить группу.]]></string>
-  <string name="_bx_groups_form_entry_input_allow_view_favorite_list"><![CDATA[Видимость]]></string>
+    <string name="_bx_groups_form_profile_input_sys_picture"><![CDATA[Картинка группы]]></string>
+    <string name="_bx_groups_form_profile_input_picture"><![CDATA[Загрузить новую картинку группы]]></string>
+    <string name="_bx_groups_form_profile_input_picture_err"><![CDATA[Необходима картинка группы.]]></string>
+    <string name="_bx_groups_form_profile_input_sys_cover"><![CDATA[Картинка обложки]]></string>
+    <string name="_bx_groups_form_profile_input_cover"><![CDATA[Загрузить новую картинку обложки]]></string>
+    <string name="_bx_groups_form_profile_input_sys_delete_confirm"><![CDATA[Подтверждение на удаление]]></string>
+    <string name="_bx_groups_form_profile_input_delete_confirm"><![CDATA[Я уверен, что хочу удалить эту группу]]></string>
+    <string name="_bx_groups_form_profile_input_delete_confirm_info"><![CDATA[Это действие не может быть отменено.]]></string>
+    <string name="_bx_groups_form_profile_input_delete_confirm_error"><![CDATA[Пожалуйста, отметьте этот флажок, если действительно хотите удалить группу.]]></string>
+    <string name="_bx_groups_form_entry_input_allow_view_favorite_list"><![CDATA[Видимость]]></string>
 
-  <string name="_bx_groups_form_price"><![CDATA[Цена]]></string>
+    <string name="_bx_groups_form_price"><![CDATA[Цена]]></string>
     <string name="_bx_groups_form_price_display_add"><![CDATA[Добавление]]></string>
     <string name="_bx_groups_form_price_display_edit"><![CDATA[Редактирование]]></string>
     <string name="_bx_groups_form_price_input_sys_id"><![CDATA[ID]]></string>
@@ -360,7 +360,9 @@
 
     <string name="_bx_groups_alert_action_fan_added"><![CDATA[присоединение нового участника]]></string>
     <string name="_bx_groups_txt_ntfs_fan_added"><![CDATA[В группу <b class="bx-ntfs-content-profile">{owner_name}</b> вступил <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
+    <string name="_bx_groups_alert_action_join_invitation_notif"><![CDATA[приглашение вступить в группу]]></string>
     <string name="_bx_groups_alert_action_join_request"><![CDATA[запрос на присоединение к группе]]></string>
+    <string name="_bx_groups_txt_ntfs_join_invitation"><![CDATA[Представитель группы <b class="bx-ntfs-content-profile">{owner_name}</b> пригласил <b class="bx-ntfs-content-entry">{subentry_sample}</b> вступить в группу]]></string>
     <string name="_bx_groups_txt_ntfs_join_request"><![CDATA[В группу <b class="bx-ntfs-content-profile">{owner_name}</b> хочет вступить <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
     <string name="_bx_groups_txt_ntfs_timeline_post_common"><![CDATA[В группе <b class="bx-ntfs-content-profile">{owner_name}</b> новая публикация <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
 

+ 32 - 29
modules/boonex/russian/data/langs/bx_organizations/ru.xml

@@ -1,33 +1,34 @@
 <?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_cmts"><![CDATA[Организации - Комментарии]]></string>
+    <string name="_bx_orgs"><![CDATA[Организации]]></string>
+    <string name="_bx_organizations"><![CDATA[Организации]]></string>
+    <string name="_bx_orgs_cmts"><![CDATA[Организации - Комментарии]]></string>
 
-	<string name="_bx_orgs_option_autoapproval"><![CDATA[Автоматически активировать все организации после создания]]></string>
-	<string name="_bx_orgs_option_default_acl_level"><![CDATA[Уровень, назначаемый созданному профилю организации по умолчанию]]></string>
-  <string name="_bx_orgs_option_enable_profile_activation_letter"><![CDATA[Включить письмо об активации профиля]]></string>
-	<string name="_bx_orgs_option_redirect_aadd"><![CDATA[После создания организации перенаправить на]]></string>
+    <string name="_bx_orgs_option_autoapproval"><![CDATA[Автоматически активировать все организации после создания]]></string>
+    <string name="_bx_orgs_option_default_acl_level"><![CDATA[Уровень, назначаемый созданному профилю организации по умолчанию]]></string>
+    <string name="_bx_orgs_option_enable_profile_activation_letter"><![CDATA[Включить письмо об активации профиля]]></string>
+    <string name="_bx_orgs_option_redirect_aadd"><![CDATA[После создания организации перенаправить на]]></string>
     <string name="_bx_orgs_option_redirect_aadd_profile"><![CDATA[Страница организации]]></string>
     <string name="_bx_orgs_option_redirect_aadd_last"><![CDATA[Предыдущая страница]]></string>
     <string name="_bx_orgs_option_redirect_aadd_custom"><![CDATA[Пользовательская страница]]></string>
     <string name="_bx_orgs_option_redirect_aadd_custom_url"><![CDATA[URL для перенаправления 'Пользовательская страница']]></string>
-	<string name="_bx_orgs_option_num_connections_quick"><![CDATA[Количество элементов в блоке друзей]]></string>
-	<string name="_bx_orgs_option_per_page_browse"><![CDATA[Количество элементов на странице]]></string>
+    <string name="_bx_orgs_option_num_connections_quick"><![CDATA[Количество элементов в блоке друзей]]></string>
+    <string name="_bx_orgs_option_per_page_browse"><![CDATA[Количество элементов на странице]]></string>
     <string name="_bx_orgs_option_num_rss"><![CDATA[Количество элементов в ленте RSS]]></string>
     <string name="_bx_orgs_option_searchable_fields"><![CDATA[Поля для поиска по ключевому слову]]></string>
     <string name="_bx_orgs_option_public_subscriptions"><![CDATA[Открытый список подписок]]></string>
     <string name="_bx_orgs_option_public_subscribed_me"><![CDATA[Открытый список подписчиков]]></string>
     <string name="_bx_orgs_option_per_page_for_favorites_lists"><![CDATA[Количество списков избранного на странице]]></string>
+    <string name="_bx_orgs_option_internal_notifications"><![CDATA[Использовать встроенную нотификацию]]></string>
 
-	<string name="_bx_orgs_form_profile"><![CDATA[Организации]]></string>
-	<string name="_bx_orgs_form_profile_display_add"><![CDATA[Добавление организации]]></string>
-	<string name="_bx_orgs_form_profile_display_edit"><![CDATA[Редактирование организации]]></string>
-	<string name="_bx_orgs_form_profile_display_edit_cover"><![CDATA[Редактирование обложки]]></string>
-	<string name="_bx_orgs_form_profile_display_delete"><![CDATA[Удаление организации]]></string>
-	<string name="_bx_orgs_form_profile_display_view"><![CDATA[Просмотр организации]]></string>
-	<string name="_bx_orgs_form_profile_display_view_full"><![CDATA[Полный просмотр организации]]></string>
-	<string name="_bx_orgs_form_profile_display_invite"><![CDATA[Приглашение в организацию]]></string>
+    <string name="_bx_orgs_form_profile"><![CDATA[Организации]]></string>
+    <string name="_bx_orgs_form_profile_display_add"><![CDATA[Добавление организации]]></string>
+    <string name="_bx_orgs_form_profile_display_edit"><![CDATA[Редактирование организации]]></string>
+    <string name="_bx_orgs_form_profile_display_edit_cover"><![CDATA[Редактирование обложки]]></string>
+    <string name="_bx_orgs_form_profile_display_delete"><![CDATA[Удаление организации]]></string>
+    <string name="_bx_orgs_form_profile_display_view"><![CDATA[Просмотр организации]]></string>
+    <string name="_bx_orgs_form_profile_display_view_full"><![CDATA[Полный просмотр организации]]></string>
+    <string name="_bx_orgs_form_profile_display_invite"><![CDATA[Приглашение в организацию]]></string>
     <string name="_bx_orgs_form_profile_input_sys_do_submit"><![CDATA[Выполнить]]></string>
     <string name="_bx_orgs_form_profile_input_sys_join_confirm"><![CDATA[Подтверждение регистрации]]></string>
     <string name="_bx_orgs_form_profile_input_join_confirm"><![CDATA[Подтверждение регистрации]]></string>
@@ -47,20 +48,20 @@
     <string name="_bx_orgs_form_profile_input_sys_org_desc"><![CDATA[Описание]]></string>
     <string name="_bx_orgs_form_profile_input_org_desc"><![CDATA[Описание]]></string>
     <string name="_bx_orgs_form_profile_input_sys_org_cat"><![CDATA[Категория]]></string>
-	<string name="_bx_orgs_form_profile_input_org_cat"><![CDATA[Категория]]></string>
+    <string name="_bx_orgs_form_profile_input_org_cat"><![CDATA[Категория]]></string>
     <string name="_bx_orgs_form_profile_input_org_cat_err"><![CDATA[Поле категории необходимо]]></string>
-	<string name="_bx_orgs_form_profile_input_sys_picture"><![CDATA[Картинка профиля]]></string>
-	<string name="_bx_orgs_form_profile_input_picture"><![CDATA[Загрузить новую картинку профиля]]></string>
-	<string name="_bx_orgs_form_profile_input_picture_err"><![CDATA[Необходима картинка профиля.]]></string>
-	<string name="_bx_orgs_form_profile_input_picture_search"><![CDATA[С картинкой профиля]]></string>
+    <string name="_bx_orgs_form_profile_input_sys_picture"><![CDATA[Картинка профиля]]></string>
+    <string name="_bx_orgs_form_profile_input_picture"><![CDATA[Загрузить новую картинку профиля]]></string>
+    <string name="_bx_orgs_form_profile_input_picture_err"><![CDATA[Необходима картинка профиля.]]></string>
+    <string name="_bx_orgs_form_profile_input_picture_search"><![CDATA[С картинкой профиля]]></string>
     <string name="_bx_orgs_form_profile_input_online_search"><![CDATA[В сети]]></string>
-	<string name="_bx_orgs_form_profile_input_sys_cover"><![CDATA[Картинка обложки]]></string>
-	<string name="_bx_orgs_form_profile_input_cover"><![CDATA[Загрузить новую картинку обложки]]></string>
-	<string name="_bx_orgs_form_profile_input_sys_delete_confirm"><![CDATA[Удалить подтверждение]]></string>
-	<string name="_bx_orgs_form_profile_input_delete_confirm"><![CDATA[Я уверен, что хочу удалить этот профиль]]></string>
-	<string name="_bx_orgs_form_profile_input_delete_confirm_info"><![CDATA[Это действие не может быть отменено.]]></string>
-	<string name="_bx_orgs_form_profile_input_delete_confirm_error"><![CDATA[Пожалуйста, отметьте этот флажок, если действительно хотите удалить свой профиль.]]></string>
-	<string name="_bx_orgs_form_profile_input_sys_profile_email"><![CDATA[Email]]></string>
+    <string name="_bx_orgs_form_profile_input_sys_cover"><![CDATA[Картинка обложки]]></string>
+    <string name="_bx_orgs_form_profile_input_cover"><![CDATA[Загрузить новую картинку обложки]]></string>
+    <string name="_bx_orgs_form_profile_input_sys_delete_confirm"><![CDATA[Удалить подтверждение]]></string>
+    <string name="_bx_orgs_form_profile_input_delete_confirm"><![CDATA[Я уверен, что хочу удалить этот профиль]]></string>
+    <string name="_bx_orgs_form_profile_input_delete_confirm_info"><![CDATA[Это действие не может быть отменено.]]></string>
+    <string name="_bx_orgs_form_profile_input_delete_confirm_error"><![CDATA[Пожалуйста, отметьте этот флажок, если действительно хотите удалить свой профиль.]]></string>
+    <string name="_bx_orgs_form_profile_input_sys_profile_email"><![CDATA[Email]]></string>
     <string name="_bx_orgs_form_profile_input_profile_email"><![CDATA[Email]]></string>
     <string name="_bx_orgs_form_profile_input_sys_profile_status"><![CDATA[Статус]]></string>
     <string name="_bx_orgs_form_profile_input_profile_status"><![CDATA[Статус]]></string>
@@ -389,10 +390,12 @@
     <string name="_bx_orgs_role_moderator"><![CDATA[Модератор]]></string>
 
     <string name="_bx_organizations_alert_action_fan_added"><![CDATA[присоединение нового участника]]></string>
+    <string name="_bx_organizations_alert_action_join_invitation_notif"><![CDATA[приглашение вступить в группу]]></string>
     <string name="_bx_organizations_alert_action_join_request"><![CDATA[запрос на присоединение к организации]]></string>
     <string name="_bx_organizations_alert_action_profile_cover_changed"><![CDATA[обложка изменена]]></string>
     <string name="_bx_organizations_alert_action_profile_picture_changed"><![CDATA[картинка изменена]]></string>
     <string name="_bx_orgs_txt_ntfs_fan_added"><![CDATA[В организацию <b class="bx-ntfs-content-profile">{owner_name}</b> вступил <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
+    <string name="_bx_orgs_txt_ntfs_join_invitation"><![CDATA[Представитель организации <b class="bx-ntfs-content-profile">{owner_name}</b> пригласил <b class="bx-ntfs-content-entry">{subentry_sample}</b> вступить в организацию]]></string>
     <string name="_bx_orgs_txt_ntfs_join_request"><![CDATA[В организацию <b class="bx-ntfs-content-profile">{owner_name}</b> хочет вступить <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
     <string name="_bx_orgs_txt_ntfs_timeline_post_common"><![CDATA[В организации <b class="bx-ntfs-content-profile">{owner_name}</b> новая публикация <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
 

+ 18 - 16
modules/boonex/russian/data/langs/bx_spaces/ru.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="ru" flag="ru" title="Russian">
-
     <string name="_bx_spaces"><![CDATA[Пространства]]></string>
     <string name="_bx_spaces_cmts"><![CDATA[Пространства - Комментарии]]></string>
 
@@ -11,6 +10,7 @@
     <string name="_bx_spaces_option_searchable_fields"><![CDATA[Поля для поиска]]></string>
     <string name="_bx_spaces_option_members_mode"><![CDATA[Спец. режим для членов пространства]]></string>
     <string name="_bx_spaces_option_members_mode_multi_roles"><![CDATA[Множественные роли]]></string>
+    <string name="_bx_spaces_option_internal_notifications"><![CDATA[Использовать встроенную нотификацию]]></string>
 
     <string name="_bx_spaces_form_profile"><![CDATA[Пространства]]></string>
     <string name="_bx_spaces_form_profile_display_add"><![CDATA[Добавление пространства]]></string>
@@ -30,8 +30,8 @@
     <string name="_bx_spaces_form_profile_input_sys_allow_post_to"><![CDATA[Оставлять сообщения в профиле могут]]></string>
     <string name="_bx_spaces_form_profile_input_allow_post_to"><![CDATA[Оставлять сообщения в профиле могут]]></string>
     <string name="_bx_spaces_form_profile_input_sys_initial_members"><![CDATA[Пригласить участников]]></string>
-	<string name="_bx_spaces_form_profile_input_sys_parent_space"><![CDATA[Родительское пространство]]></string>
-  	<string name="_bx_spaces_form_profile_input_parent_space"><![CDATA[Родительское пространство]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_parent_space"><![CDATA[Родительское пространство]]></string>
+    <string name="_bx_spaces_form_profile_input_parent_space"><![CDATA[Родительское пространство]]></string>
     <string name="_bx_spaces_form_profile_input_initial_members"><![CDATA[Пригласить участников]]></string>
     <string name="_bx_spaces_form_profile_input_sys_group_name"><![CDATA[Название пространства]]></string>
     <string name="_bx_spaces_form_profile_input_group_name"><![CDATA[Название пространства]]></string>
@@ -39,17 +39,17 @@
     <string name="_bx_spaces_form_profile_input_sys_group_desc"><![CDATA[Описание]]></string>
     <string name="_bx_spaces_form_profile_input_group_desc"><![CDATA[Описание]]></string>
     <string name="_bx_spaces_form_profile_input_sys_group_cat"><![CDATA[Категория]]></string>
-	<string name="_bx_spaces_form_profile_input_group_cat"><![CDATA[Категория]]></string>
+    <string name="_bx_spaces_form_profile_input_group_cat"><![CDATA[Категория]]></string>
     <string name="_bx_spaces_form_profile_input_group_cat_err"><![CDATA[Поле категории необходимо]]></string>
-	<string name="_bx_spaces_form_profile_input_sys_picture"><![CDATA[Картинка пространства]]></string>
-	<string name="_bx_spaces_form_profile_input_picture"><![CDATA[Загрузить новую картинку пространства]]></string>
-	<string name="_bx_spaces_form_profile_input_picture_err"><![CDATA[Необходима картинка пространства.]]></string>
-	<string name="_bx_spaces_form_profile_input_sys_cover"><![CDATA[Картинка обложки]]></string>
-	<string name="_bx_spaces_form_profile_input_cover"><![CDATA[Загрузить новую картинку обложки]]></string>
-	<string name="_bx_spaces_form_profile_input_sys_delete_confirm"><![CDATA[Подтверждение на удаление]]></string>
-	<string name="_bx_spaces_form_profile_input_delete_confirm"><![CDATA[Я уверен, что хочу удалить эту пространство]]></string>
-	<string name="_bx_spaces_form_profile_input_delete_confirm_info"><![CDATA[Это действие не может быть отменено.]]></string>
-	<string name="_bx_spaces_form_profile_input_delete_confirm_error"><![CDATA[Пожалуйста, отметьте этот флажок, если действительно хотите удалить пространство.]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_picture"><![CDATA[Картинка пространства]]></string>
+    <string name="_bx_spaces_form_profile_input_picture"><![CDATA[Загрузить новую картинку пространства]]></string>
+    <string name="_bx_spaces_form_profile_input_picture_err"><![CDATA[Необходима картинка пространства.]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_cover"><![CDATA[Картинка обложки]]></string>
+    <string name="_bx_spaces_form_profile_input_cover"><![CDATA[Загрузить новую картинку обложки]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_delete_confirm"><![CDATA[Подтверждение на удаление]]></string>
+    <string name="_bx_spaces_form_profile_input_delete_confirm"><![CDATA[Я уверен, что хочу удалить эту пространство]]></string>
+    <string name="_bx_spaces_form_profile_input_delete_confirm_info"><![CDATA[Это действие не может быть отменено.]]></string>
+    <string name="_bx_spaces_form_profile_input_delete_confirm_error"><![CDATA[Пожалуйста, отметьте этот флажок, если действительно хотите удалить пространство.]]></string>
 
 	<string name="_bx_spaces_acl_action_create_profile"><![CDATA[Создать пространство]]></string>
 	<string name="_bx_spaces_acl_action_delete_profile"><![CDATA[Удалить пространство]]></string>
@@ -262,7 +262,7 @@
     <string name="_bx_spaces_search_extended"><![CDATA[Поиск пространств]]></string>
     <string name="_bx_spaces_search_extended_cmts"><![CDATA[Поиск комментариев к пространством]]></string>
 
-	<string name="_bx_spaces_err_delete_child_presend"><![CDATA[Невозможно удалить пространство, т.к. оно используется другими в качестве родительского.]]></string>
+    <string name="_bx_spaces_err_delete_child_presend"><![CDATA[Невозможно удалить пространство, т.к. оно используется другими в качестве родительского.]]></string>
     <string name="_bx_spaces_txt_account_pending"><![CDATA[Эта пространство ожидает одобрения. Пожалуйста, дождитесь ее активации.]]></string>
     <string name="_bx_spaces_txt_account_suspended"><![CDATA[Эта пространство заблокирована.]]></string>
     <string name="_bx_spaces_txt_N_fans"><![CDATA[{0} участников]]></string>
@@ -275,16 +275,18 @@
     <string name="_bx_spaces_txt_sample_score_down_single"><![CDATA[голос против пространства]]></string>
     <string name="_bx_spaces_txt_set_role"><![CDATA[Задать роль]]></string>
     <string name="_bx_spaces_txt_private_group"><![CDATA[Приватная пространство]]></string>
-	<string name="_bx_spaces_txt_invite_popup_text"><![CDATA[Вы были приглашены в это пространство.  Нажмите кнопку ниже чтобы принять приглашение.]]></string>
+    <string name="_bx_spaces_txt_invite_popup_text"><![CDATA[Вы были приглашены в это пространство.  Нажмите кнопку ниже чтобы принять приглашение.]]></string>
     <string name="_bx_spaces_txt_invite_popup_title"><![CDATA[Приглашение в пространство]]></string>
     <string name="_bx_spaces_txt_invite_popup_button_accept"><![CDATA[Принять]]></string>
     <string name="_bx_spaces_txt_invite_popup_button_decline"><![CDATA[Отклонить]]></string>
     <string name="_bx_spaces_txt_invite_popup_error_invitation_absent"><![CDATA[Извините, произошла ошибка. Вы не можете вступить в это пространство. Приглашение устарело или удалено.]]></string>
     <string name="_bx_spaces_txt_invite_popup_error_invitation_wrong_user"><![CDATA[Извините, произошла ошибка. Вы не можете вступить в это пространство. Приглашение адресовано не Вам.]]></string>
 	
-	<string name="_bx_spaces_alert_action_fan_added"><![CDATA[присоединение нового участника]]></string>
+    <string name="_bx_spaces_alert_action_fan_added"><![CDATA[присоединение нового участника]]></string>
     <string name="_bx_spaces_txt_ntfs_fan_added"><![CDATA[В пространство <b class="bx-ntfs-content-profile">{owner_name}</b> вступил <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
+    <string name="_bx_spaces_alert_action_join_invitation_notif"><![CDATA[приглашение вступить в группу]]></string>
     <string name="_bx_spaces_alert_action_join_request"><![CDATA[запрос на присоединение к пространству]]></string>
+    <string name="_bx_spaces_txt_ntfs_join_invitation"><![CDATA[Представитель пространства <b class="bx-ntfs-content-profile">{owner_name}</b> пригласил <b class="bx-ntfs-content-entry">{subentry_sample}</b> вступить в пространство]]></string>
     <string name="_bx_spaces_txt_ntfs_join_request"><![CDATA[В пространство <b class="bx-ntfs-content-profile">{owner_name}</b> хочет вступить <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
     <string name="_bx_spaces_txt_ntfs_timeline_post_common"><![CDATA[В пространству <b class="bx-ntfs-content-profile">{owner_name}</b> новая публикация <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
 

+ 2 - 0
modules/boonex/spaces/classes/BxSpacesConfig.php

@@ -77,6 +77,7 @@ class BxSpacesConfig extends BxBaseModGroupsConfig
             'PARAM_PER_PAGE_BROWSE_RECOMMENDED' => 'bx_spaces_per_page_browse_recommended',
 
             'PARAM_MMODE' => 'bx_spaces_members_mode',
+            'PARAM_USE_IN' => 'bx_spaces_internal_notifications',
 
             // objects
             'OBJECT_STORAGE' => 'bx_spaces_pics',
@@ -175,6 +176,7 @@ class BxSpacesConfig extends BxBaseModGroupsConfig
                 'txt_sample_score_down_single' => '_bx_spaces_txt_sample_score_down_single',
                 'txt_private_group' => '_bx_spaces_txt_private_space',
                 'txt_N_fans' => '_bx_spaces_txt_N_fans',
+                'txt_ntfs_join_invitation' => '_bx_spaces_txt_ntfs_join_invitation',
                 'txt_ntfs_join_request' => '_bx_spaces_txt_ntfs_join_request',
                 'txt_ntfs_fan_added' => '_bx_spaces_txt_ntfs_fan_added',
                 'txt_ntfs_timeline_post_common' => '_bx_spaces_txt_ntfs_timeline_post_common',

+ 128 - 125
modules/boonex/spaces/install/langs/en.xml

@@ -1,60 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="en" flag="gb" title="English">
-	<string name="_bx_spaces"><![CDATA[Spaces]]></string>
-	<string name="_bx_spaces_cmts"><![CDATA[Spaces' Comments]]></string>
+    <string name="_bx_spaces"><![CDATA[Spaces]]></string>
+    <string name="_bx_spaces_cmts"><![CDATA[Spaces' Comments]]></string>
 
-        <string name="_bx_spaces_option_enable_multilevel_hierarchy"><![CDATA[Allow multilevel hierarchy (experimental)]]></string>
-	<string name="_bx_spaces_option_num_connections_quick"><![CDATA[Number of items in friends block]]></string>
-	<string name="_bx_spaces_option_per_page_browse"><![CDATA[Number of items per page]]></string>
-	<string name="_bx_spaces_option_num_rss"><![CDATA[Number of items in RSS feed]]></string>
-	<string name="_bx_spaces_option_searchable_fields"><![CDATA[Searchable fields]]></string>
-        <string name="_bx_spaces_option_members_mode"><![CDATA[Special mode for space members]]></string>
-        <string name="_bx_spaces_option_members_mode_multi_roles"><![CDATA[Multi Roles]]></string>
+    <string name="_bx_spaces_option_enable_multilevel_hierarchy"><![CDATA[Allow multilevel hierarchy (experimental)]]></string>
+    <string name="_bx_spaces_option_num_connections_quick"><![CDATA[Number of items in friends block]]></string>
+    <string name="_bx_spaces_option_per_page_browse"><![CDATA[Number of items per page]]></string>
+    <string name="_bx_spaces_option_num_rss"><![CDATA[Number of items in RSS feed]]></string>
+    <string name="_bx_spaces_option_searchable_fields"><![CDATA[Searchable fields]]></string>
+    <string name="_bx_spaces_option_members_mode"><![CDATA[Special mode for space members]]></string>
+    <string name="_bx_spaces_option_members_mode_multi_roles"><![CDATA[Multi Roles]]></string>
+    <string name="_bx_spaces_option_internal_notifications"><![CDATA[Use internal notifications]]></string>
 
-	<string name="_bx_spaces_form_profile"><![CDATA[Spaces]]></string>
-	<string name="_bx_spaces_form_profile_display_add"><![CDATA[Add Space]]></string>
-	<string name="_bx_spaces_form_profile_display_edit"><![CDATA[Edit Space]]></string>
-	<string name="_bx_spaces_form_profile_display_edit_cover"><![CDATA[Edit Cover]]></string>
-	<string name="_bx_spaces_form_profile_display_delete"><![CDATA[Delete Space]]></string>
-	<string name="_bx_spaces_form_profile_display_view"><![CDATA[View Space]]></string>
-	<string name="_bx_spaces_form_profile_display_view_full"><![CDATA[Full View Space]]></string>
-	<string name="_bx_spaces_form_profile_display_invite"><![CDATA[Invite to Space]]></string>
-	<string name="_bx_spaces_form_entry_input_author"><![CDATA[Author]]></string>
-	<string name="_bx_spaces_form_profile_input_sys_do_submit"><![CDATA[Submit]]></string>
-	<string name="_bx_spaces_form_profile_input_sys_join_confirm"><![CDATA[Join confirmation]]></string>
-	<string name="_bx_spaces_form_profile_input_join_confirm"><![CDATA[Join confirmation]]></string>
-	<string name="_bx_spaces_form_profile_input_sys_allow_view_to"><![CDATA[Visible to]]></string>
-	<string name="_bx_spaces_form_profile_input_allow_view_to"><![CDATA[Visible to]]></string>
-	<string name="_bx_spaces_form_profile_input_allow_view_to_desc"><![CDATA[Closed - anyone can find the space and see who's in it, only members can see posts. Secret - only members can find the space and see posts.]]></string>
-        <string name="_bx_spaces_form_profile_input_sys_allow_post_to"><![CDATA[Who can post]]></string>
-        <string name="_bx_spaces_form_profile_input_allow_post_to"><![CDATA[Who can post]]></string>
-	<string name="_bx_spaces_form_profile_input_sys_initial_members"><![CDATA[Invite Members]]></string>
-	<string name="_bx_spaces_form_profile_input_initial_members"><![CDATA[Invite Members]]></string>
-  <string name="_bx_spaces_form_profile_input_sys_parent_space"><![CDATA[Parent Space]]></string>
-  <string name="_bx_spaces_form_profile_input_parent_space"><![CDATA[Parent Space]]></string>
-  <string name="_bx_spaces_form_profile_input_sys_space_name"><![CDATA[Space Name]]></string>
-	<string name="_bx_spaces_form_profile_input_space_name"><![CDATA[Space Name]]></string>
-	<string name="_bx_spaces_form_profile_input_space_name_err"><![CDATA[This information is essential. Please, fill in this field.]]></string>
-	<string name="_bx_spaces_form_profile_input_sys_space_desc"><![CDATA[Description]]></string>
-	<string name="_bx_spaces_form_profile_input_space_desc"><![CDATA[Description]]></string>
-	<string name="_bx_spaces_form_profile_input_sys_space_cat"><![CDATA[Category]]></string>
-	<string name="_bx_spaces_form_profile_input_space_cat"><![CDATA[Category]]></string>
-	<string name="_bx_spaces_form_profile_input_space_cat_err"><![CDATA[Category field is mandatory]]></string>
-	<string name="_bx_spaces_form_profile_input_sys_picture"><![CDATA[Space Picture]]></string>
-	<string name="_bx_spaces_form_profile_input_picture"><![CDATA[Upload New Space Picture]]></string>
-	<string name="_bx_spaces_form_profile_input_picture_err"><![CDATA[Space picture is mandatory.]]></string>
-	<string name="_bx_spaces_form_profile_input_sys_cover"><![CDATA[Cover Picture]]></string>
-	<string name="_bx_spaces_form_profile_input_cover"><![CDATA[Upload New Cover Picture]]></string>
-	<string name="_bx_spaces_form_profile_input_sys_delete_confirm"><![CDATA[Delete confirmation]]></string>
-	<string name="_bx_spaces_form_profile_input_delete_confirm"><![CDATA[I am sure I want to delete this space]]></string>
-	<string name="_bx_spaces_form_profile_input_delete_confirm_info"><![CDATA[This action can not be undone.]]></string>
-	<string name="_bx_spaces_form_profile_input_delete_confirm_error"><![CDATA[Please check this checkbox if you really want to delete space.]]></string>
-	
-	<string name="_bx_spaces_acl_action_create_profile"><![CDATA[Create Space]]></string>
-	<string name="_bx_spaces_acl_action_delete_profile"><![CDATA[Delete Space]]></string>
-	<string name="_bx_spaces_acl_action_view_profile"><![CDATA[View Space]]></string>
-	<string name="_bx_spaces_acl_action_edit_any_profile"><![CDATA[Edit Any Space]]></string>
-  <string name="_bx_spaces_acl_action_delete_invites"><![CDATA[Delete Invites]]></string>
+    <string name="_bx_spaces_form_profile"><![CDATA[Spaces]]></string>
+    <string name="_bx_spaces_form_profile_display_add"><![CDATA[Add Space]]></string>
+    <string name="_bx_spaces_form_profile_display_edit"><![CDATA[Edit Space]]></string>
+    <string name="_bx_spaces_form_profile_display_edit_cover"><![CDATA[Edit Cover]]></string>
+    <string name="_bx_spaces_form_profile_display_delete"><![CDATA[Delete Space]]></string>
+    <string name="_bx_spaces_form_profile_display_view"><![CDATA[View Space]]></string>
+    <string name="_bx_spaces_form_profile_display_view_full"><![CDATA[Full View Space]]></string>
+    <string name="_bx_spaces_form_profile_display_invite"><![CDATA[Invite to Space]]></string>
+    <string name="_bx_spaces_form_entry_input_author"><![CDATA[Author]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_do_submit"><![CDATA[Submit]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_join_confirm"><![CDATA[Join confirmation]]></string>
+    <string name="_bx_spaces_form_profile_input_join_confirm"><![CDATA[Join confirmation]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_allow_view_to"><![CDATA[Visible to]]></string>
+    <string name="_bx_spaces_form_profile_input_allow_view_to"><![CDATA[Visible to]]></string>
+    <string name="_bx_spaces_form_profile_input_allow_view_to_desc"><![CDATA[Closed - anyone can find the space and see who's in it, only members can see posts. Secret - only members can find the space and see posts.]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_allow_post_to"><![CDATA[Who can post]]></string>
+    <string name="_bx_spaces_form_profile_input_allow_post_to"><![CDATA[Who can post]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_initial_members"><![CDATA[Invite Members]]></string>
+    <string name="_bx_spaces_form_profile_input_initial_members"><![CDATA[Invite Members]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_parent_space"><![CDATA[Parent Space]]></string>
+    <string name="_bx_spaces_form_profile_input_parent_space"><![CDATA[Parent Space]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_space_name"><![CDATA[Space Name]]></string>
+    <string name="_bx_spaces_form_profile_input_space_name"><![CDATA[Space Name]]></string>
+    <string name="_bx_spaces_form_profile_input_space_name_err"><![CDATA[This information is essential. Please, fill in this field.]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_space_desc"><![CDATA[Description]]></string>
+    <string name="_bx_spaces_form_profile_input_space_desc"><![CDATA[Description]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_space_cat"><![CDATA[Category]]></string>
+    <string name="_bx_spaces_form_profile_input_space_cat"><![CDATA[Category]]></string>
+    <string name="_bx_spaces_form_profile_input_space_cat_err"><![CDATA[Category field is mandatory]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_picture"><![CDATA[Space Picture]]></string>
+    <string name="_bx_spaces_form_profile_input_picture"><![CDATA[Upload New Space Picture]]></string>
+    <string name="_bx_spaces_form_profile_input_picture_err"><![CDATA[Space picture is mandatory.]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_cover"><![CDATA[Cover Picture]]></string>
+    <string name="_bx_spaces_form_profile_input_cover"><![CDATA[Upload New Cover Picture]]></string>
+    <string name="_bx_spaces_form_profile_input_sys_delete_confirm"><![CDATA[Delete confirmation]]></string>
+    <string name="_bx_spaces_form_profile_input_delete_confirm"><![CDATA[I am sure I want to delete this space]]></string>
+    <string name="_bx_spaces_form_profile_input_delete_confirm_info"><![CDATA[This action can not be undone.]]></string>
+    <string name="_bx_spaces_form_profile_input_delete_confirm_error"><![CDATA[Please check this checkbox if you really want to delete space.]]></string>
+
+    <string name="_bx_spaces_acl_action_create_profile"><![CDATA[Create Space]]></string>
+    <string name="_bx_spaces_acl_action_delete_profile"><![CDATA[Delete Space]]></string>
+    <string name="_bx_spaces_acl_action_view_profile"><![CDATA[View Space]]></string>
+    <string name="_bx_spaces_acl_action_edit_any_profile"><![CDATA[Edit Any Space]]></string>
+    <string name="_bx_spaces_acl_action_delete_invites"><![CDATA[Delete Invites]]></string>
 	
 	<string name="_bx_spaces_page_title_sys_joined_entries"><![CDATA[Profile Spaces]]></string>
 	<string name="_bx_spaces_page_title_joined_entries"><![CDATA[Profile Spaces]]></string>
@@ -261,80 +262,82 @@
 	<string name="_bx_spaces_search_extended"><![CDATA[Spaces Search]]></string>
 	<string name="_bx_spaces_search_extended_cmts"><![CDATA[Spaces Comments Search]]></string>
 
-  <string name="_bx_spaces_err_delete_child_presend"><![CDATA[Cannot delete this space because there are child elements.]]></string>
-	<string name="_bx_spaces_txt_account_pending"><![CDATA[This space is pending approval, please wait until it is activated.]]></string>
-	<string name="_bx_spaces_txt_account_suspended"><![CDATA[This space is suspended.]]></string>
-	<string name="_bx_spaces_txt_N_fans"><![CDATA[{0} members]]></string>
-        <string name="_bx_spaces_txt_role"><![CDATA[Role]]></string>
-	<string name="_bx_spaces_txt_sample_single"><![CDATA[space]]></string>
-	<string name="_bx_spaces_txt_sample_single_with_article"><![CDATA[a space]]></string>
-	<string name="_bx_spaces_txt_sample_comment_single"><![CDATA[comment to space]]></string>
-	<string name="_bx_spaces_txt_sample_vote_single"><![CDATA[vote to space]]></string>
-        <string name="_bx_spaces_txt_sample_score_up_single"><![CDATA[score up vote to space]]></string>
-        <string name="_bx_spaces_txt_sample_score_down_single"><![CDATA[score down vote to space]]></string>
-        <string name="_bx_spaces_txt_set_role"><![CDATA[Set Role]]></string>
-	<string name="_bx_spaces_txt_private_space"><![CDATA[Private space]]></string>
-  <string name="_bx_spaces_txt_invite_popup_text"><![CDATA[You have been invited to a space. Click the button below to accept the invitation.]]></string>
-  <string name="_bx_spaces_txt_invite_popup_title"><![CDATA[Invitation to a space]]></string>
-  <string name="_bx_spaces_txt_invite_popup_button_accept"><![CDATA[Accept]]></string>
-  <string name="_bx_spaces_txt_invite_popup_button_decline"><![CDATA[Decline]]></string>
-  <string name="_bx_spaces_txt_invite_popup_error_invitation_absent"><![CDATA[Sorry, an error has occurred. You can not join this space. The invitation is expired or deleted.]]></string>
-  <string name="_bx_spaces_txt_invite_popup_error_invitation_wrong_user"><![CDATA[Sorry, an error has occurred. You can not join this space. This invitation cannot be used by you.]]></string>
+    <string name="_bx_spaces_err_delete_child_presend"><![CDATA[Cannot delete this space because there are child elements.]]></string>
+    <string name="_bx_spaces_txt_account_pending"><![CDATA[This space is pending approval, please wait until it is activated.]]></string>
+    <string name="_bx_spaces_txt_account_suspended"><![CDATA[This space is suspended.]]></string>
+    <string name="_bx_spaces_txt_N_fans"><![CDATA[{0} members]]></string>
+    <string name="_bx_spaces_txt_role"><![CDATA[Role]]></string>
+    <string name="_bx_spaces_txt_sample_single"><![CDATA[space]]></string>
+    <string name="_bx_spaces_txt_sample_single_with_article"><![CDATA[a space]]></string>
+    <string name="_bx_spaces_txt_sample_comment_single"><![CDATA[comment to space]]></string>
+    <string name="_bx_spaces_txt_sample_vote_single"><![CDATA[vote to space]]></string>
+    <string name="_bx_spaces_txt_sample_score_up_single"><![CDATA[score up vote to space]]></string>
+    <string name="_bx_spaces_txt_sample_score_down_single"><![CDATA[score down vote to space]]></string>
+    <string name="_bx_spaces_txt_set_role"><![CDATA[Set Role]]></string>
+    <string name="_bx_spaces_txt_private_space"><![CDATA[Private space]]></string>
+    <string name="_bx_spaces_txt_invite_popup_text"><![CDATA[You have been invited to a space. Click the button below to accept the invitation.]]></string>
+    <string name="_bx_spaces_txt_invite_popup_title"><![CDATA[Invitation to a space]]></string>
+    <string name="_bx_spaces_txt_invite_popup_button_accept"><![CDATA[Accept]]></string>
+    <string name="_bx_spaces_txt_invite_popup_button_decline"><![CDATA[Decline]]></string>
+    <string name="_bx_spaces_txt_invite_popup_error_invitation_absent"><![CDATA[Sorry, an error has occurred. You can not join this space. The invitation is expired or deleted.]]></string>
+    <string name="_bx_spaces_txt_invite_popup_error_invitation_wrong_user"><![CDATA[Sorry, an error has occurred. You can not join this space. This invitation cannot be used by you.]]></string>
 	
-	<string name="_bx_spaces_alert_action_fan_added"><![CDATA[member joined]]></string>
-	<string name="_bx_spaces_txt_ntfs_fan_added"><![CDATA[Space <b class="bx-ntfs-content-profile">{owner_name}</b> has got a member <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
-	<string name="_bx_spaces_alert_action_join_request"><![CDATA[join request]]></string>
-	<string name="_bx_spaces_txt_ntfs_join_request"><![CDATA[Space <b class="bx-ntfs-content-profile">{owner_name}</b> has a join request from <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
-	<string name="_bx_spaces_txt_ntfs_timeline_post_common"><![CDATA[New post <b class="bx-ntfs-content-entry">{subentry_sample}</b> in <b class="bx-ntfs-content-profile">{owner_name}</b> space timeline]]></string>
-	
-	<string name="_bx_spaces_pre_lists_cats"><![CDATA[Space categories]]></string>
-	<string name="_bx_spaces_cat_General"><![CDATA[General]]></string>
-	<string name="_bx_spaces_cat_Business"><![CDATA[Business]]></string>
-	<string name="_bx_spaces_cat_Interests"><![CDATA[Interests]]></string>
-	<string name="_bx_spaces_cat_Causes"><![CDATA[Causes]]></string>
-	<string name="_bx_spaces_cat_Fun"><![CDATA[Fun]]></string>
-	<string name="_bx_spaces_cat_Uncategorised"><![CDATA[Uncategorised]]></string>
+    <string name="_bx_spaces_alert_action_fan_added"><![CDATA[member joined]]></string>
+    <string name="_bx_spaces_txt_ntfs_fan_added"><![CDATA[Space <b class="bx-ntfs-content-profile">{owner_name}</b> has got a member <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
+    <string name="_bx_spaces_alert_action_join_invitation_notif"><![CDATA[join invitation]]></string>
+    <string name="_bx_spaces_alert_action_join_request"><![CDATA[join request]]></string>
+    <string name="_bx_spaces_txt_ntfs_join_invitation"><![CDATA[<b class="bx-ntfs-content-profile">{owner_name}</b> space's representative invites <b class="bx-ntfs-content-entry">{subentry_sample}</b> to join space]]></string>
+    <string name="_bx_spaces_txt_ntfs_join_request"><![CDATA[Space <b class="bx-ntfs-content-profile">{owner_name}</b> has a join request from <b class="bx-ntfs-content-entry">{subentry_sample}</b>]]></string>
+    <string name="_bx_spaces_txt_ntfs_timeline_post_common"><![CDATA[New post <b class="bx-ntfs-content-entry">{subentry_sample}</b> in <b class="bx-ntfs-content-profile">{owner_name}</b> space timeline]]></string>
+
+    <string name="_bx_spaces_pre_lists_cats"><![CDATA[Space categories]]></string>
+    <string name="_bx_spaces_cat_General"><![CDATA[General]]></string>
+    <string name="_bx_spaces_cat_Business"><![CDATA[Business]]></string>
+    <string name="_bx_spaces_cat_Interests"><![CDATA[Interests]]></string>
+    <string name="_bx_spaces_cat_Causes"><![CDATA[Causes]]></string>
+    <string name="_bx_spaces_cat_Fun"><![CDATA[Fun]]></string>
+    <string name="_bx_spaces_cat_Uncategorised"><![CDATA[Uncategorised]]></string>
 
     <string name="_bx_spaces_pre_lists_roles"><![CDATA[Space roles]]></string>
     <string name="_bx_spaces_role_regular"><![CDATA[Regular]]></string>
     <string name="_bx_spaces_role_administrator"><![CDATA[Administrator]]></string>
     <string name="_bx_spaces_role_moderator"><![CDATA[Moderator]]></string>
 
-	<string name="_bx_spaces_email_join_request"><![CDATA[Space join request]]></string>
-	<string name="_bx_spaces_email_join_request_subject"><![CDATA[Request to join your space]]></string>
-	<string name="_bx_spaces_email_join_request_body"><![CDATA[{email_header}
-	<p>New request to join <a href="{EntryUrl}">{EntryTitle}</a> space from <a href="{NewMemberUrl}">{NewMemberDisplayName}</a></p>
-	{email_footer}]]></string>
-	
-	<string name="_bx_spaces_email_join_reject"><![CDATA[Space join request was rejected]]></string>
-	<string name="_bx_spaces_email_join_reject_subject"><![CDATA[Request to join a space was rejected]]></string>
-	<string name="_bx_spaces_email_join_reject_body"><![CDATA[{email_header}
-	<p>Your request to join <a href="{EntryUrl}">{EntryTitle}</a> space was rejected by space admin.</p>
-	{email_footer}]]></string>
-	
-	<string name="_bx_spaces_email_join_confirm"><![CDATA[Space join request was confirmed]]></string>
-	<string name="_bx_spaces_email_join_confirm_subject"><![CDATA[Your request to join a space was confirmed]]></string>
-	<string name="_bx_spaces_email_join_confirm_body"><![CDATA[{email_header}
-	<p>Your request to join <a href="{EntryUrl}">{EntryTitle}</a> space was confirmed by the space admin.</p>
-	{email_footer}]]></string>
-	
-	<string name="_bx_spaces_email_fan_remove"><![CDATA[Profile was removed from space fans]]></string>
-	<string name="_bx_spaces_email_fan_remove_subject"><![CDATA[Your profile was removed from the space]]></string>
-	<string name="_bx_spaces_email_fan_remove_body"><![CDATA[{email_header}
-	<p>Your profile was removed from <a href="{EntryUrl}">{EntryTitle}</a> space by the space admin.</p>
-	{email_footer}]]></string>
-	
-	<string name="_bx_spaces_email_fan_become_admin"><![CDATA[Space admin status was granted]]></string>
-	<string name="_bx_spaces_email_fan_become_admin_subject"><![CDATA[You are a space admin now]]></string>
-	<string name="_bx_spaces_email_fan_become_admin_body"><![CDATA[{email_header}
-	<p>You are an admin of <a href="{EntryUrl}">{EntryTitle}</a> space now.</p>
-	{email_footer}]]></string>
-	
-	<string name="_bx_spaces_email_admin_become_fan"><![CDATA[Space admin status was revoked]]></string>
-	<string name="_bx_spaces_email_admin_become_fan_subject"><![CDATA[Your space admin status was revoked]]></string>
-	<string name="_bx_spaces_email_admin_become_fan_body"><![CDATA[{email_header}
-	<p>Your admin status was revoked from <a href="{EntryUrl}">{EntryTitle}</a> space.</p>
-	{email_footer}]]></string>
+    <string name="_bx_spaces_email_join_request"><![CDATA[Space join request]]></string>
+    <string name="_bx_spaces_email_join_request_subject"><![CDATA[Request to join your space]]></string>
+    <string name="_bx_spaces_email_join_request_body"><![CDATA[{email_header}
+    <p>New request to join <a href="{EntryUrl}">{EntryTitle}</a> space from <a href="{NewMemberUrl}">{NewMemberDisplayName}</a></p>
+    {email_footer}]]></string>
+
+    <string name="_bx_spaces_email_join_reject"><![CDATA[Space join request was rejected]]></string>
+    <string name="_bx_spaces_email_join_reject_subject"><![CDATA[Request to join a space was rejected]]></string>
+    <string name="_bx_spaces_email_join_reject_body"><![CDATA[{email_header}
+    <p>Your request to join <a href="{EntryUrl}">{EntryTitle}</a> space was rejected by space admin.</p>
+    {email_footer}]]></string>
+
+    <string name="_bx_spaces_email_join_confirm"><![CDATA[Space join request was confirmed]]></string>
+    <string name="_bx_spaces_email_join_confirm_subject"><![CDATA[Your request to join a space was confirmed]]></string>
+    <string name="_bx_spaces_email_join_confirm_body"><![CDATA[{email_header}
+    <p>Your request to join <a href="{EntryUrl}">{EntryTitle}</a> space was confirmed by the space admin.</p>
+    {email_footer}]]></string>
+
+    <string name="_bx_spaces_email_fan_remove"><![CDATA[Profile was removed from space fans]]></string>
+    <string name="_bx_spaces_email_fan_remove_subject"><![CDATA[Your profile was removed from the space]]></string>
+    <string name="_bx_spaces_email_fan_remove_body"><![CDATA[{email_header}
+    <p>Your profile was removed from <a href="{EntryUrl}">{EntryTitle}</a> space by the space admin.</p>
+    {email_footer}]]></string>
+
+    <string name="_bx_spaces_email_fan_become_admin"><![CDATA[Space admin status was granted]]></string>
+    <string name="_bx_spaces_email_fan_become_admin_subject"><![CDATA[You are a space admin now]]></string>
+    <string name="_bx_spaces_email_fan_become_admin_body"><![CDATA[{email_header}
+    <p>You are an admin of <a href="{EntryUrl}">{EntryTitle}</a> space now.</p>
+    {email_footer}]]></string>
+
+    <string name="_bx_spaces_email_admin_become_fan"><![CDATA[Space admin status was revoked]]></string>
+    <string name="_bx_spaces_email_admin_become_fan_subject"><![CDATA[Your space admin status was revoked]]></string>
+    <string name="_bx_spaces_email_admin_become_fan_body"><![CDATA[{email_header}
+    <p>Your admin status was revoked from <a href="{EntryUrl}">{EntryTitle}</a> space.</p>
+    {email_footer}]]></string>
 
     <string name="_bx_spaces_email_set_role"><![CDATA[Space member status was changed]]></string>
     <string name="_bx_spaces_email_set_role_subject"><![CDATA[Your space status was changed]]></string>
@@ -342,9 +345,9 @@
 <p>Your status in <a href="{EntryUrl}">{EntryTitle}</a> space was changed to <b>{Role}</b>.</p>
 {email_footer}]]></string>
 
-	<string name="_bx_spaces_email_invitation"><![CDATA[Invitation to space]]></string>
-	<string name="_bx_spaces_email_invitation_subject"><![CDATA[Invitation to "{EntryTitle}" space]]></string>
-	<string name="_bx_spaces_email_invitation_body"><![CDATA[{email_header}
-	<p><a href="{InviterUrl}">{InviterDisplayName}</a> invited you to <a href="{EntryUrl}">{EntryTitle} space</a>.</p>
-	{email_footer}]]></string>
+    <string name="_bx_spaces_email_invitation"><![CDATA[Invitation to space]]></string>
+    <string name="_bx_spaces_email_invitation_subject"><![CDATA[Invitation to "{EntryTitle}" space]]></string>
+    <string name="_bx_spaces_email_invitation_body"><![CDATA[{email_header}
+    <p><a href="{InviterUrl}">{InviterDisplayName}</a> invited you to <a href="{EntryUrl}">{EntryTitle} space</a>.</p>
+    {email_footer}]]></string>
 </resources>

+ 2 - 1
modules/boonex/spaces/install/sql/enable.sql

@@ -18,7 +18,8 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `e
 ('bx_spaces_per_page_browse_showcase', '32', @iCategId, '_sys_option_per_page_browse_showcase', 'digit', '', '', '', 15),
 ('bx_spaces_per_page_browse_recommended', '10', @iCategId, '_sys_option_per_page_browse_recommended', 'digit', '', '', '', 16),
 ('bx_spaces_searchable_fields', 'space_name,space_desc', @iCategId, '_bx_spaces_option_searchable_fields', 'list', 'a:2:{s:6:"module";s:9:"bx_spaces";s:6:"method";s:21:"get_searchable_fields";}', '', '', 30),
-('bx_spaces_members_mode', '', @iCategId, '_bx_spaces_option_members_mode', 'select', 'a:2:{s:6:"module";s:9:"bx_spaces";s:6:"method";s:24:"get_options_members_mode";}', '', '', 40);
+('bx_spaces_members_mode', '', @iCategId, '_bx_spaces_option_members_mode', 'select', 'a:2:{s:6:"module";s:9:"bx_spaces";s:6:"method";s:24:"get_options_members_mode";}', '', '', 40),
+('bx_spaces_internal_notifications', '', @iCategId, '_bx_spaces_option_internal_notifications', 'checkbox', '', '', '', 50);
 
 
 -- PAGES