From 0c789dce3af9ffdcb732dd8de0d36f7cba7632b7 Mon Sep 17 00:00:00 2001
From: Thomas <thomas@brotherli.ch>
Date: Tue, 19 Jul 2011 17:51:15 +0200
Subject: [PATCH] Use more common name for email; validate

---
 plugins/calendar/lib/calendar_ui.php    | 2 +-
 plugins/calendar/localization/en_US.inc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index c0a661b6..26c51d2b 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -279,7 +279,7 @@ class calendar_ui
         $this->calendar->gettext(array('name' => $label, 'vars' => array('min' => $n % 60, 'hrs' => intval($n / 60))))));
     }
     
-    return html::tag('ul', $attrib, join("\n", $items));
+    return html::tag('ul', $attrib, join("\n", $items), html::$common_attrib);
   }
 
   /**
diff --git a/plugins/calendar/localization/en_US.inc b/plugins/calendar/localization/en_US.inc
index 7126921f..bcbbd14a 100644
--- a/plugins/calendar/localization/en_US.inc
+++ b/plugins/calendar/localization/en_US.inc
@@ -57,10 +57,10 @@ $labels['selectdate'] = 'Select date';
 $labels['printdescriptions'] = 'Print descriptions';
 
 // alarm/reminder settings
-$labels['alarmemail'] = 'Send E-mail';
+$labels['alarmemail'] = 'Send Email';
 $labels['alarmdisplay'] = 'Show message';
 $labels['alarmdisplayoption'] = 'Message';
-$labels['alarmemailoption'] = 'E-mail';
+$labels['alarmemailoption'] = 'Email';
 $labels['alarmat'] = 'at $datetime';
 $labels['trigger@'] = 'on date';
 $labels['trigger-M'] = 'minutes before';