Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit06a80fb

Browse files
Jérémy Derusséfabpot
Jérémy Derussé
authored andcommitted
Validate locales sets intos translator
1 parent06fc97e commit06a80fb

File tree

5 files changed

+233
-6
lines changed

5 files changed

+233
-6
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function testTransWithoutCaching()
4545
{
4646
$translator =$this->getTranslator($this->getLoader());
4747
$translator->setLocale('fr');
48-
$translator->setFallbackLocales(array('en','es','pt-PT','pt_BR'));
48+
$translator->setFallbackLocales(array('en','es','pt-PT','pt_BR','fr.UTF-8'));
4949

5050
$this->assertEquals('foo (FR)',$translator->trans('foo'));
5151
$this->assertEquals('bar (EN)',$translator->trans('bar'));
@@ -54,14 +54,15 @@ public function testTransWithoutCaching()
5454
$this->assertEquals('no translation',$translator->trans('no translation'));
5555
$this->assertEquals('foobarfoo (PT-PT)',$translator->trans('foobarfoo'));
5656
$this->assertEquals('other choice 1 (PT-BR)',$translator->transChoice('other choice',1));
57+
$this->assertEquals('foobarbaz (fr.UTF-8)',$translator->trans('foobarbaz'));
5758
}
5859

5960
publicfunctiontestTransWithCaching()
6061
{
6162
// prime the cache
6263
$translator =$this->getTranslator($this->getLoader(),array('cache_dir' =>$this->tmpDir));
6364
$translator->setLocale('fr');
64-
$translator->setFallbackLocales(array('en','es','pt-PT','pt_BR'));
65+
$translator->setFallbackLocales(array('en','es','pt-PT','pt_BR','fr.UTF-8'));
6566

6667
$this->assertEquals('foo (FR)',$translator->trans('foo'));
6768
$this->assertEquals('bar (EN)',$translator->trans('bar'));
@@ -70,12 +71,13 @@ public function testTransWithCaching()
7071
$this->assertEquals('no translation',$translator->trans('no translation'));
7172
$this->assertEquals('foobarfoo (PT-PT)',$translator->trans('foobarfoo'));
7273
$this->assertEquals('other choice 1 (PT-BR)',$translator->transChoice('other choice',1));
74+
$this->assertEquals('foobarbaz (fr.UTF-8)',$translator->trans('foobarbaz'));
7375

7476
// do it another time as the cache is primed now
7577
$loader =$this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
7678
$translator =$this->getTranslator($loader,array('cache_dir' =>$this->tmpDir));
7779
$translator->setLocale('fr');
78-
$translator->setFallbackLocales(array('en','es','pt-PT','pt_BR'));
80+
$translator->setFallbackLocales(array('en','es','pt-PT','pt_BR','fr.UTF-8'));
7981

8082
$this->assertEquals('foo (FR)',$translator->trans('foo'));
8183
$this->assertEquals('bar (EN)',$translator->trans('bar'));
@@ -84,6 +86,7 @@ public function testTransWithCaching()
8486
$this->assertEquals('no translation',$translator->trans('no translation'));
8587
$this->assertEquals('foobarfoo (PT-PT)',$translator->trans('foobarfoo'));
8688
$this->assertEquals('other choice 1 (PT-BR)',$translator->transChoice('other choice',1));
89+
$this->assertEquals('foobarbaz (fr.UTF-8)',$translator->trans('foobarbaz'));
8790
}
8891

8992
publicfunctiontestGetLocale()
@@ -175,6 +178,13 @@ protected function getLoader()
175178
'other choice' =>'{0} other choice 0 (PT-BR)|{1} other choice 1 (PT-BR)|]1,Inf] other choice inf (PT-BR)',
176179
))))
177180
;
181+
$loader
182+
->expects($this->at(5))
183+
->method('load')
184+
->will($this->returnValue($this->getCatalogue('fr.UTF-8',array(
185+
'foobarbaz' =>'foobarbaz (fr.UTF-8)',
186+
))))
187+
;
178188

179189
return$loader;
180190
}
@@ -205,6 +215,7 @@ public function getTranslator($loader, $options = array())
205215
$translator->addResource('loader','foo','es');
206216
$translator->addResource('loader','foo','pt-PT');// European Portuguese
207217
$translator->addResource('loader','foo','pt_BR');// Brazilian Portuguese
218+
$translator->addResource('loader','foo','fr.UTF-8');
208219

209220
return$translator;
210221
}

‎src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,10 @@ protected function loadCatalogue($locale)
9797

9898
$fallbackContent ='';
9999
$current ='';
100+
$replacementPattern ='/[^a-z0-9_]/i';
100101
foreach ($this->computeFallbackLocales($locale)as$fallback) {
101-
$fallbackSuffix =ucfirst(str_replace('-','_',$fallback));
102+
$fallbackSuffix =ucfirst(preg_replace($replacementPattern,'_',$fallback));
103+
$currentSuffix =ucfirst(preg_replace($replacementPattern,'_',$current));
102104

103105
$fallbackContent .=sprintf(<<<EOF
104106
\$catalogue%s = new MessageCatalogue('%s', %s);
@@ -110,7 +112,7 @@ protected function loadCatalogue($locale)
110112
$fallbackSuffix,
111113
$fallback,
112114
var_export($this->catalogues[$fallback]->all(),true),
113-
ucfirst(str_replace('-','_',$current)),
115+
$currentSuffix,
114116
$fallbackSuffix
115117
);
116118
$current =$fallback;

‎src/Symfony/Component/Translation/Tests/TranslatorTest.php‎

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,33 @@
1717

1818
class TranslatorTestextends \PHPUnit_Framework_TestCase
1919
{
20+
21+
/**
22+
* @dataProvider getInvalidLocalesTests
23+
* @expectedException \InvalidArgumentException
24+
*/
25+
publicfunctiontestConstructorInvalidLocale($locale)
26+
{
27+
$translator =newTranslator($locale,newMessageSelector());
28+
}
29+
30+
/**
31+
* @dataProvider getValidLocalesTests
32+
*/
33+
publicfunctiontestConstructorValidLocale($locale)
34+
{
35+
$translator =newTranslator($locale,newMessageSelector());
36+
37+
$this->assertEquals($locale,$translator->getLocale());
38+
}
39+
40+
publicfunctiontestConstructorWithoutLocale()
41+
{
42+
$translator =newTranslator(null,newMessageSelector());
43+
44+
$this->assertNull($translator->getLocale());
45+
}
46+
2047
publicfunctiontestSetGetLocale()
2148
{
2249
$translator =newTranslator('en',newMessageSelector());
@@ -27,6 +54,27 @@ public function testSetGetLocale()
2754
$this->assertEquals('fr',$translator->getLocale());
2855
}
2956

57+
/**
58+
* @dataProvider getInvalidLocalesTests
59+
* @expectedException \InvalidArgumentException
60+
*/
61+
publicfunctiontestSetInvalidLocale($locale)
62+
{
63+
$translator =newTranslator('fr',newMessageSelector());
64+
$translator->setLocale($locale);
65+
}
66+
67+
/**
68+
* @dataProvider getValidLocalesTests
69+
*/
70+
publicfunctiontestSetValidLocale($locale)
71+
{
72+
$translator =newTranslator($locale,newMessageSelector());
73+
$translator->setLocale($locale);
74+
75+
$this->assertEquals($locale,$translator->getLocale());
76+
}
77+
3078
publicfunctiontestSetFallbackLocales()
3179
{
3280
$translator =newTranslator('en',newMessageSelector());
@@ -55,6 +103,27 @@ public function testSetFallbackLocalesMultiple()
55103
$this->assertEquals('bar (fr)',$translator->trans('bar'));
56104
}
57105

106+
107+
/**
108+
* @dataProvider getInvalidLocalesTests
109+
* @expectedException \InvalidArgumentException
110+
*/
111+
publicfunctiontestSetFallbackInvalidLocales($locale)
112+
{
113+
$translator =newTranslator('fr',newMessageSelector());
114+
$translator->setFallbackLocales(array('fr',$locale));
115+
}
116+
117+
/**
118+
* @dataProvider getValidLocalesTests
119+
*/
120+
publicfunctiontestSetFallbackValidLocales($locale)
121+
{
122+
$translator =newTranslator($locale,newMessageSelector());
123+
$translator->setFallbackLocales(array('fr',$locale));
124+
// no assertion. this method just asserts that no exception is thrown
125+
}
126+
58127
publicfunctiontestTransWithFallbackLocale()
59128
{
60129
$translator =newTranslator('fr_FR',newMessageSelector());
@@ -67,6 +136,26 @@ public function testTransWithFallbackLocale()
67136
$this->assertEquals('foobar',$translator->trans('bar'));
68137
}
69138

139+
/**
140+
* @dataProvider getInvalidLocalesTests
141+
* @expectedException \InvalidArgumentException
142+
*/
143+
publicfunctiontestAddResourceInvalidLocales($locale)
144+
{
145+
$translator =newTranslator('fr',newMessageSelector());
146+
$translator->addResource('array',array('foo' =>'foofoo'),$locale);
147+
}
148+
149+
/**
150+
* @dataProvider getValidLocalesTests
151+
*/
152+
publicfunctiontestAddResourceValidLocales($locale)
153+
{
154+
$translator =newTranslator('fr',newMessageSelector());
155+
$translator->addResource('array',array('foo' =>'foofoo'),$locale);
156+
// no assertion. this method just asserts that no exception is thrown
157+
}
158+
70159
publicfunctiontestAddResourceAfterTrans()
71160
{
72161
$translator =newTranslator('fr',newMessageSelector());
@@ -164,6 +253,32 @@ public function testTrans($expected, $id, $translation, $parameters, $locale, $d
164253
$this->assertEquals($expected,$translator->trans($id,$parameters,$domain,$locale));
165254
}
166255

256+
/**
257+
* @dataProvider getInvalidLocalesTests
258+
* @expectedException \InvalidArgumentException
259+
*/
260+
publicfunctiontestTransInvalidLocale($locale)
261+
{
262+
$translator =newTranslator('en',newMessageSelector());
263+
$translator->addLoader('array',newArrayLoader());
264+
$translator->addResource('array',array('foo' =>'foofoo'),'en');
265+
266+
$translator->trans('foo',array(),'',$locale);
267+
}
268+
269+
/**
270+
* @dataProvider getValidLocalesTests
271+
*/
272+
publicfunctiontestTransValidLocale($locale)
273+
{
274+
$translator =newTranslator('en',newMessageSelector());
275+
$translator->addLoader('array',newArrayLoader());
276+
$translator->addResource('array',array('foo' =>'foofoo'),'en');
277+
278+
$translator->trans('foo',array(),'',$locale);
279+
// no assertion. this method just asserts that no exception is thrown
280+
}
281+
167282
/**
168283
* @dataProvider getFlattenedTransTests
169284
*/
@@ -188,6 +303,33 @@ public function testTransChoice($expected, $id, $translation, $number, $paramete
188303
$this->assertEquals($expected,$translator->transChoice($id,$number,$parameters,$domain,$locale));
189304
}
190305

306+
/**
307+
* @dataProvider getInvalidLocalesTests
308+
* @expectedException \InvalidArgumentException
309+
*/
310+
publicfunctiontestTransChoiceInvalidLocale($locale)
311+
{
312+
$translator =newTranslator('en',newMessageSelector());
313+
$translator->addLoader('array',newArrayLoader());
314+
$translator->addResource('array',array('foo' =>'foofoo'),'en');
315+
316+
$translator->transChoice('foo',1,array(),'',$locale);
317+
}
318+
319+
/**
320+
* @dataProvider getValidLocalesTests
321+
*/
322+
publicfunctiontestTransChoiceValidLocale($locale)
323+
{
324+
$translator =newTranslator('en',newMessageSelector());
325+
$translator->addLoader('array',newArrayLoader());
326+
$translator->addResource('array',array('foo' =>'foofoo'),'en');
327+
328+
$translator->transChoice('foo',1,array(),'',$locale);
329+
// no assertion. this method just asserts that no exception is thrown
330+
}
331+
332+
191333
publicfunctiongetTransFileTests()
192334
{
193335
returnarray(
@@ -257,6 +399,39 @@ public function getTransChoiceTests()
257399
);
258400
}
259401

402+
publicfunctiongetInvalidLocalesTests()
403+
{
404+
returnarray(
405+
array('fr FR'),
406+
array('français'),
407+
array('fr+en'),
408+
array('utf#8'),
409+
array('fr&en'),
410+
array('fr~FR'),
411+
array(' fr'),
412+
array('fr'),
413+
array('fr*'),
414+
array('fr/FR'),
415+
array('fr\\FR'),
416+
);
417+
}
418+
419+
publicfunctiongetValidLocalesTests()
420+
{
421+
returnarray(
422+
array(''),
423+
array(null),
424+
array('fr'),
425+
array('francais'),
426+
array('FR'),
427+
array('frFR'),
428+
array('fr-FR'),
429+
array('fr_FR'),
430+
array('fr.FR'),
431+
array('fr-FR.UTF8'),
432+
);
433+
}
434+
260435
publicfunctiontestTransChoiceFallback()
261436
{
262437
$translator =newTranslator('ru',newMessageSelector());

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp