diff options
author | VirtualTam <virtualtam+github@flibidi.net> | 2017-09-19 19:22:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-19 19:22:33 +0200 |
commit | 0cba184cf80423d990aba09a2a0a1f2b9c5882b7 (patch) | |
tree | da0ea3e3401ffb3f89684fb6465ce0c13e11fb51 /tests/languages/fr/UtilsFrTest.php | |
parent | 6aae4bd0a15575eb11b4774cfdcdad1c2a994fe0 (diff) | |
parent | b5c33d702ac973e7bc1401e484c6b8799eea1e91 (diff) | |
download | Shaarli-0cba184cf80423d990aba09a2a0a1f2b9c5882b7.tar.gz Shaarli-0cba184cf80423d990aba09a2a0a1f2b9c5882b7.tar.zst Shaarli-0cba184cf80423d990aba09a2a0a1f2b9c5882b7.zip |
Merge pull request #972 from virtualtam/travis/trusty
Travis: switch to Ubuntu Trusty build environment
Diffstat (limited to 'tests/languages/fr/UtilsFrTest.php')
-rw-r--r-- | tests/languages/fr/UtilsFrTest.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/languages/fr/UtilsFrTest.php b/tests/languages/fr/UtilsFrTest.php index 0d50a878..3dbb126f 100644 --- a/tests/languages/fr/UtilsFrTest.php +++ b/tests/languages/fr/UtilsFrTest.php | |||
@@ -81,12 +81,12 @@ class UtilsFrTest extends UtilsTest | |||
81 | } | 81 | } |
82 | 82 | ||
83 | /** | 83 | /** |
84 | * Test autoLocale with multiples value, the second one is valid | 84 | * Test autoLocale with multiples value, the second one is available |
85 | */ | 85 | */ |
86 | public function testAutoLocaleMultipleSecondValid() | 86 | public function testAutoLocaleMultipleSecondAvailable() |
87 | { | 87 | { |
88 | $current = setlocale(LC_ALL, 0); | 88 | $current = setlocale(LC_ALL, 0); |
89 | $header = 'pt_BR,de-de'; | 89 | $header = 'mag_IN,de-de'; |
90 | autoLocale($header); | 90 | autoLocale($header); |
91 | $this->assertEquals('de_DE.utf8', setlocale(LC_ALL, 0)); | 91 | $this->assertEquals('de_DE.utf8', setlocale(LC_ALL, 0)); |
92 | 92 | ||
@@ -106,12 +106,12 @@ class UtilsFrTest extends UtilsTest | |||
106 | } | 106 | } |
107 | 107 | ||
108 | /** | 108 | /** |
109 | * Test autoLocale with an invalid value: defaults to en_US. | 109 | * Test autoLocale with an unavailable value: defaults to en_US. |
110 | */ | 110 | */ |
111 | public function testAutoLocaleInvalid() | 111 | public function testAutoLocaleUnavailable() |
112 | { | 112 | { |
113 | $current = setlocale(LC_ALL, 0); | 113 | $current = setlocale(LC_ALL, 0); |
114 | autoLocale('pt_BR'); | 114 | autoLocale('mag_IN'); |
115 | $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0)); | 115 | $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0)); |
116 | 116 | ||
117 | setlocale(LC_ALL, $current); | 117 | setlocale(LC_ALL, $current); |