[Fmsystem-commits] [12988] Syncromind: Merge 12986:12987 from trunk

[Sigurd Nes]

Revision: 12988
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12988
Author:   sigurdne
Date:     2015-04-10 11:43:03 +0000 (Fri, 10 Apr 2015)
Log Message:
-----------
Syncromind: Merge 12986:12987 from trunk

Modified Paths:
--------------
    branches/dev-syncromind/booking/inc/class.bobooking.inc.php
    branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
    branches/dev-syncromind/bookingfrontend/setup/phpgw_no.lang

Property Changed:
----------------
    branches/dev-syncromind/
    branches/dev-syncromind/booking/
    branches/dev-syncromind/bookingfrontend/


Property changes on: branches/dev-syncromind
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/stavangerkommune:12743-12875
/trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974
   + /branches/stavangerkommune:12743-12875,12986
/trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987


Property changes on: branches/dev-syncromind/booking
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/stavangerkommune/booking:9468-12740,12743-12875
/trunk/booking:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974
   + /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987

Modified: branches/dev-syncromind/booking/inc/class.bobooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.bobooking.inc.php 2015-04-10 
11:39:26 UTC (rev 12987)
+++ branches/dev-syncromind/booking/inc/class.bobooking.inc.php 2015-04-10 
11:43:03 UTC (rev 12988)
@@ -168,7 +168,7 @@
             $external_site_address = 
isset($config->config_data['external_site_address']) && 
$config->config_data['external_site_address'] ? 
$config->config_data['external_site_address'] : 
$GLOBALS['phpgw_info']['server']['webserver_url'];
 
             $subject = $system_message['title'];
-            $body = '<b>Beksjed fra '.$system_message['name'].'</b><br 
/>'.$system_message['message'].'<br /><br /><b>Epost som er sendt til brukere 
av Hallen:</b><br />';
+            $body = '<b>Beskjed fra '.$system_message['name'].'</b><br 
/>'.$system_message['message'].'<br /><br /><b>Epost som er sendt til brukere 
av Hallen:</b><br />';
             $mailadresses = $config->config_data['emails'];
             $mailadresses = explode("\n",$mailadresses);
 


Property changes on: branches/dev-syncromind/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/stavangerkommune/bookingfrontend:9468-12740,12743-12875
/trunk/bookingfrontend:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974
   + /branches/stavangerkommune/bookingfrontend:9468-12740,12743-12875,12986
/trunk/bookingfrontend:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987

Modified: branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php 
2015-04-10 11:39:26 UTC (rev 12987)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php 
2015-04-10 11:43:03 UTC (rev 12988)
@@ -827,7 +827,7 @@
                                                foreach ($booking['resources'] 
as $res) {
                                                        $res_names = 
$res_names.$this->bo->so->get_resource($res)." ";
                                                }
-                                               $info_deleted = lang($inf_del." 
deleted on")." ".$system_message['building_name'].":<br />".$res_names." - 
".pretty_timestamp($booking['from_'])." - ".pretty_timestamp($booking['to_']);
+                                               $info_deleted = lang("Deleted 
on")." ".$system_message['building_name'].":<br />".$res_names." - 
".pretty_timestamp($booking['from_'])." - ".pretty_timestamp($booking['to_']);
                         $this->bo->send_admin_notification($booking, 
$maildata, $system_message, $allocation);
                         $this->bo->send_notification($booking, $allocation, 
$maildata, $mailadresses);
                                    $system_message['message'] = 
$system_message['message']."<br />".$info_deleted;

Modified: branches/dev-syncromind/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/dev-syncromind/bookingfrontend/setup/phpgw_no.lang 2015-04-10 
11:39:26 UTC (rev 12987)
+++ branches/dev-syncromind/bookingfrontend/setup/phpgw_no.lang 2015-04-10 
11:43:03 UTC (rev 12988)
@@ -378,3 +378,5 @@
 You can't cancel event that has started, for help contacts site admin  
bookingfrontend no      Du kan ikke slette arrangement som er over.
 You can't extend the event, for that contact administrator     bookingfrontend 
no      Du kan ikke øke lengden på arrangementet, for det må du kontakte 
administrator
 You can't change resources to the event, for that contact administrator        
bookingfrontend no      Du kan ikke forandre på ressurser, for det må du 
kontakte administrator
+Cancelation of booking from    bookingfrontend no      Avbestilling fra
+Deleted on     bookingfrontend no      Avbestilling i