diff --git a/login.php b/login.php
index aa5bc0a17c..f79019b625 100755
--- a/login.php
+++ b/login.php
@@ -53,10 +53,12 @@
if (! $deny_login && ! $phpgw_info['server']['show_domain_selectbox'])
{
$tmpl->set_file(array('login_form' => 'login.tpl'));
+ $tmpl->set_var('charset',lang('charset'));
}
else if ($phpgw_info['server']['show_domain_selectbox'])
{
$tmpl->set_file(array('login_form' => 'login_selectdomain.tpl'));
+ $tmpl->set_var('charset',lang('charset'));
}
else
{
diff --git a/phpgwapi/templates/default/head.inc.php b/phpgwapi/templates/default/head.inc.php
index 894fc5a120..046abf5ab8 100644
--- a/phpgwapi/templates/default/head.inc.php
+++ b/phpgwapi/templates/default/head.inc.php
@@ -22,8 +22,9 @@
$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_unknowns("remove");
$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("body_tags",$bodyheader);
echo $tpl->finish($tpl->parse("out","head"));
unset($tpl);
-?>
\ No newline at end of file
+?>
diff --git a/phpgwapi/templates/default/head.tpl b/phpgwapi/templates/default/head.tpl
index 702da34f70..bd898c8885 100644
--- a/phpgwapi/templates/default/head.tpl
+++ b/phpgwapi/templates/default/head.tpl
@@ -3,7 +3,7 @@
-
+
diff --git a/phpgwapi/templates/default/login.tpl b/phpgwapi/templates/default/login.tpl
index e607c40748..540647a391 100644
--- a/phpgwapi/templates/default/login.tpl
+++ b/phpgwapi/templates/default/login.tpl
@@ -3,7 +3,7 @@
-
+
diff --git a/phpgwapi/templates/default/login_selectdomain.tpl b/phpgwapi/templates/default/login_selectdomain.tpl
index 4c9a6bfe78..c6e6979545 100644
--- a/phpgwapi/templates/default/login_selectdomain.tpl
+++ b/phpgwapi/templates/default/login_selectdomain.tpl
@@ -3,7 +3,7 @@
-
+
diff --git a/phpgwapi/templates/verdilak/head.inc.php b/phpgwapi/templates/verdilak/head.inc.php
index 4f14e2dc45..07190caa5e 100644
--- a/phpgwapi/templates/verdilak/head.inc.php
+++ b/phpgwapi/templates/verdilak/head.inc.php
@@ -23,6 +23,7 @@
$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_unknowns('remove');
$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('body_tags',$bodyheader);
$tpl->pfp('out','head');
diff --git a/phpgwapi/templates/verdilak/head.tpl b/phpgwapi/templates/verdilak/head.tpl
index 702da34f70..bd898c8885 100644
--- a/phpgwapi/templates/verdilak/head.tpl
+++ b/phpgwapi/templates/verdilak/head.tpl
@@ -3,7 +3,7 @@
-
+
diff --git a/phpgwapi/templates/verdilak/login.tpl b/phpgwapi/templates/verdilak/login.tpl
index 675bba910e..73a7f86564 100644
--- a/phpgwapi/templates/verdilak/login.tpl
+++ b/phpgwapi/templates/verdilak/login.tpl
@@ -3,7 +3,7 @@
-
+
diff --git a/phpgwapi/templates/verdilak/login_selectdomain.tpl b/phpgwapi/templates/verdilak/login_selectdomain.tpl
index 74f1e13d39..cefa3714f3 100644
--- a/phpgwapi/templates/verdilak/login_selectdomain.tpl
+++ b/phpgwapi/templates/verdilak/login_selectdomain.tpl
@@ -3,7 +3,7 @@
-
+
diff --git a/setup/phpgw_ko.lang b/setup/phpgw_ko.lang
index 080d0ea2c6..b834c784ee 100644
--- a/setup/phpgw_ko.lang
+++ b/setup/phpgw_ko.lang
@@ -46,7 +46,7 @@ cc email ko
change common ko º¯°æ
change your password preferences ko ¾ÏÈ£ º¯°æ
change your settings preferences ko ¼³Á¤ ¹Ù²Ù±â
-charset common ko iso-8859-1
+charset common ko euc-kr
chat common ko ´ëÈ
city addressbook ko µµ½Ã
clear common ko ÃʱâÈ