From e9d4a552901778981707aea23e6c1652c26118ea Mon Sep 17 00:00:00 2001 From: Zigterman Date: Wed, 12 Feb 2014 10:11:47 +0100 Subject: [PATCH 1/6] Fixed dutch date formats --- lang/nl.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lang/nl.yml b/lang/nl.yml index 93ff8b4..a851083 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -1,12 +1,12 @@ nl: Calendar: - OneDay: '%{sDayNumShort}. %{sMonShort}. %{sYearFull}' - SameMonthSameYear: '%{sDayNumShort}. - %{eDayNumShort}. %{sMonShort}. %{eYearFull}' - DiffMonthSameYear: '%{sDayNumShort}. %{sMonShort}. - %{eDayNumShort}. %{eMonShort}. %{eYearFull}' - DiffMonthDiffYear: '%{sDayNumShort}. %{sMonShort}. %{sYearFull} - %{eDayNumShort}. %{eMonShort}. %{eYearFull}' - OneDayHeader: '%{sDayNumShort}. %{sMonFull} %{sYearFull}' - MonthHeader: '%{sMonFull} %{sYearFull}' - YearHeader: '%{sYearFull}' + OneDay: '$StartDayNumberShort $StartMonthNameShort. $StartYearLong' + SameMonthSameYear: '$StartDayNumberShort - $EndDayNumberShort $EndMonthNameShort. $EndYearLong' + DiffMonthSameYear: '$StartDayNumberShort $StartMonthNameShort. - %EndDayNumberShort $EndMonthNameShort. $EndYearLong' + DiffMonthDiffYear: '$StartDayNumberShort $StartMonthNameShort. $StartYearLong - $EndDatNumberNameShort $EndMonthNameShort. $EndYearLong' + OneDayHeader: '$StartDayNumberLong $StartMonthLong $StartYearLong' + MonthHeader: '$StartMonthNameLong $StartYearLong' + YearHeader: '$StartYearLong' NUMBEROFEVENTS: 'Aantal events' DEFAULTDATEHEADER: 'Standaard hoofding.' NUMBERFUTUREDATES: 'Aantal toekomstige datums' From 66c1dc5135850f18b29d1cc934bb0da9cb687177 Mon Sep 17 00:00:00 2001 From: Zigterman Date: Wed, 12 Feb 2014 10:18:12 +0100 Subject: [PATCH 2/6] Dutch translations added --- code/Calendar.php | 4 ++-- code/ICSFeed.php | 6 ++++++ lang/nl.yml | 45 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/code/Calendar.php b/code/Calendar.php index 880fb75..925be7e 100755 --- a/code/Calendar.php +++ b/code/Calendar.php @@ -94,7 +94,7 @@ public function getCMSFields() { $announcements = _t('Calendar.Announcements','Announcements'); $f->addFieldToTab("Root.$announcements", $announcementsField = GridField::create( "Announcements", - "Announcements", + $announcements, $this->Announcements(), GridFieldConfig_RecordEditor::create() )); @@ -104,7 +104,7 @@ public function getCMSFields() { $feeds = _t('Calendar.FEEDS','Feeds'); $f->addFieldToTab("Root.$feeds", $feedsField = GridField::create( "Feeds", - "Feeds", + $feeds, $this->Feeds(), GridFieldConfig_RecordEditor::create() )); diff --git a/code/ICSFeed.php b/code/ICSFeed.php index 93497b2..65df315 100755 --- a/code/ICSFeed.php +++ b/code/ICSFeed.php @@ -21,4 +21,10 @@ public function getCMSFields() { return $f; } + + public function summaryFields() { + return array ( + 'Title' => _t('ICSFeed.TITLE','Title'), + ); + } } diff --git a/lang/nl.yml b/lang/nl.yml index a851083..dac4085 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -1,9 +1,12 @@ nl: Calendar: + PLURALNAME: Kalenders + SINGULARNAME: Kalender + DESCRIPTION: Agenda met verzameling kalender items en aankondigingen OneDay: '$StartDayNumberShort $StartMonthNameShort. $StartYearLong' SameMonthSameYear: '$StartDayNumberShort - $EndDayNumberShort $EndMonthNameShort. $EndYearLong' DiffMonthSameYear: '$StartDayNumberShort $StartMonthNameShort. - %EndDayNumberShort $EndMonthNameShort. $EndYearLong' - DiffMonthDiffYear: '$StartDayNumberShort $StartMonthNameShort. $StartYearLong - $EndDatNumberNameShort $EndMonthNameShort. $EndYearLong' + DiffMonthDiffYear: '$StartDayNumberShort $StartMonthNameShort. $StartYearLong - $EndDayNumberShort $EndMonthNameShort. $EndYearLong' OneDayHeader: '$StartDayNumberLong $StartMonthLong $StartYearLong' MonthHeader: '$StartMonthNameLong $StartYearLong' YearHeader: '$StartYearLong' @@ -12,9 +15,49 @@ nl: NUMBERFUTUREDATES: 'Aantal toekomstige datums' UPCOMINGEVENTSFOR: 'Toekomstige evenst voor %s' FILTER: Filteren + Announcements: Aankondigingen + CONFIGURATION: Instellingen + STARTDATE: Startdatum + ENDDATE: Einddatum + STARTTIME: Starttijd + ENDTIME: Eindtijd + ALLDAY: Heledag + ANNOUNCEMENTDESCRIPTION: Aankodingingen zijn simpele items die je aan de kalender kan toevoegen zonder een detail pagina. Bijvoorbeeld 'Kantoor gesloten' + DEFAULTVIEW: Standaard overzicht + UPCOMINGVIEW: Toon een lijst van aankomende evenementen + MONTHVIEW: Toon alle evenementen van deze maand. + WEEKVIEW: Toon alle evenementen van deze week. Indien geen, val terug op maand. + TODAYVIEW: Toon alle evenementen van deze week. Indien geen, val terug op week. + WEEKENDVIEW: Toon alle evenementen voor dit weekend. + DEFAULTFUTUREMONTHS: Maximum aantal toekomstige maanden in het standaard overzicht + EVENTSPERPAGE: Evenementen per pagina + DEFAULTDATEHEADER: Standaard datum titel, als er geen is ingevuld + NUMBERFUTUREDATES: Aantal toekomstige data voor herhalende evenementen + FEEDS: ICS Feeds + ICSFEEDDESCRIPTION: Voeg een ICS feeds toe aan je kalender voor het importeren van een externe kalender, bijvoorbeeld Google Calendar + RSSTITLE: Titel van RSS Feed + CalendarAnnouncement: + PLURALNAME: Aankondigingen + SINGULARNAME: Aankondiging + TITLE: Naam + CONTENT: Omschrijving + ICSFeed: + PLURALNAME: ICS Feeds + SINGULARNAME: ICS Feed + TITLE: Titel + TITLEOFFEED: Titel van Feed + URLLINK: URL CalendarDateTime: INVALIDFORMAT: 'Foutief datumformaat. Gebruik "dmy" of "mdy".' + STARTDATE: Startdatum + ENDDATE: Einddatum + STARTTIME: Starttijd + ENDTIME: Eindtijd + ALLDAY: Hele dag CalendarEvent: + PLURALNAME: Kalender items + SINGULARNAME: Kalender item + DESCRIPTION: Individueel kalender item REPEATEVENT: 'Herhaal dit event' DESCRIBEINTERVAL: 'Bepaal interval van dit event:' EVERY: 'Elke ' From 07e7006b745e28ec9e21c1329a8066c1e0234e73 Mon Sep 17 00:00:00 2001 From: Zigterman Date: Wed, 12 Feb 2014 10:29:34 +0100 Subject: [PATCH 3/6] Add summaryFields toe CalendarAnnouncement --- code/CalendarAnnouncement.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/CalendarAnnouncement.php b/code/CalendarAnnouncement.php index 5661c49..f2421aa 100755 --- a/code/CalendarAnnouncement.php +++ b/code/CalendarAnnouncement.php @@ -21,6 +21,17 @@ public function getCMSFields() { return $f; } + public function summaryFields() { + return array ( + 'Title' => _t('CalendarAnnouncement.TITLE','Title of announcement'), + 'FormattedStartDate' => _t('Calendar.STARTDATE','Start date'), + 'FormattedEndDate' => _t('Calendar.ENDDATE','End date'), + 'FormattedStartTime' => _t('Calendar.STARTTIME','Start time'), + 'FormattedEndTime' => _t('Calendar.ENDTIME','End time'), + 'FormattedAllDay' => _t('Calendar.ALLDAY','All day'), + ); + } + public function getTitle() { return $this->getField('Title'); } From ffc7f45c06865bee2d5c6ef741e4736022a2b690 Mon Sep 17 00:00:00 2001 From: Zigterman Date: Wed, 12 Feb 2014 10:30:00 +0100 Subject: [PATCH 4/6] Add Announcement Calendar Widget --- code/widget/AnnouncementCalendarWidget.php | 60 +++++++++++++++++++ lang/en.yml | 12 +++- lang/nl.yml | 9 +++ .../widget/AnnouncementCalendarWidget.ss | 14 +++++ 4 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 code/widget/AnnouncementCalendarWidget.php create mode 100644 templates/widget/AnnouncementCalendarWidget.ss diff --git a/code/widget/AnnouncementCalendarWidget.php b/code/widget/AnnouncementCalendarWidget.php new file mode 100644 index 0000000..2453cec --- /dev/null +++ b/code/widget/AnnouncementCalendarWidget.php @@ -0,0 +1,60 @@ + 'Calendar' + ); + + private static $db = array( + 'Title' => 'Varchar(255)', + 'AnnouncementCount' => 'Int' + ); + + private static $defaults = array( + 'AnnouncementCount' => 5, + 'Title' => 'Aankondigingen' + ); + + + public function Title() + { + return $this->Title; + } + + public function CMSTitle() + { + return _t('AnnouncementCalendarWidget.CMSTITLE', 'Calendar Announcement Widget'); + } + + public function Description() + { + return _t('AnnouncementCalendarWidget.DESCRIPTION', 'Show a calendar widget with links to announcements.'); + } + + public function getCMSFields() + { + return new FieldList( + new TextField('Title', _t('AnnouncementCalendarWidget.FIELD_TITLE', 'Title (optional)')), + new DropdownField('CalendarID', _t('AnnouncementCalendarWidget.FIELD_CALENDAR', 'Calendar'), Calendar::get()->sort('DefaultDateHeader')->map('ID', 'Title')), + new NumericField('AnnouncementCount', _t('AnnouncementCalendarWidget.FIELD_ANNOUNCEMENTCOUNT', 'Number off announcements')) + ); + } + + public function getCurrentDate() + { + return self::get_current_date()->format('Y-m-d'); + } + + public function Events() + { + return $this->Calendar()->UpcomingEvents($this->AnnouncementCount, null); + } +} + +class AnnouncementCalendarWidget_Controller extends Widget_Controller +{ + public function Events() + { + return $this->Events(); + } +} \ No newline at end of file diff --git a/lang/en.yml b/lang/en.yml index fca6626..c6b6886 100755 --- a/lang/en.yml +++ b/lang/en.yml @@ -10,4 +10,14 @@ en: CalendarDateTime: DATEFORMAT: mdy TIMEFORMAT: 12 - FIRSTDAYOFWEEK: Sunday \ No newline at end of file + FIRSTDAYOFWEEK: Sunday + AnnouncementCalendarWidget: + CMSTITLE: 'Calendar Announcement Widget' + DESCRIPTION: 'Show a calendar widget with links to announcements.' + FIELD_TITLE: 'Title' + FIELD_CALENDAR: 'Calendar' + FIELD_ANNOUNCEMENTCOUNT: 'Number off announcements' + PLURALNAME: 'Event Calendar Widgets' + SINGULARNAME: 'Kalender-Widget' + TITLE: 'Event Calendar Widgets' + \ No newline at end of file diff --git a/lang/nl.yml b/lang/nl.yml index dac4085..937576c 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -91,3 +91,12 @@ nl: ADD: 'Aan mijn kalender toevoegen' CalendarWidget: LOCALEFILE: date_nl.js + AnnouncementCalendarWidget: + CMSTITLE: 'Kalender aankondigingen Widget' + DESCRIPTION: 'Geeft de eerst volgende aankondigingen van de kalender weer.' + FIELD_TITLE: 'Titel' + FIELD_CALENDAR: 'Kalender' + FIELD_ANNOUNCEMENTCOUNT: 'Maximum aantal items' + PLURALNAME: 'Kalender-Widgets' + SINGULARNAME: 'Kalender-Widget' + TITLE: 'Kalender' \ No newline at end of file diff --git a/templates/widget/AnnouncementCalendarWidget.ss b/templates/widget/AnnouncementCalendarWidget.ss new file mode 100644 index 0000000..c313306 --- /dev/null +++ b/templates/widget/AnnouncementCalendarWidget.ss @@ -0,0 +1,14 @@ +
+ <% loop $Events %> + + <% end_loop %> +
+ meer... +
+
From 4ce3bd9557a695c71c169a04d426911ae14015cc Mon Sep 17 00:00:00 2001 From: Zigterman Date: Fri, 3 Oct 2014 15:22:55 +0200 Subject: [PATCH 5/6] Moved to widget component --- code/widget/AnnouncementCalendarWidget.php | 60 ------------------- .../widget/AnnouncementCalendarWidget.ss | 14 ----- 2 files changed, 74 deletions(-) delete mode 100644 code/widget/AnnouncementCalendarWidget.php delete mode 100644 templates/widget/AnnouncementCalendarWidget.ss diff --git a/code/widget/AnnouncementCalendarWidget.php b/code/widget/AnnouncementCalendarWidget.php deleted file mode 100644 index 2453cec..0000000 --- a/code/widget/AnnouncementCalendarWidget.php +++ /dev/null @@ -1,60 +0,0 @@ - 'Calendar' - ); - - private static $db = array( - 'Title' => 'Varchar(255)', - 'AnnouncementCount' => 'Int' - ); - - private static $defaults = array( - 'AnnouncementCount' => 5, - 'Title' => 'Aankondigingen' - ); - - - public function Title() - { - return $this->Title; - } - - public function CMSTitle() - { - return _t('AnnouncementCalendarWidget.CMSTITLE', 'Calendar Announcement Widget'); - } - - public function Description() - { - return _t('AnnouncementCalendarWidget.DESCRIPTION', 'Show a calendar widget with links to announcements.'); - } - - public function getCMSFields() - { - return new FieldList( - new TextField('Title', _t('AnnouncementCalendarWidget.FIELD_TITLE', 'Title (optional)')), - new DropdownField('CalendarID', _t('AnnouncementCalendarWidget.FIELD_CALENDAR', 'Calendar'), Calendar::get()->sort('DefaultDateHeader')->map('ID', 'Title')), - new NumericField('AnnouncementCount', _t('AnnouncementCalendarWidget.FIELD_ANNOUNCEMENTCOUNT', 'Number off announcements')) - ); - } - - public function getCurrentDate() - { - return self::get_current_date()->format('Y-m-d'); - } - - public function Events() - { - return $this->Calendar()->UpcomingEvents($this->AnnouncementCount, null); - } -} - -class AnnouncementCalendarWidget_Controller extends Widget_Controller -{ - public function Events() - { - return $this->Events(); - } -} \ No newline at end of file diff --git a/templates/widget/AnnouncementCalendarWidget.ss b/templates/widget/AnnouncementCalendarWidget.ss deleted file mode 100644 index c313306..0000000 --- a/templates/widget/AnnouncementCalendarWidget.ss +++ /dev/null @@ -1,14 +0,0 @@ -
- <% loop $Events %> - - <% end_loop %> -
- meer... -
-
From 3fa15eac3e2972d6fd857a61b3a31cbc433d32e4 Mon Sep 17 00:00:00 2001 From: Zigterman Date: Fri, 3 Oct 2014 16:00:54 +0200 Subject: [PATCH 6/6] Added to widget component --- lang/en.yml | 9 --------- lang/nl.yml | 11 +---------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/lang/en.yml b/lang/en.yml index c6b6886..9cded91 100755 --- a/lang/en.yml +++ b/lang/en.yml @@ -11,13 +11,4 @@ en: DATEFORMAT: mdy TIMEFORMAT: 12 FIRSTDAYOFWEEK: Sunday - AnnouncementCalendarWidget: - CMSTITLE: 'Calendar Announcement Widget' - DESCRIPTION: 'Show a calendar widget with links to announcements.' - FIELD_TITLE: 'Title' - FIELD_CALENDAR: 'Calendar' - FIELD_ANNOUNCEMENTCOUNT: 'Number off announcements' - PLURALNAME: 'Event Calendar Widgets' - SINGULARNAME: 'Kalender-Widget' - TITLE: 'Event Calendar Widgets' \ No newline at end of file diff --git a/lang/nl.yml b/lang/nl.yml index 937576c..c16b5f1 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -90,13 +90,4 @@ nl: ADDITIONALDATES: 'Extra datums' ADD: 'Aan mijn kalender toevoegen' CalendarWidget: - LOCALEFILE: date_nl.js - AnnouncementCalendarWidget: - CMSTITLE: 'Kalender aankondigingen Widget' - DESCRIPTION: 'Geeft de eerst volgende aankondigingen van de kalender weer.' - FIELD_TITLE: 'Titel' - FIELD_CALENDAR: 'Kalender' - FIELD_ANNOUNCEMENTCOUNT: 'Maximum aantal items' - PLURALNAME: 'Kalender-Widgets' - SINGULARNAME: 'Kalender-Widget' - TITLE: 'Kalender' \ No newline at end of file + LOCALEFILE: date_nl.js \ No newline at end of file