Ticket #507 - Sample with article.

modules/base/general/classes/BxBaseModGeneralModule.php

@@ -469,8 +469,8 @@ class BxBaseModGeneralModule extends BxDolModule
         return array(
             'owner_id' => $aContentInfo[$CNF['FIELD_AUTHOR']],
             'icon' => !empty($CNF['ICON']) ? $CNF['ICON'] : '',
-        	'sample' => _t($CNF['T']['txt_sample_single']),
-    	    'sample_action' => isset($CNF['T']['txt_sample_single_action']) ? _t($CNF['T']['txt_sample_single_action']) : '',
+        	'sample' => isset($CNF['T']['txt_sample_single_with_article']) ? $CNF['T']['txt_sample_single_with_article'] : $CNF['T']['txt_sample_single'],
+    	    'sample_action' => isset($CNF['T']['txt_sample_single_action']) ? $CNF['T']['txt_sample_single_action'] : '',
             'content' => $this->_getContentForTimelinePost($aEvent, $aContentInfo), //a string to display or array to parse default template before displaying.
             'date' => $aContentInfo[$CNF['FIELD_ADDED']],
             'votes' => $aVotes,
@@ -750,8 +750,8 @@ class BxBaseModGeneralModule extends BxDolModule
         $aImages = $this->_getImagesForTimelinePost($aEvent, $aContentInfo, $sUrl);
 
     	return array(
-			'sample' => _t($CNF['T']['txt_sample_single']),
-    		'sample_action' => isset($CNF['T']['txt_sample_single_action']) ? _t($CNF['T']['txt_sample_single_action']) : '',
+    		'sample' => isset($CNF['T']['txt_sample_single_with_article']) ? $CNF['T']['txt_sample_single_with_article'] : $CNF['T']['txt_sample_single'],
+    	    'sample_action' => isset($CNF['T']['txt_sample_single_action']) ? $CNF['T']['txt_sample_single_action'] : '',
 			'url' => $sUrl,
 			'title' => isset($CNF['FIELD_TITLE']) && isset($aContentInfo[$CNF['FIELD_TITLE']]) ? $aContentInfo[$CNF['FIELD_TITLE']] : 
 			(isset($CNF['FIELD_TEXT']) && isset($aContentInfo[$CNF['FIELD_TEXT']]) ? strmaxtextlen($aContentInfo[$CNF['FIELD_TEXT']], 20, '...') : ''),

modules/boonex/albums/classes/BxAlbumsConfig.php

@@ -119,6 +119,7 @@ class BxAlbumsConfig extends BxBaseModTextConfig
             // some language keys
             'T' => array (
                 'txt_sample_single' => '_bx_albums_txt_sample_single',
+            	'txt_sample_single_with_article' => '_bx_albums_txt_sample_single_with_article',
             	'txt_sample_comment_single' => '_bx_albums_txt_sample_comment_single',
             	'txt_sample_vote_single' => '_bx_albums_txt_sample_vote_single',
                 'txt_media_single' => '_bx_albums_txt_media_single',

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

@@ -176,6 +176,7 @@
 
     <string name="_bx_albums_txt_all_entries_by"><![CDATA[<a href="{0}">All Albums by {1} ({2})</a>]]></string>
     <string name="_bx_albums_txt_sample_single"><![CDATA[album]]></string>
+    <string name="_bx_albums_txt_sample_single_with_article"><![CDATA[an album]]></string>
     <string name="_bx_albums_txt_sample_comment_single"><![CDATA[album's comment]]></string>
     <string name="_bx_albums_txt_sample_vote_single"><![CDATA[album's vote]]></string>
     <string name="_bx_albums_txt_media_single"><![CDATA[image]]></string>

modules/boonex/events/classes/BxEventsConfig.php

@@ -137,6 +137,7 @@ class BxEventsConfig extends BxBaseModProfileConfig
             // some language keys
             'T' => array (
                 'txt_sample_single' => '_bx_events_txt_sample_single',
+            	'txt_sample_single_with_article' => '_bx_events_txt_sample_single_with_article',
                 'txt_sample_vote_single' => '_bx_events_txt_sample_vote_single',
                 'txt_private_group' => '_bx_events_txt_private_group',
                 'txt_N_fans' => '_bx_events_txt_N_fans',

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

@@ -231,6 +231,7 @@
     <string name="_bx_events_txt_account_suspended"><![CDATA[This event is suspended.]]></string>
     <string name="_bx_events_txt_N_fans"><![CDATA[{0} members]]></string>
     <string name="_bx_events_txt_sample_single"><![CDATA[event]]></string>
+    <string name="_bx_events_txt_sample_single_with_article"><![CDATA[an event]]></string>
     <string name="_bx_events_txt_sample_vote_single"><![CDATA[event's vote]]></string>
     <string name="_bx_events_txt_to_admins"><![CDATA[To Admins]]></string>
     <string name="_bx_events_txt_from_admins"><![CDATA[From Admins]]></string>

modules/boonex/forum/classes/BxForumConfig.php

@@ -126,6 +126,7 @@ class BxForumConfig extends BxBaseModTextConfig
             // some language keys
             'T' => array (
                 'txt_sample_single' => '_bx_forum_txt_sample_single',
+            	'txt_sample_single_with_article' => '_bx_forum_txt_sample_single_with_article',
             	'txt_sample_comment_single' => '_bx_forum_txt_sample_comment_single',
             	'grid_action_err_delete' => '_bx_forum_grid_action_err_delete',
             	'grid_txt_account_manager' => '_bx_forum_grid_txt_account_manager',

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

@@ -248,6 +248,7 @@
 	<string name="_bx_forum_txt_entry_sticked"><![CDATA[Pinned discussion]]></string>
     <string name="_bx_forum_txt_sample_comment_single"><![CDATA[discussion's comment]]></string>
     <string name="_bx_forum_txt_sample_single"><![CDATA[discussion]]></string>
+    <string name="_bx_forum_txt_sample_single_with_article"><![CDATA[a discussion]]></string>
     <string name="_bx_forum_x_date_by_x_replier"><![CDATA[{0} by {1}]]></string>
     <string name="_bx_forum_you_are_last_replier"><![CDATA[You are last replier]]></string>
     

modules/boonex/groups/classes/BxGroupsConfig.php

@@ -136,6 +136,7 @@ class BxGroupsConfig extends BxBaseModProfileConfig
             // some language keys
             'T' => array (
                 'txt_sample_single' => '_bx_groups_txt_sample_single',
+            	'txt_sample_single_with_article' => '_bx_groups_txt_sample_single_with_article',
                 'txt_sample_vote_single' => '_bx_groups_txt_sample_vote_single',
                 'txt_private_group' => '_bx_groups_txt_private_group',
                 'txt_N_fans' => '_bx_groups_txt_N_fans',

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

@@ -205,6 +205,7 @@
     <string name="_bx_groups_txt_account_suspended"><![CDATA[This group is suspended.]]></string>
     <string name="_bx_groups_txt_N_fans"><![CDATA[{0} members]]></string>
     <string name="_bx_groups_txt_sample_single"><![CDATA[group]]></string>
+    <string name="_bx_groups_txt_sample_single_with_article"><![CDATA[a group]]></string>
     <string name="_bx_groups_txt_sample_vote_single"><![CDATA[group's vote]]></string>
     <string name="_bx_groups_txt_to_admins"><![CDATA[To Admins]]></string>
     <string name="_bx_groups_txt_from_admins"><![CDATA[From Admins]]></string>

modules/boonex/market/classes/BxMarketConfig.php

@@ -147,6 +147,7 @@ class BxMarketConfig extends BxBaseModTextConfig
             // some language keys
             'T' => array (
                 'txt_sample_single' => '_bx_market_txt_sample_single',
+            	'txt_sample_single_with_article' => '_bx_market_txt_sample_single_with_article',
             	'txt_sample_comment_single' => '_bx_market_txt_sample_comment_single',
             	'txt_sample_vote_single' => '_bx_market_txt_sample_vote_single',
             	'grid_action_err_delete' => '_bx_market_grid_action_err_delete',

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

@@ -319,6 +319,7 @@
     <string name="_bx_market_txt_category"><![CDATA[Category:]]></string>
     <string name="_bx_market_txt_most_current_version"><![CDATA[The most current version]]></string>
     <string name="_bx_market_txt_sample_single"><![CDATA[product]]></string>
+    <string name="_bx_market_txt_sample_single_with_article"><![CDATA[a product]]></string>
     <string name="_bx_market_txt_sample_comment_single"><![CDATA[product's comment]]></string>
     <string name="_bx_market_txt_sample_vote_single"><![CDATA[product's vote]]></string>
     <string name="_bx_market_txt_author_added_product"><![CDATA[{0} {1}]]></string>

modules/boonex/posts/classes/BxPostsConfig.php

@@ -103,6 +103,7 @@ class BxPostsConfig extends BxBaseModTextConfig
             // some language keys
             'T' => array (
                 'txt_sample_single' => '_bx_posts_txt_sample_single',
+            	'txt_sample_single_with_article' => '_bx_posts_txt_sample_single_with_article',
             	'txt_sample_comment_single' => '_bx_posts_txt_sample_comment_single',
             	'txt_sample_vote_single' => '_bx_posts_txt_sample_vote_single',
             	'grid_action_err_delete' => '_bx_posts_grid_action_err_delete',

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

@@ -196,6 +196,7 @@
 
     <string name="_bx_posts_txt_all_entries_by"><![CDATA[<a href="{0}">All Posts by {1} ({2})</a>]]></string>
     <string name="_bx_posts_txt_sample_single"><![CDATA[post]]></string>
+    <string name="_bx_posts_txt_sample_single_with_article"><![CDATA[a post]]></string>
     <string name="_bx_posts_txt_sample_comment_single"><![CDATA[post's comment]]></string>
     <string name="_bx_posts_txt_sample_vote_single"><![CDATA[post's vote]]></string>
 </resources>

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

@@ -176,6 +176,7 @@
 
     <string name="_bx_albums_txt_all_entries_by"><![CDATA[<a href="{0}">Все альбомы от {1} ({2})</a>]]></string>
     <string name="_bx_albums_txt_sample_single"><![CDATA[альбом]]></string>
+    <string name="_bx_albums_txt_sample_single_with_article"><![CDATA[альбом]]></string>
     <string name="_bx_albums_txt_sample_comment_single"><![CDATA[комментарий к альбому]]></string>
     <string name="_bx_albums_txt_sample_vote_single"><![CDATA[голос за альбом]]></string>
     <string name="_bx_albums_txt_media_single"><![CDATA[изображение]]></string>

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

@@ -229,6 +229,7 @@
     <string name="_bx_events_txt_account_suspended"><![CDATA[Это событие заблокировано.]]></string>
     <string name="_bx_events_txt_N_fans"><![CDATA[{0} участников]]></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_vote_single"><![CDATA[голос за событие]]></string>
     <string name="_bx_events_txt_to_admins"><![CDATA[В админы]]></string>
     <string name="_bx_events_txt_from_admins"><![CDATA[Из админов]]></string>

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

@@ -244,6 +244,7 @@
 	<string name="_bx_forum_txt_entry_sticked"><![CDATA[Закрепленное обсуждение]]></string>
 	<string name="_bx_forum_txt_sample_comment_single"><![CDATA[комментарий к обсуждению]]></string>
 	<string name="_bx_forum_txt_sample_single"><![CDATA[обсуждение]]></string>
+	<string name="_bx_forum_txt_sample_single_with_article"><![CDATA[обсуждение]]></string>
     <string name="_bx_forum_x_date_by_x_replier"><![CDATA[{0} {1}]]></string>
     <string name="_bx_forum_you_are_last_replier"><![CDATA[Вы - последний ответивший]]></string>
 

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

@@ -204,6 +204,7 @@
     <string name="_bx_groups_txt_account_suspended"><![CDATA[Эта группа заблокирована.]]></string>
     <string name="_bx_groups_txt_N_fans"><![CDATA[{0} участников]]></string>
     <string name="_bx_groups_txt_sample_single"><![CDATA[группа]]></string>
+    <string name="_bx_groups_txt_sample_single_with_article"><![CDATA[группа]]></string>
     <string name="_bx_groups_txt_sample_vote_single"><![CDATA[голос за группу]]></string>
     <string name="_bx_groups_txt_to_admins"><![CDATA[В админы]]></string>
     <string name="_bx_groups_txt_from_admins"><![CDATA[Из админов]]></string>

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

@@ -319,6 +319,7 @@
     <string name="_bx_market_txt_category"><![CDATA[Категория:]]></string>
     <string name="_bx_market_txt_most_current_version"><![CDATA[Самая новая версия]]></string>
     <string name="_bx_market_txt_sample_single"><![CDATA[продукт]]></string>
+    <string name="_bx_market_txt_sample_single_with_article"><![CDATA[продукт]]></string>
     <string name="_bx_market_txt_sample_comment_single"><![CDATA[Обзоры к продукту]]></string>
     <string name="_bx_market_txt_sample_vote_single"><![CDATA[голос за продукт]]></string>
     <string name="_bx_market_txt_author_added_product"><![CDATA[{0} {1}]]></string>

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

@@ -196,6 +196,7 @@
 
     <string name="_bx_posts_txt_all_entries_by"><![CDATA[<a href="{0}">Все публикации от {1} ({2})</a>]]></string>
     <string name="_bx_posts_txt_sample_single"><![CDATA[публикация]]></string>
+    <string name="_bx_posts_txt_sample_single_with_article"><![CDATA[публикация]]></string>
     <string name="_bx_posts_txt_sample_comment_single"><![CDATA[комментарии к публикации]]></string>
     <string name="_bx_posts_txt_sample_vote_single"><![CDATA[голос за публикацию]]></string>
 </resources>

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

@@ -130,6 +130,7 @@
 	<string name="_bx_timeline_txt_user_added_sample"><![CDATA[{0} добавил {1}]]></string>
 	<string name="_bx_timeline_txt_user_shared_sample"><![CDATA[{0} снова разместил {1} {2}]]></string>
 	<string name="_bx_timeline_txt_sample"><![CDATA[сообщение]]></string>
+	<string name="_bx_timeline_txt_sample_with_article"><![CDATA[сообщение]]></string>
 	<string name="_bx_timeline_txt_sample_ext"><![CDATA[сообщение в ленте]]></string>
 	<string name="_bx_timeline_txt_sample_comment_single"><![CDATA[комментарий к сообщению в ленте]]></string>
 	<string name="_bx_timeline_txt_sample_vote_single"><![CDATA[голос за сообщение в ленте]]></string>

modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -935,7 +935,7 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
         $aResult = array(
             'owner_id' => $aEvent['object_id'],
             'icon' => $CNF['ICON'],
-        	'sample' => '_bx_timeline_txt_sample',
+        	'sample' => '_bx_timeline_txt_sample_with_article',
         	'sample_action' => '_bx_timeline_txt_added_sample',
             'content_type' => $sType,
             'content' => array(

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

@@ -126,10 +126,11 @@
 	<string name="_bx_timeline_txt_pinned"><![CDATA[Pinned post]]></string>
 
 	<string name="_bx_timeline_txt_rss_caption"><![CDATA[{0}'s timeline]]></string>
-	<string name="_bx_timeline_txt_added_sample"><![CDATA[added a {0}]]></string>
-	<string name="_bx_timeline_txt_user_added_sample"><![CDATA[{0} added a {1}]]></string>
+	<string name="_bx_timeline_txt_added_sample"><![CDATA[added {0}]]></string>
+	<string name="_bx_timeline_txt_user_added_sample"><![CDATA[{0} added {1}]]></string>
 	<string name="_bx_timeline_txt_user_shared_sample"><![CDATA[{0} reposted {1}'s {2}]]></string>
 	<string name="_bx_timeline_txt_sample"><![CDATA[post]]></string>
+	<string name="_bx_timeline_txt_sample_with_article"><![CDATA[a post]]></string>
 	<string name="_bx_timeline_txt_sample_ext"><![CDATA[timeline post]]></string>
 	<string name="_bx_timeline_txt_sample_comment_single"><![CDATA[timeline post's comment]]></string>
     <string name="_bx_timeline_txt_sample_vote_single"><![CDATA[timeline post's vote]]></string>

modules/boonex/timeline/template/item_outline.html

@@ -14,7 +14,7 @@
 				</div>
 				<div class="__style_prefix__-owner-info bx-def-thumb-size-min-height bx-def-thumb-size-left-indent">
 				    <!-- NOTE: Spaces after and between elements in 'owner-name' DIV are needed for better line folding -->
-					<div class="__style_prefix__-owner-name bx-def-padding-thd-top bx-def-font-middle bx-def-font-light bx-def-font-grayed">
+					<div class="__style_prefix__-owner-name bx-def-font-middle bx-def-font-light bx-def-font-grayed">
 						<a href="__item_owner_url__" class="__style_prefix__-owner-name" title="__item_owner_title__">__item_owner_name__</a> 
 			            <bx_if:show_timeline_owner>
 				        	<i class="sys-icon caret-right"></i> <a href="__owner_url__" class="__style_prefix__-timeline-owner-name">__owner_username__</a> 

modules/boonex/timeline/template/item_timeline.html

@@ -5,7 +5,7 @@
 			<i class="sys-icon __item_icon__"></i>
         </div>
     </div>
-    <div class="__style_prefix__-item-cnt bx-def-box bx-def-padding-sec-topbottom bx-def-round-corners __class_content__">
+    <div class="__style_prefix__-item-cnt bx-def-box bx-def-padding-topbottom bx-def-round-corners __class_content__">
         <div class="__style_prefix__-item-owner bx-def-margin-leftright"> 
             <div class="__style_prefix__-owner-avatar bx-def-thumb bx-def-thumb-size">
                 <a href="__item_owner_url__" class="__style_prefix__-owner-avatar" title="__item_owner_title__">
@@ -19,7 +19,7 @@
             </div>
             <div class="__style_prefix__-owner-info bx-def-thumb-size-min-height bx-def-thumb-size-left-indent">
                 <!-- NOTE: Spaces after and between elements in 'owner-name' DIV are needed for better line folding -->
-                <div class="__style_prefix__-owner-name bx-def-padding-thd-top bx-def-font-middle bx-def-font-light bx-def-font-grayed">
+                <div class="__style_prefix__-owner-name bx-def-font-middle bx-def-font-light bx-def-font-grayed">
                     <a href="__item_owner_url__" class="__style_prefix__-owner-name" title="__item_owner_title__">__item_owner_name__</a> 
                     <bx_if:show_timeline_owner>
                         <i class="sys-icon caret-right"></i> <a href="__owner_url__" class="__style_prefix__-timeline-owner-name">__owner_username__</a>