eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make init of lang environment happen earlier, or when user language may have changed 

darcs-hash:20080806034515-84dde-e32cbfec2890f50b610d0441659180038b060473.gz
This commit is contained in:
Evan Prodromou 2008-08-05 23:45:15 -04:00
parent 120970434e
commit 4c8dfadf2d
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/profilesettings.php
View File

@ -140,6 +140,9 @@ class ProfilesettingsAction extends SettingsAction {
common_log_db_error($user, 'UPDATE', __FILE__); common_log_db_error($user, 'UPDATE', __FILE__);
common_server_error(_('Couldn\'t update user.')); common_server_error(_('Couldn\'t update user.'));
return; return;
} else {
# Re-initialize language environment if it changed
common_init_language();
} }
} }

2
actions/register.php
View File

@ -98,6 +98,8 @@ class RegisterAction extends Action {
common_debug('Adding rememberme cookie for ' . $nickname); common_debug('Adding rememberme cookie for ' . $nickname);
common_rememberme($user); common_rememberme($user);
} }
# Re-init language env in case it changed (not yet, but soon)
common_init_language();
$this->show_success(); $this->show_success();
} else { } else {
$this->show_form(_('Invalid username or password.')); $this->show_form(_('Invalid username or password.'));

8
index.php
View File

@ -22,6 +22,14 @@ define('LACONICA', true);
require_once(INSTALLDIR . "/lib/common.php"); require_once(INSTALLDIR . "/lib/common.php");
# get and cache current user
$user = common_current_user();
# initialize language env
common_init_language();
$action = $_REQUEST['action']; $action = $_REQUEST['action'];
if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) { if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {

14
lib/util.php
View File

@ -131,11 +131,7 @@ function common_end_xml() {
$xw->flush(); $xw->flush();
} }
define('PAGE_TYPE_PREFS', 'text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2'); function common_init_language() {
function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=NULL) {
global $config, $xw;
$language = common_language(); $language = common_language();
# So we don't have to make people install the gettext locales # So we don't have to make people install the gettext locales
putenv('LANGUAGE='.$language); putenv('LANGUAGE='.$language);
@ -148,7 +144,13 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
bindtextdomain("laconica", $config['site']['locale_path']); bindtextdomain("laconica", $config['site']['locale_path']);
bind_textdomain_codeset("laconica", "UTF-8"); bind_textdomain_codeset("laconica", "UTF-8");
textdomain("laconica"); textdomain("laconica");
}
define('PAGE_TYPE_PREFS', 'text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2');
function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=NULL) {
global $config, $xw;
$httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : NULL; $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