move the language info, fix dir for locales
darcs-hash:20080730035446-84dde-8ce202ea6956bb49e1be98307136fc299862ab9b.gz
This commit is contained in:
parent
ba3ca4f6bb
commit
353aa5a0d8
|
@ -48,7 +48,7 @@ $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' =>
|
||||||
|
|
|
@ -136,12 +136,13 @@ 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;
|
||||||
|
|
||||||
$httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : NULL;
|
|
||||||
$language = common_language();
|
$language = common_language();
|
||||||
setlocale(LC_ALL, $language);
|
setlocale(LC_ALL, $language);
|
||||||
bindtextdomain("laconica", $config['site']['locale_path']);
|
bindtextdomain("laconica", $config['site']['locale_path']);
|
||||||
textdomain("laconica");
|
textdomain("laconica");
|
||||||
|
|
||||||
|
$httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : NULL;
|
||||||
|
|
||||||
# XXX: allow content negotiation for RDF, RSS, or XRDS
|
# XXX: allow content negotiation for RDF, RSS, or XRDS
|
||||||
|
|
||||||
$type = common_negotiate_type(common_accept_to_prefs($httpaccept),
|
$type = common_negotiate_type(common_accept_to_prefs($httpaccept),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user