nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-26 02:44:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't try and initialize gettext unless it's installed.

Browse Source
This commit is contained in:
Andrew McMillan 2012-04-18 16:46:32 +12:00
parent 7c15051f84
commit 3afa91be85
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/always.php
View File

@ -62,7 +62,7 @@ $c->images = $c->base_url . '/images';
$c->template_usr = array( 'active' => true,
'locale' => 'en_GB',
'date_format_type' => 'E',
'email_ok' => @date('Y-m-d')
'email_ok' => date('Y-m-d')
);
$c->hide_TODO = true; // VTODO only visible to collection owner
@ -167,8 +167,10 @@ else if ( isset($c->dbg['script_start']) && $c->dbg['script_start'] ) {
* default site locale. This may be overridden by each user.
*/
putenv("LANG=". $c->default_locale);
awl_set_locale($c->default_locale);
init_gettext( 'davical', $c->locale_path );
if ( function_exists('awl_set_locale') ) {
awl_set_locale($c->default_locale);
init_gettext( 'davical', $c->locale_path );
}
/**
* Work out our version
@ -183,7 +185,7 @@ if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->v
$c->code_patch = $matches[3];
$c->code_version = (($c->code_major * 1000) + $c->code_minor).'.'.$c->code_patch;
dbg_error_log('caldav', 'Version (%d.%d.%d) == %s', $c->code_major, $c->code_minor, $c->code_patch, $c->code_version);
header( sprintf('Server: %d.%d', $c->code_major, $c->code_minor) );
@header( sprintf('Server: %d.%d', $c->code_major, $c->code_minor) );
}
/**

8
inc/always.php.in
View File

@ -167,8 +167,10 @@ else if ( isset($c->dbg['script_start']) && $c->dbg['script_start'] ) {
* default site locale. This may be overridden by each user.
*/
putenv("LANG=". $c->default_locale);
awl_set_locale($c->default_locale);
init_gettext( 'davical', $c->locale_path );
if ( function_exists('awl_set_locale') ) {
awl_set_locale($c->default_locale);
init_gettext( 'davical', $c->locale_path );
}
/**
* Work out our version
@ -183,7 +185,7 @@ if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->v
$c->code_patch = $matches[3];
$c->code_version = (($c->code_major * 1000) + $c->code_minor).'.'.$c->code_patch;
dbg_error_log('caldav', 'Version (%d.%d.%d) == %s', $c->code_major, $c->code_minor, $c->code_patch, $c->code_version);
header( sprintf('Server: %d.%d', $c->code_major, $c->code_minor) );
@header( sprintf('Server: %d.%d', $c->code_major, $c->code_minor) );
}
/**