[Fmsystem-commits] [12986] bkbooking: stavanger corrected spelling errors

[Kjell Arne Espedal]

Revision: 12986
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12986
Author:   kjell
Date:     2015-04-10 07:16:50 +0000 (Fri, 10 Apr 2015)
Log Message:
-----------
bkbooking: stavanger corrected spelling errors

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

Modified: branches/stavangerkommune/booking/inc/class.bobooking.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.bobooking.inc.php       
2015-04-09 23:58:50 UTC (rev 12985)
+++ branches/stavangerkommune/booking/inc/class.bobooking.inc.php       
2015-04-10 07:16:50 UTC (rev 12986)
@@ -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);
 

Modified: branches/stavangerkommune/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.uibooking.inc.php       
2015-04-09 23:58:50 UTC (rev 12985)
+++ branches/stavangerkommune/bookingfrontend/inc/class.uibooking.inc.php       
2015-04-10 07:16:50 UTC (rev 12986)
@@ -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/stavangerkommune/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang       
2015-04-09 23:58:50 UTC (rev 12985)
+++ branches/stavangerkommune/bookingfrontend/setup/phpgw_no.lang       
2015-04-10 07:16:50 UTC (rev 12986)
@@ -377,3 +377,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