move the language info, fix dir for locales

darcs-hash:20080730035446-84dde-8ce202ea6956bb49e1be98307136fc299862ab9b.gz

diff --git a/lib/common.php b/lib/common.php
index 03b8bd52a532c33a5e84c161a5ede37514a88875..d8471711c4ac616f6826560dd6d3a586e2c1f504 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -48,9 +48,9 @@ $config =
                          'path' => '/',
                          'logfile' => NULL,
                          'fancy' => false,
-                          'locale_path' => './locale',
-                          'language' => 'en_US',
-                          'languages' => get_all_languages(),
+                         'locale_path' => INSTALLDIR.'/locale',
+                         'language' => 'en_US',
+                         'languages' => get_all_languages(),
                      'email' =>
                      array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : NULL,
                          'broughtby' => NULL,

diff --git a/lib/util.php b/lib/util.php
index 13ce180b4e155d3ac38b2b753c28c8da77ffa345..9033d7d1ac9475ebda5bb02f517744f9d899791c 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -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) {
        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;
-        $language = common_language();
-        setlocale(LC_ALL, $language);
-        bindtextdomain("laconica", $config['site']['locale_path']);
-        textdomain("laconica");
 
        # XXX: allow content negotiation for RDF, RSS, or XRDS