Revision: 1500
http://mrbs.svn.sourceforge.net/mrbs/?rev=1500&view=rev
Author: cimorrison
Date: 2010-10-14 17:10:20 +0000 (Thu, 14 Oct 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/provisional_bookings_new_style/web/Themes/default/header.inc
Property Changed:
----------------
mrbs/branches/provisional_bookings_new_style/
mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/provisional_bookings_new_style
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/trunk:1407-1495
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/trunk:1407-1499
Modified:
mrbs/branches/provisional_bookings_new_style/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/Themes/default/header.inc
2010-10-14 17:04:00 UTC (rev 1499)
+++ mrbs/branches/provisional_bookings_new_style/web/Themes/default/header.inc
2010-10-14 17:10:20 UTC (rev 1500)
@@ -79,7 +79,10 @@
// changed and the regional setting stays as it was before. The reverse
order
// of priority is:
// - the MRBS default language
- // - locales taken from the browser in increasing order of browser preference
+ // - locales taken from the browser in increasing order of browser
preference,
+ // taking for each locale
+ // - the language part only (in case the xx-YY localisation does not
exist)
+ // - the full locale
// - then, if automatic language changing is disabled,
// - the MRBS default language setting again
// - the language part of the override_locale
@@ -109,6 +112,13 @@
// Get the locale in the format that datepicker likes: language lower case
// and country upper case (xx-XX)
$datepicker_locale = locale_format($lang, '-');
+ // First we'll try and get the correct language and then we'll try and
+ // overwrite that with the correct country variant
+ if (strlen($datepicker_locale) > 2)
+ {
+ $datepicker_lang = substr($datepicker_locale, 0, 2);
+ echo
"$.datepicker.setDefaults($.datepicker.regional['$datepicker_lang']);\n";
+ }
echo
"$.datepicker.setDefaults($.datepicker.regional['$datepicker_locale']);\n";
}
if ($disable_automatic_language_changing)
Property changes on:
mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/trunk/web/upgrade/5/pgsql.sql:1407-1495
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/trunk/web/upgrade/5/pgsql.sql:1407-1499
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
