|
@@ -30,12 +30,17 @@ class CsvFileLoader extends ArrayLoader implements LoaderInterface
|
|
public function load($resource, $locale, $domain = 'messages')
|
|
public function load($resource, $locale, $domain = 'messages')
|
|
{
|
|
{
|
|
$messages = array();
|
|
$messages = array();
|
|
- $file = @fopen($resource, 'rb');
|
|
|
|
- if (!$file) {
|
|
|
|
|
|
+
|
|
|
|
+ try {
|
|
|
|
+ $file = new \SplFileObject($resource, 'rb');
|
|
|
|
+ } catch(\RuntimeException $e) {
|
|
throw new \InvalidArgumentException(sprintf('Error opening file "%s".', $resource));
|
|
throw new \InvalidArgumentException(sprintf('Error opening file "%s".', $resource));
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ $file->setFlags(\SplFileObject::READ_CSV | \SplFileObject::SKIP_EMPTY);
|
|
|
|
+ $file->setCsvControl(';');
|
|
|
|
|
|
- while (($data = fgetcsv($file, 0, ';')) !== false) {
|
|
|
|
|
|
+ foreach($file as $data) {
|
|
if (substr($data[0], 0, 1) === '#') {
|
|
if (substr($data[0], 0, 1) === '#') {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|