From bda51d3c6e7235d810f7a9d8f47f330ae91a3260 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Tue, 23 Apr 2013 15:53:56 +0200 Subject: [PATCH] Update messages.inc and rebuild MessagesEn.php. Change-Id: I5af753e9db10abc5e991a546649a7280a9fed8a2 --- languages/messages/MessagesEn.php | 27 +++++++++++++------------- maintenance/language/messages.inc | 32 +++++++++++++++---------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 36a9aa51ee..8191f590a9 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -3918,20 +3918,19 @@ By executing it, your system may be compromised.", 'ago' => '$1 ago', 'just-now' => 'just now', -'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', +# Human-readable timestamps +'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', # Bad image list 'bad_image_list' => 'The format is as follows: diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index a9ad753c66..96a6c13e4f 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -136,20 +136,6 @@ $wgMessageStructure = array( 'nov', 'dec', ), - 'human-timestamps' => array( - 'hours-ago', - 'minutes-ago', - 'seconds-ago', - 'monday-at', - 'tuesday-at', - 'wednesday-at', - 'thursday-at', - 'friday-at', - 'saturday-at', - 'sunday-at', - 'today-at', - 'yesterday-at', - ), 'categorypages' => array( 'pagecategories', 'pagecategorieslink', @@ -2854,6 +2840,20 @@ $wgMessageStructure = array( 'ago', 'just-now', ), + 'human-timestamps' => array( + 'hours-ago', + 'minutes-ago', + 'seconds-ago', + 'monday-at', + 'tuesday-at', + 'wednesday-at', + 'thursday-at', + 'friday-at', + 'saturday-at', + 'sunday-at', + 'today-at', + 'yesterday-at', + ), 'badimagelist' => array( 'bad_image_list', ), @@ -3889,7 +3889,6 @@ XHTML id names.", 'underline' => '', 'editfont' => 'Font style option in Special:Preferences', 'dates' => 'Dates', - 'human-timestamps' => 'Human timestamps', 'categorypages' => 'Categories related messages', 'mainpage' => '', 'miscellaneous1' => '', @@ -4013,8 +4012,9 @@ XHTML id names.", 'patrol-log' => 'Patrol log', 'imagedeletion' => 'Image deletion', 'browsediffs' => 'Browsing diffs', - 'newfiles' => 'Special:NewFiles', + 'newfiles' => 'Special:NewFiles', 'video-info' => 'Video information, used by Language::formatTimePeriod() to format lengths in the above messages', + 'human-timestamps' => 'Human-readable timestamps', 'badimagelist' => 'Bad image list', 'variantname-zh' => "Short names for language variants used for language conversion links. Variants for Chinese language", -- 2.20.1