diff --git a/VERSIONS_HOTLINE/126604 b/VERSIONS_HOTLINE/126604 new file mode 100644 index 0000000000000000000000000000000000000000..c2e999d00aa3983c5c9aa0edb4e9b666d5d20350 --- /dev/null +++ b/VERSIONS_HOTLINE/126604 @@ -0,0 +1 @@ + - ticket #126604 : Import OpenAgenda : les évènements multi-lingues sont importés en français si disponible. \ No newline at end of file diff --git a/library/Class/ExternalAgenda/OpenAgenda.php b/library/Class/ExternalAgenda/OpenAgenda.php index 584a601ad714a8885a68851495f115084b11a684..0f9425be425d3125ba9face3b66875c12eeba5c8 100644 --- a/library/Class/ExternalAgenda/OpenAgenda.php +++ b/library/Class/ExternalAgenda/OpenAgenda.php @@ -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]); } diff --git a/tests/scenarios/ExternalAgendas/open-agenda-1.json b/tests/scenarios/ExternalAgendas/open-agenda-1.json index e1d0fe0468f95aa312093e6a40a01d50ef128afd..9ebc3f1b40b0210a39f788457473fdf18d6518a0 100644 --- a/tests/scenarios/ExternalAgendas/open-agenda-1.json +++ b/tests/scenarios/ExternalAgendas/open-agenda-1.json @@ -12,6 +12,7 @@ "fr": "Une erreur PNB" }, "description": { + "en": "sometime it just doesn't work", "fr": "parfois, les choses ne fonctionnent pas" }, "longDescription": {