Backport compatible messages changes.1.20.0rc2

Also have to update tests...

Change-Id: I70b30592d536d21a32b63a3853de711dd3efb021

2 files changed, 20 insertions, 20 deletions

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 5ae18b2e0b9e..baf4367527d7 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2458,7 +2458,7 @@ Maybe you want to edit the description on its [$2 file description page] there.'
 'shared-repo'                       => 'a shared repository',
 'shared-repo-name-wikimediacommons' => 'Wikimedia Commons', # only translate this message to other languages if you have to change it
 'filepage.css'                      => '/* CSS placed here is included on the file description page, also included on foreign client wikis */', # only translate this message to other languages if you have to change it
-'upload-disallowed-here'            => 'Unfortunately you cannot overwrite this image.',
+'upload-disallowed-here'            => 'You cannot overwrite this file.',
 
 # File reversion
 'filerevert'                => 'Revert $1',
@@ -3848,10 +3848,10 @@ By executing it, your system may be compromised.",
 
 # Video information, used by Language::formatTimePeriod() to format lengths in the above messages
 'video-dims'     => '$1, $2 × $3', # only translate this message to other languages if you have to change it
-'seconds-abbrev' => '$1s', # only translate this message to other languages if you have to change it
-'minutes-abbrev' => '$1m', # only translate this message to other languages if you have to change it
-'hours-abbrev'   => '$1h', # only translate this message to other languages if you have to change it
-'days-abbrev'    => '$1d', # only translate this message to other languages if you have to change it
+'seconds-abbrev' => '$1 s', # only translate this message to other languages if you have to change it
+'minutes-abbrev' => '$1 min', # only translate this message to other languages if you have to change it
+'hours-abbrev'   => '$1 h', # only translate this message to other languages if you have to change it
+'days-abbrev'    => '$1 d', # only translate this message to other languages if you have to change it
 'seconds'        => '{{PLURAL:$1|$1 second|$1 seconds}}',
 'minutes'        => '{{PLURAL:$1|$1 minute|$1 minutes}}',
 'hours'          => '{{PLURAL:$1|$1 hour|$1 hours}}',
diff --git a/tests/phpunit/languages/LanguageTest.php b/tests/phpunit/languages/LanguageTest.php
index 70254490d603..95d8fde4dc23 100644
--- a/tests/phpunit/languages/LanguageTest.php
+++ b/tests/phpunit/languages/LanguageTest.php
@@ -36,7 +36,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				9.45,
 				array(),
-				'9.5s',
+				'9.5 s',
 				'formatTimePeriod() rounding (<10s)'
 			),
 			array(
@@ -48,7 +48,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				9.95,
 				array(),
-				'10s',
+				'10 s',
 				'formatTimePeriod() rounding (<10s)'
 			),
 			array(
@@ -60,7 +60,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				59.55,
 				array(),
-				'1m 0s',
+				'1 min 0 s',
 				'formatTimePeriod() rounding (<60s)'
 			),
 			array(
@@ -72,7 +72,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				119.55,
 				array(),
-				'2m 0s',
+				'2 min 0 s',
 				'formatTimePeriod() rounding (<1h)'
 			),
 			array(
@@ -84,7 +84,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				3599.55,
 				array(),
-				'1h 0m 0s',
+				'1 h 0 min 0 s',
 				'formatTimePeriod() rounding (<1h)'
 			),
 			array(
@@ -96,7 +96,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				7199.55,
 				array(),
-				'2h 0m 0s',
+				'2 h 0 min 0 s',
 				'formatTimePeriod() rounding (>=1h)'
 			),
 			array(
@@ -108,7 +108,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				7199.55,
 				'avoidseconds',
-				'2h 0m',
+				'2 h 0 min',
 				'formatTimePeriod() rounding (>=1h), avoidseconds'
 			),
 			array(
@@ -120,7 +120,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				7199.55,
 				'avoidminutes',
-				'2h 0m',
+				'2 h 0 min',
 				'formatTimePeriod() rounding (>=1h), avoidminutes'
 			),
 			array(
@@ -132,7 +132,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				172799.55,
 				'avoidseconds',
-				'48h 0m',
+				'48 h 0 min',
 				'formatTimePeriod() rounding (=48h), avoidseconds'
 			),
 			array(
@@ -144,7 +144,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				259199.55,
 				'avoidminutes',
-				'3d 0h',
+				'3 d 0 h',
 				'formatTimePeriod() rounding (>48h), avoidminutes'
 			),
 			array(
@@ -156,7 +156,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				176399.55,
 				'avoidseconds',
-				'2d 1h 0m',
+				'2 d 1 h 0 min',
 				'formatTimePeriod() rounding (>48h), avoidseconds'
 			),
 			array(
@@ -168,7 +168,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				176399.55,
 				'avoidminutes',
-				'2d 1h',
+				'2 d 1 h',
 				'formatTimePeriod() rounding (>48h), avoidminutes'
 			),
 			array(
@@ -180,7 +180,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				259199.55,
 				'avoidseconds',
-				'3d 0h 0m',
+				'3 d 0 h 0 min',
 				'formatTimePeriod() rounding (>48h), avoidseconds'
 			),
 			array(
@@ -192,7 +192,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				172801.55,
 				'avoidseconds',
-				'2d 0h 0m',
+				'2 d 0 h 0 min',
 				'formatTimePeriod() rounding, (>48h), avoidseconds'
 			),
 			array(
@@ -204,7 +204,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				176460.55,
 				array(),
-				'2d 1h 1m 1s',
+				'2 d 1 h 1 min 1 s',
 				'formatTimePeriod() rounding, recursion, (>48h)'
 			),
 			array(