Added Minute and Hour (singular) to date expression

appleseedproj · Oct 17, 2010 · ebb4ae5 · ebb4ae5
1 parent 0ce0350
commit ebb4ae5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/languages/default/en-US/_system/global.lang b/languages/default/en-US/_system/global.lang
@@ -11,7 +11,9 @@ ALL_PAGES="All"
 
 [time]
 TIME_IN_SECONDS_AGO="%seconds$s seconds ago"
+TIME_IN_MINUTE_AGO="%minutes$s minute ago"
 TIME_IN_MINUTES_AGO="%minutes$s minutes ago"
+TIME_IN_HOUR_AGO="%hours$s hour ago"
 TIME_IN_HOURS_AGO="%hours$s hours ago"
 TIME_FULL_AM="%day$s/%month$s/%year$s %minute$s:%second$sam"
 TIME_FULL_PM="%day$s/%month$s/%year$s %minute$s:%second$spm"

diff --git a/libraries/date.php b/libraries/date.php
@@ -57,8 +57,12 @@ public function Format ( $pStamp, $pVerbose = false ) {
 
 		if ( $seconds < 60 ) {
 			$formatted = __( "Time In Seconds Ago", array ( "seconds" => $seconds ) );
+		} else if ( $minutes == 1 ) {
+			$formatted = __( "Time In Minute Ago", array ( "minutes" => $minutes  ) );
 		} else if ( $minutes < 60 ) {
 			$formatted = __( "Time In Minutes Ago", array ( "minutes" => $minutes  ) );
+		} else if ( $hours == 1 ) {
+			$formatted = __( "Time In Hour Ago", array ( "hours" => $hours  ) );
 		} else if ( $hours < 24 ) {
 			$formatted = __( "Time In Hours Ago", array ( "hours" => $hours  ) );
 		} else if ( $days < 365 ) {