8000 revert 89fd965 (refs #2339) · symfony/symfony@6aee641 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6aee641

Browse files
fabpotfabpot
committed
revert 89fd965 (refs #2339)
1 parent b876412 commit 6aee641

File tree

4 files changed

+3
-58
lines changed

4 files changed

+3
-58
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<argument type="collection">
3636
<argument key="cache_dir">%kernel.cache_dir%/translations</argument>
3737
<argument key="debug">%kernel.debug%</argument>
38-
<argument key="charset">%kernel.charset%</argument>
3938
</argument>
4039
</service>
4140

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public function __construct(ContainerInterface $container, MessageSelector $sele
4949
$this->options = array(
5050
'cache_dir' => null,
5151
'debug' => false,
52-
'charset' => null,
5352
);
5453

5554
// check option names
@@ -59,10 +58,7 @@ public function __construct(ContainerInterface $container, MessageSelector $sele
5958

6059
$this->options = array_merge($this->options, $options);
6160

62-
if ($this->options['charset'] === 'UTF-8') {
63-
$this->options['charset'] = null;
64-
}
65-
parent::__construct(null, $selector, $this->options['charset']);
61+
parent::__construct(null, $selector);
6662
}
6763

6864
/**

‎src/Symfony/Component/Translation/Translator.php

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,23 @@ class Translator implements TranslatorInterface
2828
private $loaders;
2929
private $resources;
3030
private $selector;
31-
private $charset;
3231

3332
/**
3433
* Constructor.
3534
*
3635
* @param string $locale The locale
3736
* @param MessageSelector $selector The message selector for pluralization
38-
* @param string $charset Application charset
3937
*
4038
* @api
4139
*/
42-
public function __construct($locale, MessageSelector $selector = null, $charset = null)
40+
public function __construct($locale, MessageSelector $selector = null)
4341
{
4442
$this->locale = $locale;
4543
$this->selector = null === $selector ? new MessageSelector() : $selector;
4644
$this->loaders = array();
4745
$this->resources = array();
4846
$this->catalogues = array();
4947
$this->fallbackLocales = array();
50-
$this->charset = $charset;
5148
}
5249

5350
/**
@@ -176,18 +173,7 @@ private function doLoadCatalogue($locale)
176173
if (!isset($this->loaders[$resource[0]])) {
177174
throw new \RuntimeException(sprintf('The "%s" translation loader is not registered.', $resource[0]));
178175
}
179-
$catalogue = $this->loaders[$resource[0]]->load($resource[1], $locale, $resource[2]);
180-
if (null !== $this->charset && extension_loaded('mbstring')) {
181-
foreach ($catalogue->all() as $domain => $messages) {
182-
foreach ($messages as $key => $translation) {
183-
$srcCharset = mb_detect_encoding($translation);
184-
if ($srcCharset !== $this->charset) {
185-
$catalogue->set($key, mb_convert_encoding($translation, $this->charset, $srcCharset), $domain);
186-
}
187-
}
188-
}
189-
}
190-
$this->catalogues[$locale]->addCatalogue($catalogue);
176+
$this->catalogues[$locale]->addCatalogue($this->loaders[$resource[0]]->load($resource[1], $locale, $resource[2]));
191177
}
192178
}
193179
}

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -132,27 +132,6 @@ public function testFlattenedTrans($expected, $messages, $id)
132132
$this->assertEquals($expected, $translator->trans($id, array(), '', 'fr'));
133133
}
134134

135-
/**
136-
* @dataProvider getLoadCatalogueTests
137-
*/
138-
public function testLoadCatalogueConvertsEncoding($translation, $charset)
139-
{
140-
if (!extension_loaded('mbstring')) {
141-
$this->markTestSkipped('This test relies on the mbstring extension');
142-
}
143-
$translator = new Translator('en', new MessageSelector(), $charset);
144-
$translator->addLoader('array', new ArrayLoader());
145-
$translator->addResource('array', array('id' => $translation), 'en', 'messages');
146-
147-
if (null !== $charset && mb_detect_encoding($translation) !== $charset) {
148-
$expected = mb_convert_encoding($translation, $charset, mb_detect_encoding($translation));
149-
} else {
150-
$expected = $translation;
151-
}
152-
153-
$this->assertEquals($expected, $translator->trans('id', array(), 'messages', 'en'));
154-
}
155-
156135
/**
157136
* @dataProvider getTransChoiceTests
158137
*/
@@ -220,21 +199,6 @@ public function getTransChoiceTests()
220199
);
221200
}
222201

223-
public function getLoadCatalogueTests()
224-
{
225-
return array(
226-
array('oia', null),
227-
array('oia', 'UTF-8'),
228-
array('öïä', 'UTF-8'),
229-
array('oia', 'ISO-8859-1'),
230-
array('öïä', 'ISO-8859-1'),
231-
array('цфЭ', 'UTF-8'),
232-
array('цфЭ', 'KOI8-R'),
233-
array('ﾖﾗﾘ', 'UTF-8'),
234-
array('ﾖﾗﾘ', 'SJIS'),
235-
);
236-
}
237-
238202
public function testTransChoiceFallback()
239203
{
240204
$translator = new Translator('ru', new MessageSelector());

0 commit comments

Comments
 (0)
0