dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Function for "pretty timestamps" that are human readable and understandable."
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
languages
/
LanguageTest.php
diff --git
a/tests/phpunit/languages/LanguageTest.php
b/tests/phpunit/languages/LanguageTest.php
index
5ca6a1f
..
30c0ce8
100644
(file)
--- a/
tests/phpunit/languages/LanguageTest.php
+++ b/
tests/phpunit/languages/LanguageTest.php
@@
-7,10
+7,10
@@
class LanguageTest extends MediaWikiTestCase {
*/
private $lang;
*/
private $lang;
- function setUp() {
+
protected
function setUp() {
$this->lang = Language::factory( 'en' );
}
$this->lang = Language::factory( 'en' );
}
- function tearDown() {
+
protected
function tearDown() {
unset( $this->lang );
}
unset( $this->lang );
}
@@
-36,7
+36,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
9.45,
array(),
array(
9.45,
array(),
- '9.5s',
+ '9.5
s',
'formatTimePeriod() rounding (<10s)'
),
array(
'formatTimePeriod() rounding (<10s)'
),
array(
@@
-48,7
+48,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
9.95,
array(),
array(
9.95,
array(),
- '10s',
+ '10
s',
'formatTimePeriod() rounding (<10s)'
),
array(
'formatTimePeriod() rounding (<10s)'
),
array(
@@
-60,7
+60,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
59.55,
array(),
array(
59.55,
array(),
- '1
m 0
s',
+ '1
min 0
s',
'formatTimePeriod() rounding (<60s)'
),
array(
'formatTimePeriod() rounding (<60s)'
),
array(
@@
-72,7
+72,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
119.55,
array(),
array(
119.55,
array(),
- '2
m 0
s',
+ '2
min 0
s',
'formatTimePeriod() rounding (<1h)'
),
array(
'formatTimePeriod() rounding (<1h)'
),
array(
@@
-84,7
+84,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
3599.55,
array(),
array(
3599.55,
array(),
- '1
h 0m 0
s',
+ '1
h 0 min 0
s',
'formatTimePeriod() rounding (<1h)'
),
array(
'formatTimePeriod() rounding (<1h)'
),
array(
@@
-96,7
+96,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
7199.55,
array(),
array(
7199.55,
array(),
- '2
h 0m 0
s',
+ '2
h 0 min 0
s',
'formatTimePeriod() rounding (>=1h)'
),
array(
'formatTimePeriod() rounding (>=1h)'
),
array(
@@
-108,7
+108,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
7199.55,
'avoidseconds',
array(
7199.55,
'avoidseconds',
- '2
h 0m
',
+ '2
h 0 min
',
'formatTimePeriod() rounding (>=1h), avoidseconds'
),
array(
'formatTimePeriod() rounding (>=1h), avoidseconds'
),
array(
@@
-120,7
+120,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
7199.55,
'avoidminutes',
array(
7199.55,
'avoidminutes',
- '2
h 0m
',
+ '2
h 0 min
',
'formatTimePeriod() rounding (>=1h), avoidminutes'
),
array(
'formatTimePeriod() rounding (>=1h), avoidminutes'
),
array(
@@
-132,7
+132,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
172799.55,
'avoidseconds',
array(
172799.55,
'avoidseconds',
- '48
h 0m
',
+ '48
h 0 min
',
'formatTimePeriod() rounding (=48h), avoidseconds'
),
array(
'formatTimePeriod() rounding (=48h), avoidseconds'
),
array(
@@
-144,7
+144,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
259199.55,
'avoidminutes',
array(
259199.55,
'avoidminutes',
- '3
d 0
h',
+ '3
d 0
h',
'formatTimePeriod() rounding (>48h), avoidminutes'
),
array(
'formatTimePeriod() rounding (>48h), avoidminutes'
),
array(
@@
-156,7
+156,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
176399.55,
'avoidseconds',
array(
176399.55,
'avoidseconds',
- '2
d 1h 0m
',
+ '2
d 1 h 0 min
',
'formatTimePeriod() rounding (>48h), avoidseconds'
),
array(
'formatTimePeriod() rounding (>48h), avoidseconds'
),
array(
@@
-168,7
+168,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
176399.55,
'avoidminutes',
array(
176399.55,
'avoidminutes',
- '2
d 1
h',
+ '2
d 1
h',
'formatTimePeriod() rounding (>48h), avoidminutes'
),
array(
'formatTimePeriod() rounding (>48h), avoidminutes'
),
array(
@@
-180,7
+180,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
259199.55,
'avoidseconds',
array(
259199.55,
'avoidseconds',
- '3
d 0h 0m
',
+ '3
d 0 h 0 min
',
'formatTimePeriod() rounding (>48h), avoidseconds'
),
array(
'formatTimePeriod() rounding (>48h), avoidseconds'
),
array(
@@
-192,7
+192,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
172801.55,
'avoidseconds',
array(
172801.55,
'avoidseconds',
- '2
d 0h 0m
',
+ '2
d 0 h 0 min
',
'formatTimePeriod() rounding, (>48h), avoidseconds'
),
array(
'formatTimePeriod() rounding, (>48h), avoidseconds'
),
array(
@@
-204,7
+204,7
@@
class LanguageTest extends MediaWikiTestCase {
array(
176460.55,
array(),
array(
176460.55,
array(),
- '2
d 1h 1m 1
s',
+ '2
d 1 h 1 min 1
s',
'formatTimePeriod() rounding, recursion, (>48h)'
),
array(
'formatTimePeriod() rounding, recursion, (>48h)'
),
array(