Revision: 1752
http://mrbs.svn.sourceforge.net/mrbs/?rev=1752&view=rev
Author: cimorrison
Date: 2011-01-26 12:37:51 +0000 (Wed, 26 Jan 2011)
Log Message:
-----------
Fixed problem where start and end times do not appear correctly in the select
boxes on the edit_entry form when using 12 hour format and running on a Windows
server.
Modified Paths:
--------------
mrbs/trunk/web/Themes/default/header.inc
mrbs/trunk/web/language.inc
Modified: mrbs/trunk/web/Themes/default/header.inc
===================================================================
--- mrbs/trunk/web/Themes/default/header.inc 2011-01-26 11:30:56 UTC (rev
1751)
+++ mrbs/trunk/web/Themes/default/header.inc 2011-01-26 12:37:51 UTC (rev
1752)
@@ -11,7 +11,7 @@
global $PHP_SELF, $view_week_number, $weekstarts;
global $auth;
global $default_language_tokens, $disable_automatic_language_changing,
$override_locale;
- global $lang_map_windows, $langs;
+ global $lang_map_windows, $langs, $server_os;
$page = basename($PHP_SELF, ".php" );
$user = getUserName();
@@ -137,7 +137,6 @@
echo "$.datepicker.setDefaults($.datepicker.regional['$default_lang']);\n";
if (!empty($override_locale))
{
- $server_os = get_server_os();
if ($server_os == 'windows')
{
// If the server is running on Windows we'll have to try and translate
the
Modified: mrbs/trunk/web/language.inc
===================================================================
--- mrbs/trunk/web/language.inc 2011-01-26 11:30:56 UTC (rev 1751)
+++ mrbs/trunk/web/language.inc 2011-01-26 12:37:51 UTC (rev 1752)
@@ -471,6 +471,8 @@
');
}
+$server_os = get_server_os(); // used globally
+
if ($override_locale != "")
{
if (setlocale(LC_ALL,$override_locale) == FALSE)
@@ -482,8 +484,6 @@
}
else
{
- $server_os = get_server_os();
-
if ($server_os == "windows")
{
if ($lang_map_windows[strtolower($locale)])
@@ -707,6 +707,16 @@
//
function utf8_strftime($format, $time)
{
+ global $server_os;
+
+ if ($server_os == "windows")
+ {
+ // Some formats not supported on Windows. Replace with suitable
alternatives
+ $format = str_replace("%R", "%H:%M", $format);
+ $format = str_replace("%P", "%p", $format);
+ $format = str_replace("%l", "%I", $format);
+ }
+
// %p doesn't actually work in some locales, we have to patch it up ourselves
if (preg_match('/%p/', $format))
{
@@ -718,10 +728,8 @@
$format = preg_replace('/%p/', $ampm, $format);
}
- // %R not supported on Windows
- $format = str_replace("%R", "%H:%M", $format);
- $result = strftime($format,$time);
+ $result = strftime($format, $time);
return utf8_convert_from_locale($result);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
