Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MINOR Don't break on empty YAML files

  • Loading branch information...
commit ef5e6394d6d19bfb906647e79a66bfc5d0d6ccb4 1 parent a452b6a
@chillu chillu authored
View
4 thirdparty/zend_translate_railsyaml/library/Translate/Adapter/RailsYAML.php
@@ -50,7 +50,7 @@ protected function _loadTranslationData($data, $locale, array $options = array()
}
$content = sfYaml::load(file_get_contents($this->_filename));
- if($locale != 'auto' && !array_key_exists($locale, $content)) {
+ if($locale != 'auto' && $content && !array_key_exists($locale, $content)) {
require_once 'Zend/Translate/Exception.php';
throw new Zend_Translate_Exception(sprintf('Locale "%s" not found in file %s', $locale, $this->_filename));
}
@@ -58,7 +58,7 @@ protected function _loadTranslationData($data, $locale, array $options = array()
// Rails YML files supported arbitrarily nested keys, Zend_Translate doesn't - so we flatten them.
// See http://stackoverflow.com/questions/7011451/transaprently-flatten-an-array/7011675
$flattened = array();
- if($content[$locale]) {
+ if($content && $content[$locale]) {
$iterator = new Translate_Adapter_RailsYaml_Iterator(new RecursiveArrayIterator($content[$locale]));
foreach($iterator as $k => $v) {
$flattened[implode($options['keyDelimiter'], $iterator->getKeyStack())] = $v;
Please sign in to comment.
Something went wrong with that request. Please try again.