nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-21 01:54:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct setup of locale.

Browse Source
This commit is contained in:
Andrew McMillan 2010-03-05 11:00:55 +13:00
parent dd8b44e379
commit dc72ddf3a8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/always.php
View File

@ -81,7 +81,6 @@ $c->protocol_server_port = sprintf( '%s://%s%s',
) ); ) );
$c->protocol_server_port_script = $c->protocol_server_port . ($_SERVER['SCRIPT_NAME'] == '/index.php' ? '' : $_SERVER['SCRIPT_NAME']); $c->protocol_server_port_script = $c->protocol_server_port . ($_SERVER['SCRIPT_NAME'] == '/index.php' ? '' : $_SERVER['SCRIPT_NAME']);
init_gettext( 'davical', '../locale' );
/** /**
* We use @file_exists because things like open_basedir might noisily deny * We use @file_exists because things like open_basedir might noisily deny
@ -124,7 +123,9 @@ if ( count($c->dbg) > 0 ) {
* Now that we have loaded the configuration file we can switch to a * Now that we have loaded the configuration file we can switch to a
* default site locale. This may be overridden by each user. * default site locale. This may be overridden by each user.
*/ */
putenv("LANG=". $c->default_locale);
awl_set_locale($c->default_locale); awl_set_locale($c->default_locale);
init_gettext( 'davical', '../locale' );
/** /**
* Work out our version * Work out our version

3
inc/always.php.in
View File

@ -81,7 +81,6 @@ $c->protocol_server_port = sprintf( '%s://%s%s',
) ); ) );
$c->protocol_server_port_script = $c->protocol_server_port . ($_SERVER['SCRIPT_NAME'] == '/index.php' ? '' : $_SERVER['SCRIPT_NAME']); $c->protocol_server_port_script = $c->protocol_server_port . ($_SERVER['SCRIPT_NAME'] == '/index.php' ? '' : $_SERVER['SCRIPT_NAME']);
init_gettext( 'davical', '../locale' );
/** /**
* We use @file_exists because things like open_basedir might noisily deny * We use @file_exists because things like open_basedir might noisily deny
@ -124,7 +123,9 @@ if ( count($c->dbg) > 0 ) {
* Now that we have loaded the configuration file we can switch to a * Now that we have loaded the configuration file we can switch to a
* default site locale. This may be overridden by each user. * default site locale. This may be overridden by each user.
*/ */
putenv("LANG=". $c->default_locale);
awl_set_locale($c->default_locale); awl_set_locale($c->default_locale);
init_gettext( 'davical', '../locale' );
/** /**
* Work out our version * Work out our version