Ver código fonte

#21 - Time and Date

AntonLV 13 anos atrás
pai
commit
1463e742d6

+ 15 - 1
inc/utils.inc.php

@@ -630,7 +630,21 @@ function _format_when ($iSec) {
             $s .= (0 == $i || 1 == $i) ? _t('_x_hour_ago', '1', '') : _t('_x_hour_ago', $i, 's');
         } else {
             $i = round($iSec/60/60/24);
-            $s .= (0 == $i || 1 == $i) ? _t('_1_day_ago') : _t('_x_day_ago', $i, 's');
+            if(0 == $i || 1 == $i)
+            	$s .= _t('_1_day_ago');
+            else if($i > 1 && $i <= 5)
+            	$s .= _t('_x_day_ago', $i, 's');
+            else {
+            	$iNow = mktime();
+            	$iNowDayOfYear = date('z', $iNow);
+
+            	$iDate = $iNow - $iSec; 
+            	$iDay = date('j', $iDate);
+            	$iMonth = date('n', $iDate);
+            	$iYear = date('Y', $iDate);
+
+            	$s .= trim(_t('_day_of_' . $iMonth . '_short', $iDay, ($i > $iNowDayOfYear ? $iYear : '')));
+            }
         }
     } else {
         if ($iSec > -3600) {

+ 17 - 4
modules/boonex/english/data/langs/system.xml

@@ -1139,10 +1139,11 @@ Please click "Continue" below to navigate to the home page of the site.]]></stri
 	<string name="_enable able to rate"><![CDATA[Enable rate]]></string>
 	<string name="_disable able to rate"><![CDATA[Disable rate]]></string>
 	<string name="_member_banned"><![CDATA[Sorry, you\'ve been banned]]></string>
-	<string name="_1_minute_ago"><![CDATA[Just now]]></string>
-	<string name="_x_minute_ago"><![CDATA[{0} minute{1} ago]]></string>
-	<string name="_x_hour_ago"><![CDATA[{0} hour{1} ago]]></string>
-	<string name="_x_day_ago"><![CDATA[{0} day{1} ago]]></string>
+	<string name="_1_minute_ago"><![CDATA[Now]]></string>
+	<string name="_x_minute_ago"><![CDATA[{0}m ago]]></string>
+	<string name="_x_hour_ago"><![CDATA[{0}h ago]]></string>
+	<string name="_x_day_ago"><![CDATA[{0}d ago]]></string>
+	<string name="_x_day_y_month"><![CDATA[{0} {1}]]></string>
 	<string name="_1_day_ago"><![CDATA[Yesterday]]></string>
 	<string name="_in_1_minute"><![CDATA[Just now]]></string>
 	<string name="_in_x_minute"><![CDATA[In {0} minute{1}]]></string>
@@ -1223,17 +1224,29 @@ Please click "Continue" below to navigate to the home page of the site.]]></stri
 	<string name="_FieldValues_Suspended"><![CDATA[Suspended]]></string>
 	<string name="_for"><![CDATA[for]]></string>
 	<string name="_day_of_1"><![CDATA[{0} January, {1}]]></string>
+	<string name="_day_of_1_short"><![CDATA[{0} Jan {1}]]></string>
 	<string name="_day_of_2"><![CDATA[{0} February, {1}]]></string>
+	<string name="_day_of_2_short"><![CDATA[{0} Feb {1}]]></string>
 	<string name="_day_of_3"><![CDATA[{0} March, {1}]]></string>
+	<string name="_day_of_3_short"><![CDATA[{0} Mar {1}]]></string>
 	<string name="_day_of_4"><![CDATA[{0} April, {1}]]></string>
+	<string name="_day_of_4_short"><![CDATA[{0} Apr {1}]]></string>
 	<string name="_day_of_5"><![CDATA[{0} May, {1}]]></string>
+	<string name="_day_of_5_short"><![CDATA[{0} May {1}]]></string>
 	<string name="_day_of_6"><![CDATA[{0} June, {1}]]></string>
+	<string name="_day_of_6_short"><![CDATA[{0} Jun {1}]]></string>
 	<string name="_day_of_7"><![CDATA[{0} July, {1}]]></string>
+	<string name="_day_of_7_short"><![CDATA[{0} Jul {1}]]></string>
 	<string name="_day_of_8"><![CDATA[{0} August, {1}]]></string>
+	<string name="_day_of_8_short"><![CDATA[{0} Aug {1}]]></string>
 	<string name="_day_of_9"><![CDATA[{0} September, {1}]]></string>
+	<string name="_day_of_9_short"><![CDATA[{0} Sep {1}]]></string>
 	<string name="_day_of_10"><![CDATA[{0} October, {1}]]></string>
+	<string name="_day_of_10_short"><![CDATA[{0} Oct {1}]]></string>
 	<string name="_day_of_11"><![CDATA[{0} November, {1}]]></string>
+	<string name="_day_of_11_short"><![CDATA[{0} Nov {1}]]></string>
 	<string name="_day_of_12"><![CDATA[{0} December, {1}]]></string>
+	<string name="_day_of_12_short"><![CDATA[{0} Dec {1}]]></string>
 	<string name="_Clear"><![CDATA[Clear]]></string>
 	<string name="_SubCategory is required"><![CDATA[SubCategory is required]]></string>
 	<string name="_Send eCard"><![CDATA[Send eCard]]></string>

+ 23 - 6
modules/boonex/russian/data/langs/system.xml

@@ -1139,12 +1139,17 @@ Please click "Continue" below to navigate to the home page of the site.]]></stri
 	<string name="_enable able to rate"><![CDATA[Enable rate]]></string>
 	<string name="_disable able to rate"><![CDATA[Disable rate]]></string>
 	<string name="_member_banned"><![CDATA[Sorry, you\'ve been banned]]></string>
-	<string name="_x_minute_ago"><![CDATA[{0} Minute{1} Ago]]></string>
-	<string name="_x_hour_ago"><![CDATA[{0} Hour{1} Ago]]></string>
-	<string name="_x_day_ago"><![CDATA[{0} Day{1} Ago]]></string>
-	<string name="_in_x_minute"><![CDATA[In {0} Minute{1}]]></string>
-	<string name="_in_x_hour"><![CDATA[In {0} Hour{1}]]></string>
-	<string name="_in_x_day"><![CDATA[In {0} Day{1}]]></string>
+	<string name="_1_minute_ago"><![CDATA[Now]]></string>
+	<string name="_x_minute_ago"><![CDATA[{0}m ago]]></string>
+	<string name="_x_hour_ago"><![CDATA[{0}h ago]]></string>
+	<string name="_x_day_ago"><![CDATA[{0}d ago]]></string>
+	<string name="_x_day_y_month"><![CDATA[{0} {1}]]></string>
+	<string name="_1_day_ago"><![CDATA[Yesterday]]></string>
+	<string name="_in_1_minute"><![CDATA[Just now]]></string>
+	<string name="_in_x_minute"><![CDATA[In {0} minute{1}]]></string>
+	<string name="_in_x_hour"><![CDATA[In {0} hour{1}]]></string>
+	<string name="_in_x_day"><![CDATA[In {0} day{1}]]></string>
+	<string name="_in_1_day"><![CDATA[Tomorrow]]></string>
 	<string name="_Shoutbox"><![CDATA[Shoutbox]]></string>
 	<string name="_powered_by"><![CDATA[Powered by]]></string>
 	<string name="_about_BoonEx"><![CDATA[BoonEx - Community Software;  Dating And Social Networking Scripts; Video Chat And More.]]></string>
@@ -1198,17 +1203,29 @@ Please click "Continue" below to navigate to the home page of the site.]]></stri
 	<string name="_FieldValues_Suspended"><![CDATA[Suspended]]></string>
 	<string name="_for"><![CDATA[for]]></string>
 	<string name="_day_of_1"><![CDATA[{0} January, {1}]]></string>
+	<string name="_day_of_1_short"><![CDATA[{0} Jan {1}]]></string>
 	<string name="_day_of_2"><![CDATA[{0} February, {1}]]></string>
+	<string name="_day_of_2_short"><![CDATA[{0} Feb {1}]]></string>
 	<string name="_day_of_3"><![CDATA[{0} March, {1}]]></string>
+	<string name="_day_of_3_short"><![CDATA[{0} Mar {1}]]></string>
 	<string name="_day_of_4"><![CDATA[{0} April, {1}]]></string>
+	<string name="_day_of_4_short"><![CDATA[{0} Apr {1}]]></string>
 	<string name="_day_of_5"><![CDATA[{0} May, {1}]]></string>
+	<string name="_day_of_5_short"><![CDATA[{0} May {1}]]></string>
 	<string name="_day_of_6"><![CDATA[{0} June, {1}]]></string>
+	<string name="_day_of_6_short"><![CDATA[{0} Jun {1}]]></string>
 	<string name="_day_of_7"><![CDATA[{0} July, {1}]]></string>
+	<string name="_day_of_7_short"><![CDATA[{0} Jul {1}]]></string>
 	<string name="_day_of_8"><![CDATA[{0} August, {1}]]></string>
+	<string name="_day_of_8_short"><![CDATA[{0} Aug {1}]]></string>
 	<string name="_day_of_9"><![CDATA[{0} September, {1}]]></string>
+	<string name="_day_of_9_short"><![CDATA[{0} Sep {1}]]></string>
 	<string name="_day_of_10"><![CDATA[{0} October, {1}]]></string>
+	<string name="_day_of_10_short"><![CDATA[{0} Oct {1}]]></string>
 	<string name="_day_of_11"><![CDATA[{0} November, {1}]]></string>
+	<string name="_day_of_11_short"><![CDATA[{0} Nov {1}]]></string>
 	<string name="_day_of_12"><![CDATA[{0} December, {1}]]></string>
+	<string name="_day_of_12_short"><![CDATA[{0} Dec {1}]]></string>
 	<string name="_Clear"><![CDATA[Clear]]></string>
 	<string name="_SubCategory is required"><![CDATA[SubCategory is required]]></string>
 	<string name="_Send eCard"><![CDATA[Send eCard]]></string>