move the language info, fix dir for locales

darcs-hash:20080730035446-84dde-8ce202ea6956bb49e1be98307136fc299862ab9b.gz
This commit is contained in:
Evan Prodromou 2008-07-29 23:54:46 -04:00
parent ba3ca4f6bb
commit 353aa5a0d8
2 changed files with 8 additions and 7 deletions

View File

@ -48,9 +48,9 @@ $config =
'path' => '/', 'path' => '/',
'logfile' => NULL, 'logfile' => NULL,
'fancy' => false, 'fancy' => false,
'locale_path' => './locale', 'locale_path' => INSTALLDIR.'/locale',
'language' => 'en_US', 'language' => 'en_US',
'languages' => get_all_languages(), 'languages' => get_all_languages(),
'email' => 'email' =>
array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : NULL, array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : NULL,
'broughtby' => NULL, 'broughtby' => NULL,

View File

@ -136,11 +136,12 @@ define('PAGE_TYPE_PREFS', 'text/html,application/xhtml+xml,application/xml;q=0.3
function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=NULL) { function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=NULL) {
global $config, $xw; global $config, $xw;
$language = common_language();
setlocale(LC_ALL, $language);
bindtextdomain("laconica", $config['site']['locale_path']);
textdomain("laconica");
$httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : NULL; $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : NULL;
$language = common_language();
setlocale(LC_ALL, $language);
bindtextdomain("laconica", $config['site']['locale_path']);
textdomain("laconica");
# XXX: allow content negotiation for RDF, RSS, or XRDS # XXX: allow content negotiation for RDF, RSS, or XRDS