11 years ago · 2475065de4
--- a/SSI.php
+++ b/SSI.php
@@ -218,7 +218,7 @@ function ssi_welcome($output_method = 'echo')
 
 		if ($context['user']['is_guest'])
 
 			echo sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $scripturl . '?action=login');
 
 		else
 
-			echo $txt['hello_member'], ' <strong>', $context['user']['name'], '</strong>', allowedTo('pm_read') ? ', ' . $txt['msg_alert_you_have'] . ' <a href="' . $scripturl . '?action=pm">' . $context['user']['messages'] . ' ' . ($context['user']['messages'] == '1' ? $txt['message_lowercase'] : $txt['msg_alert_messages']) . '</a>' . $txt['newmessages4'] . ' ' . $context['user']['unread_messages'] . ' ' . ($context['user']['unread_messages'] == '1' ? $txt['newmessages0'] : $txt['newmessages1']) : '', '.';
 
+			echo $txt['hello_member'], ' <strong>', $context['user']['name'], '</strong>', allowedTo('pm_read') ? ', ' . (empty($context['user']['messages']) ? $txt['msg_alert_no_messages'] : (($context['user']['messages'] == 1 ? sprintf($txt['msg_alert_one_message'], $scripturl . '?action=pm') : sprintf($txt['msg_alert_many_message'], $scripturl . '?action=pm', $context['user']['messages'])) . ', ' . ($context['user']['unread_messages'] == 1 ? $txt['msg_alert_one_new'] : sprintf($txt['msg_alert_many_new'], $context['user']['unread_messages'])))) : '';
 
 	}
 
 	// Don't echo... then do what?!
 
 	else
--- a/Themes/default/BoardIndex.template.php
+++ b/Themes/default/BoardIndex.template.php
@@ -420,7 +420,7 @@ function template_info_center()
 
 				</h4>
 
 			</div>
 
 			<p class="pminfo">
 
-					', $txt['you_have'], ' ', comma_format($context['user']['messages']), ' ', $context['user']['messages'] == 1 ? $txt['message_lowercase'] : $txt['msg_alert_messages'], '.... ', $txt['click'], ' <a href="', $scripturl, '?action=pm">', $txt['here'], '</a> ', $txt['to_view'], '
 
+					', empty($context['user']['messages']) ? $txt['you_have_no_msg'] : ($context['user']['messages'] == 1 ? sprintf($txt['you_have_one_msg'], $scripturl . '?action=pm') : sprintf($txt['you_have_many_msgs'], $scripturl . '?action=pm', $context['user']['messages'])), '
 
 			</p>';
 
 	}
 
 
--- a/Themes/default/languages/index.english.php
+++ b/Themes/default/languages/index.english.php
@@ -145,6 +145,11 @@ $txt['send_message'] = 'Send message';
 
 $txt['msg_alert_none'] = 'No messages...';
 
 $txt['msg_alert_you_have'] = 'you have';
 
 $txt['msg_alert_messages'] = 'messages';
 
+$txt['msg_alert_no_messages'] = 'you don\'t have any message';
 
+$txt['msg_alert_one_message'] = 'you have <a href="%1$s">1 message</a>';
 
+$txt['msg_alert_many_message'] = 'you have <a href="%1$s">%2$d messages</a>';
 
+$txt['msg_alert_one_new'] = '1 is new';
 
+$txt['msg_alert_many_new'] = '%1$d are new';
 
 $txt['remove_message'] = 'Remove this message';
 
 
 
 $txt['online_users'] = 'Users Online';
@@ -344,6 +349,9 @@ $txt['you_have'] = 'You\'ve got';
 
 $txt['click'] = 'Click';
 
 $txt['here'] = 'here';
 
 $txt['to_view'] = 'to view them.';
 
+$txt['you_have_no_msg'] = 'You don\'t have any message...';
 
+$txt['you_have_one_msg'] = 'You\'ve got 1 message... Click <a href="%1$s">here</a> to view it';
 
+$txt['you_have_many_msgs'] = 'You\'ve got %2$d messages... Click <a href="%1$s">here</a> to view them';
 
 
 
 $txt['total_boards'] = 'Total Boards';