holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed after r29540 broken install:

Browse Source 
- calling egw_time::getTimezones() not possible during setup time -->
  stalling all installs
- using tz_id=1 for a default is not possible, as that's the first
  regular tz_id on new install --> using '0' now
- added translation for that new calendar setting
This commit is contained in:
Ralf Becker 2010-03-22 14:20:19 +00:00
parent 23202744d7
commit 57adecd8ff
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/inc/class.calendar_hooks.inc.php
View File

@ -235,7 +235,7 @@ class calendar_hooks
'resources' => lang('resources'),
'addressbook' => lang('addressbook')
);
if (!$hook_data['setup']) // does not working on setup time
if (!$hook_data['setup']) // does not work at setup time
{
$groups = $GLOBALS['egw']->accounts->membership($GLOBALS['egw_info']['user']['account_id']);
$options = array('0' => lang('none'));
@ -248,11 +248,11 @@ class calendar_hooks
}
$freebusy_url = calendar_bo::freebusy_url($GLOBALS['egw_info']['user']['account_lid'],$GLOBALS['egw_info']['user']['preferences']['calendar']['freebusy_pw']);
$freebusy_help = lang('Should not loged in persons be able to see your freebusy information? You can set an extra password, different from your normal password, to protect this informations. The freebusy information is in iCal format and only include the times when you are busy. It does not include the event-name, description or locations. The URL to your freebusy information is %1.','<a href="'.$freebusy_url.'" target="_blank">'.$freebusy_url.'</a>');
}
// Timezone for file exports
$export_tzs = array(1 => 'Use Event TZ');
$export_tzs += egw_time::getTimezones();
// Timezone for file exports
$export_tzs = array('0' => 'Use Event TZ');
$export_tzs += egw_time::getTimezones();
}
return array(
'defaultcalendar' => array(
@ -437,7 +437,7 @@ class calendar_hooks
'help' => 'Use this timezone to export calendar data.',
'xmlrpc' => True,
'admin' => False,
'default' => '1', // Use event's TZ
'default' => '0', // Use event's TZ
),
'notifyAdded' => array(
'type' => 'notify',

11
calendar/inc/class.calendar_ical.inc.php
View File

@ -1943,16 +1943,9 @@ class calendar_ical extends calendar_boupdate
break;
case 'file': // used outside of SyncML, eg. by the calendar itself ==> all possible fields
if (isset($this->cal_prefs['export_timezone']))
if ($this->cal_prefs['export_timezone'])
{
switch ($this->cal_prefs['export_timezone'])
{
case 1:
$this->tzid = false; // use event's TZ
break;
default:
$this->tzid = $this->cal_prefs['export_timezone'];
}
$this->tzid = $this->cal_prefs['export_timezone'];
}
else
{

2
calendar/lang/egw_de.lang
View File

@ -358,6 +358,7 @@ timeframe calendar de Zeitrahmen
timeframe to search calendar de Zeitrahmen für die Suche
timezone calendar de Zeitzone
timezone in which recurrences have identical time calendar de Zeitzone in der Wiederholungen zu identischer Uhrzeit stattfinden
timezone of event exports calendar de Zeitzone des exportierten Termins
timezones updated to version %1 (%2 records updated). calendar de Zeitzonen aktualisiert zu Version %1 (%2 Datensätze aktualisiert).
title of the event calendar de Titel des Termin
to many might exceed your execution-time-limit calendar de zu viele können Ihre Laufzeitbeschränkung überschreiten
@ -369,6 +370,7 @@ update timezones calendar de Zeitzonen aktualisieren
updated calendar de Aktualisiert
use end date calendar de Enddatum benutzen
use the selected time and close the popup calendar de benutzt die ausgewählte Zeit und schließt das Popup
use this timezone to export calendar data. calendar de Diese Zeitzone zum exportieren von Kalenderdaten verwenden
user or group calendar de Benutzer oder Gruppe
users + groups: inviting both allways requires an invite grant admin de Benutzer + Gruppen: Einladungen beider brauchen eine Freigabe
view exception calendar de Ausnahme anzeigen

2
calendar/lang/egw_en.lang
View File

@ -359,6 +359,7 @@ timeframe calendar en Timeframe
timeframe to search calendar en Timeframe to search
timezone calendar en Timezone
timezone in which recurrences have identical time calendar en Timezone in which recurrences have identical time
timezone of event exports calendar en Timezone of event exports
timezones updated to version %1 (%2 records updated). calendar en Timezones updated to version %1 (%2 records updated).
title of the event calendar en Title of the event
to many might exceed your execution-time-limit calendar en too many might exceed your execution-time-limit
@ -370,6 +371,7 @@ update timezones calendar en Update timezones
updated calendar en Updated
use end date calendar en Use End date
use the selected time and close the popup calendar en Use the selected time and close the popup
use this timezone to export calendar data. calendar en Use this timezone to export calendar data.
user or group calendar en User or group
users + groups: inviting both allways requires an invite grant admin en Users + groups: inviting both always requires an invite grant
view exception calendar en View exception