Skip to content
Snippets Groups Projects
Commit b50ff48c authored by Henri-Damien LAURENT's avatar Henri-Damien LAURENT
Browse files

Merge branch 'hotline#126604_evenements_open_agenda_en_allemand' into 'hotline'

hotline#126604 : fix import Events from OpenAgenda, take french when available

See merge request !3825
parents c7555db9 72660fee
Branches
Tags
2 merge requests!3840Hotline,!3825hotline#126604 : fix import Events from OpenAgenda, take french when available
Pipeline #12245 canceled with stage
in 39 minutes and 13 seconds
- ticket #126604 : Import OpenAgenda : les évènements multi-lingues sont importés en français si disponible.
\ No newline at end of file
......@@ -203,9 +203,11 @@ class Class_ExternalAgenda_OpenAgenda_Event {
if (is_string($this->_event[$name]))
return $this->_event[$name];
return is_array($this->_event[$name])
? reset($this->_event[$name])
: '';
if (is_array($this->_event[$name])
&& array_key_exists('fr', $this->_event[$name]))
return $this->_event[$name]['fr'];
return reset($this->_event[$name]);
}
......
......@@ -12,6 +12,7 @@
"fr": "Une erreur PNB"
},
"description": {
"en": "sometime it just doesn't work",
"fr": "parfois, les choses ne fonctionnent pas"
},
"longDescription": {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment