forked from extern/egroupware
This should now be compatible for NON-Latin charsets.
This commit is contained in:
parent
8a4bb9cea1
commit
dff440505a
@ -53,10 +53,12 @@
|
|||||||
if (! $deny_login && ! $phpgw_info['server']['show_domain_selectbox'])
|
if (! $deny_login && ! $phpgw_info['server']['show_domain_selectbox'])
|
||||||
{
|
{
|
||||||
$tmpl->set_file(array('login_form' => 'login.tpl'));
|
$tmpl->set_file(array('login_form' => 'login.tpl'));
|
||||||
|
$tmpl->set_var('charset',lang('charset'));
|
||||||
}
|
}
|
||||||
else if ($phpgw_info['server']['show_domain_selectbox'])
|
else if ($phpgw_info['server']['show_domain_selectbox'])
|
||||||
{
|
{
|
||||||
$tmpl->set_file(array('login_form' => 'login_selectdomain.tpl'));
|
$tmpl->set_file(array('login_form' => 'login_selectdomain.tpl'));
|
||||||
|
$tmpl->set_var('charset',lang('charset'));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
|
$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
|
||||||
$tpl->set_unknowns("remove");
|
$tpl->set_unknowns("remove");
|
||||||
$tpl->set_file(array("head" => "head.tpl"));
|
$tpl->set_file(array("head" => "head.tpl"));
|
||||||
|
$tpl->set_var('charset',lang('charset'));
|
||||||
$tpl->set_var("website_title", $phpgw_info["server"]["site_title"]);
|
$tpl->set_var("website_title", $phpgw_info["server"]["site_title"]);
|
||||||
$tpl->set_var("body_tags",$bodyheader);
|
$tpl->set_var("body_tags",$bodyheader);
|
||||||
echo $tpl->finish($tpl->parse("out","head"));
|
echo $tpl->finish($tpl->parse("out","head"));
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<!-- BEGIN head -->
|
<!-- BEGIN head -->
|
||||||
<HEAD>
|
<HEAD>
|
||||||
|
|
||||||
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
<META http-equiv="Content-Type" content="text/html; charset={charset}">
|
||||||
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
|
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
|
||||||
<META NAME="description" CONTENT="phpGroupWare">
|
<META NAME="description" CONTENT="phpGroupWare">
|
||||||
<META NAME="keywords" CONTENT="phpGroupWare">
|
<META NAME="keywords" CONTENT="phpGroupWare">
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<!-- BEGIN login_form -->
|
<!-- BEGIN login_form -->
|
||||||
<HEAD>
|
<HEAD>
|
||||||
|
|
||||||
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
<META http-equiv="Content-Type" content="text/html; charset={charset}">
|
||||||
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
|
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
|
||||||
<META NAME="description" CONTENT="phpGroupWare login screen">
|
<META NAME="description" CONTENT="phpGroupWare login screen">
|
||||||
<META NAME="keywords" CONTENT="phpGroupWare login screen">
|
<META NAME="keywords" CONTENT="phpGroupWare login screen">
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<!-- BEGIN login_form -->
|
<!-- BEGIN login_form -->
|
||||||
<HEAD>
|
<HEAD>
|
||||||
|
|
||||||
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
<META http-equiv="Content-Type" content="text/html; charset={charset}">
|
||||||
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
|
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
|
||||||
<META NAME="description" CONTENT="phpGroupWare login screen">
|
<META NAME="description" CONTENT="phpGroupWare login screen">
|
||||||
<META NAME="keywords" CONTENT="phpGroupWare login screen">
|
<META NAME="keywords" CONTENT="phpGroupWare login screen">
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
|
$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
|
||||||
$tpl->set_unknowns('remove');
|
$tpl->set_unknowns('remove');
|
||||||
$tpl->set_file(array('head' => 'head.tpl'));
|
$tpl->set_file(array('head' => 'head.tpl'));
|
||||||
|
$tpl->set_var('charset',lang('charset'));
|
||||||
$tpl->set_var('website_title', $phpgw_info['server']['site_title']);
|
$tpl->set_var('website_title', $phpgw_info['server']['site_title']);
|
||||||
$tpl->set_var('body_tags',$bodyheader);
|
$tpl->set_var('body_tags',$bodyheader);
|
||||||
$tpl->pfp('out','head');
|
$tpl->pfp('out','head');
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<!-- BEGIN head -->
|
<!-- BEGIN head -->
|
||||||
<HEAD>
|
<HEAD>
|
||||||
|
|
||||||
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
<META http-equiv="Content-Type" content="text/html; charset={charset}">
|
||||||
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
|
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
|
||||||
<META NAME="description" CONTENT="phpGroupWare">
|
<META NAME="description" CONTENT="phpGroupWare">
|
||||||
<META NAME="keywords" CONTENT="phpGroupWare">
|
<META NAME="keywords" CONTENT="phpGroupWare">
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<!-- BEGIN login_form -->
|
<!-- BEGIN login_form -->
|
||||||
<HEAD>
|
<HEAD>
|
||||||
|
|
||||||
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
<META http-equiv="Content-Type" content="text/html; charset={charset}">
|
||||||
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
|
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
|
||||||
<META NAME="description" CONTENT="phpGroupWare login screen">
|
<META NAME="description" CONTENT="phpGroupWare login screen">
|
||||||
<META NAME="keywords" CONTENT="phpGroupWare login screen">
|
<META NAME="keywords" CONTENT="phpGroupWare login screen">
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<!-- BEGIN login_form -->
|
<!-- BEGIN login_form -->
|
||||||
<HEAD>
|
<HEAD>
|
||||||
|
|
||||||
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
<META http-equiv="Content-Type" content="text/html; charset={charset}">
|
||||||
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
|
<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org">
|
||||||
<META NAME="description" CONTENT="phpGroupWare login screen">
|
<META NAME="description" CONTENT="phpGroupWare login screen">
|
||||||
<META NAME="keywords" CONTENT="phpGroupWare login screen">
|
<META NAME="keywords" CONTENT="phpGroupWare login screen">
|
||||||
|
@ -46,7 +46,7 @@ cc email ko
|
|||||||
change common ko 변경
|
change common ko 변경
|
||||||
change your password preferences ko 암호 변경
|
change your password preferences ko 암호 변경
|
||||||
change your settings preferences ko 설정 바꾸기
|
change your settings preferences ko 설정 바꾸기
|
||||||
charset common ko iso-8859-1
|
charset common ko euc-kr
|
||||||
chat common ko 대화
|
chat common ko 대화
|
||||||
city addressbook ko 도시
|
city addressbook ko 도시
|
||||||
clear common ko 초기화
|
clear common ko 초기화
|
||||||
|
Loading…
Reference in New Issue
Block a user