Index: .
===================================================================
--- .	(revision 311763)
+++ .	(working copy)

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /msub/nyu.edu/2.8.1/sakai/trunk/lessons-10-community:r311763-311764
Index: tool/src/webapp/js/lang-datepicker/lang-datepicker.js
===================================================================
--- tool/src/webapp/js/lang-datepicker/lang-datepicker.js	(revision 311763)
+++ tool/src/webapp/js/lang-datepicker/lang-datepicker.js	(working copy)
@@ -2298,8 +2298,14 @@
 		 * Init the app by making a request for a language file.
 		 * Failing the locale, we look for the base language
 		 */
-         var userLocale = (window.top.sakai.locale.userLocale) ? window.top.sakai.locale.userLocale.replace("_", "-") : 'en-US';
-         var userLang = (window.top.sakai.locale.userLanguage) ? window.top.sakai.locale.userLanguage : 'en';
+		 var userLocale = 'en-US';
+		 var userLang = 'en';
+		 try {
+         	userLocale = (window.top.sakai.locale.userLocale) ? window.top.sakai.locale.userLocale.replace("_", "-") : userLocale;
+         	userLang = (window.top.sakai.locale.userLanguage) ? window.top.sakai.locale.userLanguage : userLang;
+         } catch (err) {
+         	//console.log('Your portal doesnt supply the necessary header JS');
+         }
 
          // First try the full locale (fr-CA) then try just the language (fr)
          if (typeof $.datepicker.regional[userLocale] !== "undefined") {