Revision: 2334
http://mrbs.svn.sourceforge.net/mrbs/?rev=2334&view=rev
Author: cimorrison
Date: 2012-07-13 16:19:06 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Fixed bug (introduced during JavaScript restructuring) causing the units on the
time slots on the edit_entry form not to be translated.
Modified Paths:
--------------
mrbs/trunk/web/language.inc
Modified: mrbs/trunk/web/language.inc
===================================================================
--- mrbs/trunk/web/language.inc 2012-07-13 14:08:22 UTC (rev 2333)
+++ mrbs/trunk/web/language.inc 2012-07-13 16:19:06 UTC (rev 2334)
@@ -715,7 +715,16 @@
$lang = strtolower($lang);
- $lang_file = "lang/lang.$lang";
+ if (file_exists('lang'))
+ {
+ $lang_file = "lang/lang.$lang";
+ }
+ else
+ {
+ // The JavaScript files in the js directory wnd up including language.inc.
+ // In this case we need to adjust the path
+ $lang_file = "../lang/lang.$lang";
+ }
// When in CLI mode, we need to add the full path name as
// file_exists() ignores the include path
if ($cli_mode)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
