From 18c9abe630c22f7f2825ec67a2ded1e311502abb Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Tue, 14 Jun 2011 16:37:23 +0000
Subject: [PATCH] task #9747: Can show content of external calendar (ical) into
agenda
---
htdocs/comm/action/index.php | 10 +++++-----
htdocs/langs/ca_ES/agenda.lang | 3 ++-
htdocs/langs/en_US/agenda.lang | 3 ++-
htdocs/langs/es_ES/agenda.lang | 1 +
htdocs/langs/fr_FR/agenda.lang | 3 ++-
5 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 9d5521ec3a5..08e7d071cab 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -558,12 +558,12 @@ if (sizeof($listofextcals))
$event->datep=$datestart+$usertime;
$event->datef=$dateend+$usertime;
$event->type_code="ICALEVENT";
- $event->libelle=$icalevent['SUMMARY'];
- //if showing with dol_trunc is not necessary to add a Description
- //if ($icalevent['DESCRIPTION']) $event->libelle.='<br>'.dol_nl2br($icalevent['DESCRIPTION'],1);
-
- $event->date_start_in_calendar=$event->datep;
+ if($icalevent['SUMMARY']) $event->libelle=$icalevent['SUMMARY'];
+ elseif($icalevent['DESCRIPTION']) $event->libelle=dol_nl2br($icalevent['DESCRIPTION'],1);
+ else $event->libelle = $langs->trans("ExtSiteNoLabel");
+
+ $event->date_start_in_calendar=$event->datep;
if ($event->datef != '' && $event->datef >= $event->datep) $event->date_end_in_calendar=$event->datef;
else $event->date_end_in_calendar=$event->datep;
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index b695aab81ab..52b069bb55f 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -65,4 +65,5 @@ ExtSites=Calendaris externs
ExtSitesEnableThisTool=Mostrar calendaris externs a l'agenda
ExtSitesNbOfAgenda=Nombre de calendaris
AgendaExtNb=Calendari nº %s
-ExtSiteUrlAgenda=Url d'accés a l'arxiu. ical
\ No newline at end of file
+ExtSiteUrlAgenda=Url d'accés a l'arxiu. ical
+ExtSiteNoLabel=Sense descripció
\ No newline at end of file
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index a149b9b78a7..fc7cc376e8d 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -65,4 +65,5 @@ ExtSites=External Calendars
ExtSitesEnableThisTool=how external calendars into agenda
ExtSitesNbOfAgenda=Number of calendars
AgendaExtNb=Calendar nb %s
-ExtSiteUrlAgenda=URL to access .ical file
\ No newline at end of file
+ExtSiteUrlAgenda=URL to access .ical file
+ExtSiteNoLabel=No Description
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index 05fb5f47e05..a2660ca5268 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -65,3 +65,4 @@ ExtSitesEnableThisTool=Mostrar calendarios externos en la agenda
ExtSitesNbOfAgenda=Número de calendarios
AgendaExtNb=Calendario nº %s
ExtSiteUrlAgenda=Url de acceso al archivo .ical
+ExtSiteNoLabel=Sin descripción
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index a880394f724..a3ad1a841f2 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -65,4 +65,5 @@ ExtSites=Calendriers extérieures
ExtSitesEnableThisTool=Afficher les calendriers externes sur l'agenda
ExtSitesNbOfAgenda=Nombre de calendriers
AgendaExtNb=Calendrier no %s
-ExtSiteUrlAgenda=Url d'accès au fichier ical
\ No newline at end of file
+ExtSiteUrlAgenda=Url d'accès au fichier ical
+ExtSiteNoLabel=Aucune description
\ No newline at end of file
--
GitLab