jenkins-bot has submitted this change and it was merged.
Change subject: Update messages.inc and rebuild MessagesEn.php.
......................................................................
Update messages.inc and rebuild MessagesEn.php.
Change-Id: I5af753e9db10abc5e991a546649a7280a9fed8a2
---
M languages/messages/MessagesEn.php
M maintenance/language/messages.inc
2 files changed, 29 insertions(+), 30 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 36a9aa5..8191f59 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3918,20 +3918,19 @@
'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 a9ad753..96a6c13 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -136,20 +136,6 @@
'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 @@
'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 @@
'underline' => '',
'editfont' => 'Font style option in Special:Preferences',
'dates' => 'Dates',
- 'human-timestamps' => 'Human timestamps',
'categorypages' => 'Categories related messages',
'mainpage' => '',
'miscellaneous1' => '',
@@ -4013,8 +4012,9 @@
'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",
--
To view, visit https://gerrit.wikimedia.org/r/60398
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5af753e9db10abc5e991a546649a7280a9fed8a2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex <[email protected]>
Gerrit-Reviewer: Raimond Spekking <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
