Merge "MWTimestamp::getHumanTimestamp uses 'just-now' message, which did not exist"

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 2d18a4a..f516051 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3888,6 +3888,7 @@ By executing it, your system may be compromised.",
 'hours'          => '{{PLURAL:$1|$1 hour|$1 hours}}',
 'days'           => '{{PLURAL:$1|$1 day|$1 days}}',
 'ago'            => '$1 ago',
+'just-now'       => 'just now',
 
 # Bad image list
 'bad_image_list' => 'The format is as follows:

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index e16e557..b76e19b 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -3792,6 +3792,7 @@ Part of variable $1 in {{msg-mw|Ago}}
 *{{msg-mw|Minutes}}
 *{{msg-mw|Hours}}
 *{{msg-mw|Days}}',
+'just-now' => 'Phrase for indicating something happened just now.',
 
 # Bad image list
 'bad_image_list' => 'This message only appears to guide administrators to add links with the right format. This will not appear anywhere else in MediaWiki.',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 60232da..e2e3940 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2816,6 +2816,7 @@ $wgMessageStructure = array(
                'hours',
                'days',
                'ago',
+               'just-now',
        ),
        'badimagelist' => array(
                'bad_image_list',