Merge "Function for "pretty timestamps" that are human readable and understandable."

[lhc/web/wiklou.git] / languages / messages / MessagesEn.php

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index def58d9..7a480e8 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -162,18 +162,22 @@ $dateFormats = array(
        'mdy time' => 'H:i',
        'mdy date' => 'F j, Y',
        'mdy both' => 'H:i, F j, Y',
+       'mdy shortdate' => 'F j',
 
        'dmy time' => 'H:i',
        'dmy date' => 'j F Y',
        'dmy both' => 'H:i, j F Y',
+       'dmy shortdate' => 'j F',
 
        'ymd time' => 'H:i',
        'ymd date' => 'Y F j',
        'ymd both' => 'H:i, Y F j',
+       'ymd shortdate' => 'F j',
 
        'ISO 8601 time' => 'xnH:xni:xns',
        'ISO 8601 date' => 'xnY-xnm-xnd',
        'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
+       // 'ISO 8601 shortdate' => 'xnm-xnd', // This is just confusing
 );
 
 /**
@@ -3873,6 +3877,22 @@ By executing it, your system may be compromised.",
 'days'           => '{{PLURAL:$1|$1 day|$1 days}}',
 'ago'            => '$1 ago',
 
+'hours-ago'      => '$1 {{PLURAL:$1|hour|hours}} ago',
+'minutes-ago'    => '$1 {{PLURAL:$1|minute|minutes}} ago',
+'seconds-ago'    => '$1 {{PLURAL:$1|seconds|seconds}} ago',
+
+'monday-at'   => 'Monday at $1',
+'tuesday-at'   => 'Tuesday at $1',
+'wednesday-at'   => 'Wednesday at $1',
+'thursday-at'   => 'Thursday at $1',
+'friday-at'   => 'Friday at $1',
+'saturday-at'   => 'Saturday at $1',
+'sunday-at'   => 'Sunday at $1',
+
+'today-at'       => '$1',
+'yesterday-at'   => 'Yesterday at $1',
+'just-now'       => 'Just now',
+
 # Bad image list
 'bad_image_list' => 'The format is as follows: