Revision: 1774
http://mrbs.svn.sourceforge.net/mrbs/?rev=1774&view=rev
Author: jberanek
Date: 2011-01-28 22:02:32 +0000 (Fri, 28 Jan 2011)
Log Message:
-----------
* Possibly corrected the new locale selection logic from r1773.
Modified Paths:
--------------
mrbs/trunk/web/language.inc
Modified: mrbs/trunk/web/language.inc
===================================================================
--- mrbs/trunk/web/language.inc 2011-01-28 21:54:16 UTC (rev 1773)
+++ mrbs/trunk/web/language.inc 2011-01-28 22:02:32 UTC (rev 1774)
@@ -399,11 +399,15 @@
// Set the locale even if MRBS hasn't got a translation, at least
// we'll get time formats right
- $locale = $lang;
+ if (!isset($locale))
+ {
+ $locale = $lang;
+ }
if (file_exists($lang_file))
{
include $lang_file;
+ $locale = $lang;
$doneit = 1;
break;
}
@@ -421,6 +425,7 @@
if (file_exists($lang_file))
{
include $lang_file;
+ // If we have found a translation, update the locale to match
$locale = $lang;
break;
}
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
