Revision: 2640
https://sourceforge.net/p/mrbs/code/2640/
Author: cimorrison
Date: 2013-01-09 15:04:36 +0000 (Wed, 09 Jan 2013)
Log Message:
-----------
Merged in latest changes from trunk
Modified Paths:
--------------
mrbs/branches/linked_bookings/web/config.inc.php
mrbs/branches/linked_bookings/web/js/edit_entry.js.php
mrbs/branches/linked_bookings/web/lang/lang.nl
mrbs/branches/linked_bookings/web/systemdefaults.inc.php
Property Changed:
----------------
mrbs/branches/linked_bookings/
Index: mrbs/branches/linked_bookings
===================================================================
--- mrbs/branches/linked_bookings 2013-01-08 15:34:06 UTC (rev 2639)
+++ mrbs/branches/linked_bookings 2013-01-09 15:04:36 UTC (rev 2640)
Property changes on: mrbs/branches/linked_bookings
___________________________________________________________________
Modified: svn:mergeinfo
## -12,4 +12,4 ##
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
-/mrbs/trunk:2599-2627
+/mrbs/trunk:2599-2639
\ No newline at end of property
Modified: mrbs/branches/linked_bookings/web/config.inc.php
===================================================================
--- mrbs/branches/linked_bookings/web/config.inc.php 2013-01-08 15:34:06 UTC
(rev 2639)
+++ mrbs/branches/linked_bookings/web/config.inc.php 2013-01-09 15:04:36 UTC
(rev 2640)
@@ -37,7 +37,7 @@
******************/
// Which database system: "pgsql"=PostgreSQL, "mysql"=MySQL,
// "mysqli"=MySQL via the mysqli PHP extension
-$dbsys = "mysql";
+$dbsys = "mysqli";
// Hostname of database server. For pgsql, can use "" instead of localhost
// to use Unix Domain Sockets instead of TCP/IP.
$db_host = "localhost";
Modified: mrbs/branches/linked_bookings/web/js/edit_entry.js.php
===================================================================
--- mrbs/branches/linked_bookings/web/js/edit_entry.js.php 2013-01-08
15:34:06 UTC (rev 2639)
+++ mrbs/branches/linked_bookings/web/js/edit_entry.js.php 2013-01-09
15:04:36 UTC (rev 2640)
@@ -682,21 +682,27 @@
duration = durFormat(duration/60);
}
}
-
+ <?php
+ // As durFormat returns a string, duration can now be either
+ // a number or a string, so convert it to a string so that we
+ // know what we are dealing with
+ ?>
+ duration.toString();
+
if (days !== 0)
{
text += days + ' ';
text += (days === 1) ? vocab.days.singular : vocab.days.plural;
- if (duration !== 0)
+ if (duration !== '0')
{
text += ', ';
}
}
- if (duration !== 0)
+ if (duration !== '0')
{
text += duration + ' ';
- text += (duration === 1) ? vocab[durUnits].singular :
vocab[durUnits].plural;
+ text += (duration === '1') ? vocab[durUnits].singular :
vocab[durUnits].plural;
}
return text;
}
Modified: mrbs/branches/linked_bookings/web/lang/lang.nl
===================================================================
--- mrbs/branches/linked_bookings/web/lang/lang.nl 2013-01-08 15:34:06 UTC
(rev 2639)
+++ mrbs/branches/linked_bookings/web/lang/lang.nl 2013-01-09 15:04:36 UTC
(rev 2640)
@@ -60,7 +60,7 @@
$vocab["seconds"] = "seconden";
$vocab["minute_lc"] = "minuut";
$vocab["minutes"] = "minuten";
-$vocab["hour_lc"] = "huur";
+$vocab["hour_lc"] = "uur";
$vocab["hours"] = "uren";
$vocab["day_lc"] = "dag";
$vocab["days"] = "dagen";
@@ -337,7 +337,7 @@
$vocab["treat_private"] = "Behandel alle boekings als privé, negeer
de privacy instellingen";
$vocab["treat_public"] = "Behandel alle boekings als openbaar,
negeer de privacy instellingen";
$vocab["sort_key"] = "Sorteervolgorde";
-$vocab["sort_key_note"] = "Deze volgorde word gebruikt bij het
sorteren van kamers";
+$vocab["sort_key_note"] = "Deze volgorde wordt gebruikt bij het
sorteren van kamers";
$vocab["booking_policies"] = "Boekingsregels";
$vocab["min_book_ahead"] = "Vooruit boeken - minimum";
$vocab["max_book_ahead"] = "Vooruit boeken - maximum";
Modified: mrbs/branches/linked_bookings/web/systemdefaults.inc.php
===================================================================
--- mrbs/branches/linked_bookings/web/systemdefaults.inc.php 2013-01-08
15:34:06 UTC (rev 2639)
+++ mrbs/branches/linked_bookings/web/systemdefaults.inc.php 2013-01-09
15:04:36 UTC (rev 2640)
@@ -58,7 +58,7 @@
******************/
// Which database system: "pgsql"=PostgreSQL, "mysql"=MySQL,
// "mysqli"=MySQL via the mysqli PHP extension
-$dbsys = "mysql";
+$dbsys = "mysqli";
// Hostname of database server. For pgsql, can use "" instead of localhost
// to use Unix Domain Sockets instead of TCP/IP.
$db_host = "localhost";
------------------------------------------------------------------------------
Master Java SE, Java EE, Eclipse, Spring, Hibernate, JavaScript, jQuery
and much more. Keep your Java skills current with LearnJavaNow -
200+ hours of step-by-step video tutorials by Java experts.
SALE $49.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122612
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
