diff options
| author | VirtualTam <virtualtam@flibidi.net> | 2019-02-23 16:27:33 +0100 |
|---|---|---|
| committer | VirtualTam <virtualtam@flibidi.net> | 2019-02-23 16:27:33 +0100 |
| commit | 43c77f658a905e2def6aeca4c092683977cd0c55 (patch) | |
| tree | cb0dc273a315a777847d251f856625b2fc779c04 /tests/languages | |
| parent | 630ebca2b6359e942e5b6c057cca2b6069c1093a (diff) | |
| parent | 1826e383ecf501302974132fd443cf1ca06e10f6 (diff) | |
| download | Shaarli-43c77f658a905e2def6aeca4c092683977cd0c55.tar.gz Shaarli-43c77f658a905e2def6aeca4c092683977cd0c55.tar.zst Shaarli-43c77f658a905e2def6aeca4c092683977cd0c55.zip | |
Merge commit '1826e383ecf501302974132fd443cf1ca06e10f6' into v0.10
Diffstat (limited to 'tests/languages')
| -rw-r--r-- | tests/languages/de/UtilsDeTest.php | 2 | ||||
| -rw-r--r-- | tests/languages/fr/LanguagesFrTest.php | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/languages/de/UtilsDeTest.php b/tests/languages/de/UtilsDeTest.php index 4569c923..588c9fd6 100644 --- a/tests/languages/de/UtilsDeTest.php +++ b/tests/languages/de/UtilsDeTest.php | |||
| @@ -20,7 +20,7 @@ class UtilsDeTest extends UtilsTest | |||
| 20 | public function testDateFormatNoTime() | 20 | public function testDateFormatNoTime() |
| 21 | { | 21 | { |
| 22 | $date = DateTime::createFromFormat('Ymd_His', '20170101_101112'); | 22 | $date = DateTime::createFromFormat('Ymd_His', '20170101_101112'); |
| 23 | $this->assertRegExp('/1\. Januar 2017/', format_date($date, false,true)); | 23 | $this->assertRegExp('/1\. Januar 2017/', format_date($date, false, true)); |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | /** | 26 | /** |
diff --git a/tests/languages/fr/LanguagesFrTest.php b/tests/languages/fr/LanguagesFrTest.php index 0cf74891..38347de1 100644 --- a/tests/languages/fr/LanguagesFrTest.php +++ b/tests/languages/fr/LanguagesFrTest.php | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | namespace Shaarli; | 4 | namespace Shaarli; |
| 5 | 5 | ||
| 6 | |||
| 7 | use Shaarli\Config\ConfigManager; | 6 | use Shaarli\Config\ConfigManager; |
| 8 | 7 | ||
| 9 | /** | 8 | /** |