mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-26 19:11:07 +00:00
Code Issues Projects Releases Wiki Activity

Convert - to _ in language

Browse source 
Mostly to increase language supports
This commit is contained in:
Jeremy Benoist 2017-06-09 11:42:04 +02:00
parent 42f3bb2c63
commit 80e49ba7b0
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Wallabag/CoreBundle/Helper/ContentProxy.php
View file

@ -174,6 +174,10 @@ class ContentProxy
*/ */
private function validateAndSetLanguage($entry, $value) private function validateAndSetLanguage($entry, $value)
{ {
// some lang are defined as fr-FR, es-ES.
// replacing - by _ might increase language support
$value = str_replace('-', '_', $value);
$errors = $this->validator->validate( $errors = $this->validator->validate(
$value, $value,
(new LocaleConstraint()) (new LocaleConstraint())

12
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
View file

@ -1252,9 +1252,9 @@ class EntryControllerTest extends WallabagCoreTestCase
'https://www.pravda.ru/world/09-06-2017/1337283-qatar-0/', 'https://www.pravda.ru/world/09-06-2017/1337283-qatar-0/',
'ru', 'ru',
], ],
'wrong fr-FR' => [ 'fr-FR' => [
'http://www.zataz.com/fff-darknet/axzz4jUg2QJjH', 'http://www.zataz.com/90-des-dossiers-medicaux-des-coreens-du-sud-vendus-a-des-entreprises-privees/',
'', 'fr_FR',
], ],
'de' => [ 'de' => [
'http://www.bild.de/politik/ausland/theresa-may/wahlbeben-grossbritannien-analyse-52108924.bild.html', 'http://www.bild.de/politik/ausland/theresa-may/wahlbeben-grossbritannien-analyse-52108924.bild.html',
@ -1280,10 +1280,14 @@ class EntryControllerTest extends WallabagCoreTestCase
'http://precodoscombustiveis.com.br/postos/cidade/4121/pr/maringa', 'http://precodoscombustiveis.com.br/postos/cidade/4121/pr/maringa',
'pt_BR', 'pt_BR',
], ],
'fucked list of languages' => [ 'fucked_list_of_languages' => [
'http://geocatalog.webservice-energy.org/geonetwork/srv/eng/main.home', 'http://geocatalog.webservice-energy.org/geonetwork/srv/eng/main.home',
'', '',
], ],
'es-ES' => [
'http://www.muylinux.com/2015/04/17/odf-reino-unido-microsoft-google',
'es_ES',
],
]; ];
} }

2
tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php
View file

@ -120,7 +120,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
$this->assertNotEmpty($content->getMimetype(), 'Mimetype for http://www.zataz.com is ok'); $this->assertNotEmpty($content->getMimetype(), 'Mimetype for http://www.zataz.com is ok');
$this->assertNotEmpty($content->getPreviewPicture(), 'Preview picture for http://www.zataz.com is ok'); $this->assertNotEmpty($content->getPreviewPicture(), 'Preview picture for http://www.zataz.com is ok');
$this->assertEmpty($content->getLanguage(), 'Language for http://www.zataz.com is empty because not valid (fr-FR)'); $this->assertNotEmpty($content->getLanguage(), 'Language for http://www.zataz.com is ok');
$tags = $content->getTags(); $tags = $content->getTags();
$this->assertContains('foot', $tags, 'It includes the "foot" tag'); $this->assertContains('foot', $tags, 'It includes the "foot" tag');