From 669f999dcd1002c941066c83f89d856bcf057f2b Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Sun, 15 Jul 2007 15:21:36 +0000
Subject: Fixed a typo ("cal_mayl") in English calendar language file

---
 system/language/english/calendar_lang.php | 97 ++++++++++++++++---------------
 user_guide/changelog.html                 |  3 +-
 2 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/system/language/english/calendar_lang.php b/system/language/english/calendar_lang.php
index 02475e1f3..f044606b8 100644
--- a/system/language/english/calendar_lang.php
+++ b/system/language/english/calendar_lang.php
@@ -1,49 +1,50 @@
-<?php
-
-$lang['cal_su']			= "Su";
-$lang['cal_mo'] 		= "Mo";
-$lang['cal_tu'] 		= "Tu";
-$lang['cal_we'] 		= "We";
-$lang['cal_th'] 		= "Th";
-$lang['cal_fr'] 		= "Fr";
-$lang['cal_sa'] 		= "Sa";
-$lang['cal_sun'] 		= "Sun";
-$lang['cal_mon'] 		= "Mon";
-$lang['cal_tue'] 		= "Tue";
-$lang['cal_wed'] 		= "Wed";
-$lang['cal_thu'] 		= "Thu";
-$lang['cal_fri'] 		= "Fri";
-$lang['cal_sat'] 		= "Sat";
-$lang['cal_sunday']		= "Sunday";
-$lang['cal_monday']		= "Monday";
-$lang['cal_tuesday']	= "Tuesday";
-$lang['cal_wednesday']	= "Wednesday";
-$lang['cal_thursday']	= "Thursday";
-$lang['cal_friday']		= "Friday";
-$lang['cal_saturday']	= "Saturday";
-$lang['cal_jan'] 		= "Jan";
-$lang['cal_feb'] 		= "Feb";
-$lang['cal_mar'] 		= "Mar";
-$lang['cal_apr'] 		= "Apr";
-$lang['cal_may'] 		= "May";
-$lang['cal_jun'] 		= "Jun";
-$lang['cal_jul'] 		= "Jul";
-$lang['cal_aug'] 		= "Aug";
-$lang['cal_sep'] 		= "Sep";
-$lang['cal_oct'] 		= "Oct";
-$lang['cal_nov'] 		= "Nov";
-$lang['cal_dec'] 		= "Dec";
-$lang['cal_january'] 	= "January";
-$lang['cal_february'] 	= "February";
-$lang['cal_march'] 		= "March";
-$lang['cal_april']		= "April";
-$lang['cal_mayl'] 		= "May";
-$lang['cal_june'] 		= "June";
-$lang['cal_july'] 		= "July";
-$lang['cal_august']		= "August";
-$lang['cal_september']	= "September";
-$lang['cal_october'] 	= "October";
-$lang['cal_november']	= "November";
-$lang['cal_december'] 	= "December";
-
+<?php
+
+$lang['cal_su']			= "Su";
+$lang['cal_mo'] 		= "Mo";
+$lang['cal_tu'] 		= "Tu";
+$lang['cal_we'] 		= "We";
+$lang['cal_th'] 		= "Th";
+$lang['cal_fr'] 		= "Fr";
+$lang['cal_sa'] 		= "Sa";
+$lang['cal_sun'] 		= "Sun";
+$lang['cal_mon'] 		= "Mon";
+$lang['cal_tue'] 		= "Tue";
+$lang['cal_wed'] 		= "Wed";
+$lang['cal_thu'] 		= "Thu";
+$lang['cal_fri'] 		= "Fri";
+$lang['cal_sat'] 		= "Sat";
+$lang['cal_sunday']		= "Sunday";
+$lang['cal_monday']		= "Monday";
+$lang['cal_tuesday']	= "Tuesday";
+$lang['cal_wednesday']	= "Wednesday";
+$lang['cal_thursday']	= "Thursday";
+$lang['cal_friday']		= "Friday";
+$lang['cal_saturday']	= "Saturday";
+$lang['cal_jan'] 		= "Jan";
+$lang['cal_feb'] 		= "Feb";
+$lang['cal_mar'] 		= "Mar";
+$lang['cal_apr'] 		= "Apr";
+$lang['cal_may'] 		= "May";
+$lang['cal_jun'] 		= "Jun";
+$lang['cal_jul'] 		= "Jul";
+$lang['cal_aug'] 		= "Aug";
+$lang['cal_sep'] 		= "Sep";
+$lang['cal_oct'] 		= "Oct";
+$lang['cal_nov'] 		= "Nov";
+$lang['cal_dec'] 		= "Dec";
+$lang['cal_january'] 	= "January";
+$lang['cal_february'] 	= "February";
+$lang['cal_march'] 		= "March";
+$lang['cal_april']		= "April";
+$lang['cal_mayl'] 		= "May"; // typo, left in for backwards compatibility
+$lang['cal_may'] 		= "May"; // fix typo
+$lang['cal_june'] 		= "June";
+$lang['cal_july'] 		= "July";
+$lang['cal_august']		= "August";
+$lang['cal_september']	= "September";
+$lang['cal_october'] 	= "October";
+$lang['cal_november']	= "November";
+$lang['cal_december'] 	= "December";
+
 ?>
\ No newline at end of file
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 6f21a27bb..915ce2623 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -66,7 +66,8 @@ Change Log
 <p>Release Date: -- still in development </p>
 <ul>
     <li>Fixed a bug in database driver where num_rows property wasn't getting updated </li>
-    <li>Fixed a bug in captcha calling an invalid PHP function </li>
+    <li>Fixed a bug in captcha calling an invalid PHP function</li>
+    <li>Fixed a typo (&quot;cal_mayl&quot;) in English calendar language file </li>
 </ul>
 <h2>Version 1.5.4</h2>
 <p>Release Date: July 12, 2007 </p>
-- 
cgit v1.2.3-24-g4f1b