summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-03-25 14:44:41 -0300
committerRenato Botelho <garga@FreeBSD.org>2014-03-25 14:44:41 -0300
commit000a8d1dcdd1714913cd7f46f9cc4433e13e68d5 (patch)
treede80e127fcbfe869e7a3bae5e1bce696d2ad4c3b /etc
parent6fba8620e561eab65837cd72b8ba6b057e053af2 (diff)
downloadpfsense-000a8d1dcdd1714913cd7f46f9cc4433e13e68d5.zip
pfsense-000a8d1dcdd1714913cd7f46f9cc4433e13e68d5.tar.gz
Change default charset on pages to utf-8
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/authgui.inc4
-rw-r--r--etc/inc/pfsense-utils.inc4
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/authgui.inc b/etc/inc/authgui.inc
index 93c9484..bff5e78 100644
--- a/etc/inc/authgui.inc
+++ b/etc/inc/authgui.inc
@@ -112,7 +112,7 @@ function display_error_form($http_code, $desc) {
<head>
<script type="text/javascript" src="/javascript/jquery.js"></script>
<title><?=$http_code?></title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="/themes/<?= $g['theme'] ?>/images/icons/favicon.ico" />
<?php if (file_exists("{$g['www_path']}/themes/{$g['theme']}/login.css")): ?>
<link rel="stylesheet" type="text/css" href="/themes/<?= $g['theme'] ?>/login.css" media="all" />
@@ -233,7 +233,7 @@ $have_cookies = isset($_COOKIE["cookie_test"]);
</script>
<title><?=gettext("Login"); ?></title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="/themes/<?= $g['theme'] ?>/images/icons/favicon.ico" />
<?php if (file_exists("{$g['www_path']}/themes/{$g['theme']}/login.css")): ?>
<link rel="stylesheet" type="text/css" href="/themes/<?= $g['theme'] ?>/login.css" media="all" />
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index a70faf2..8ba3fd2 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -2594,7 +2594,7 @@ function pfSense_handle_custom_code($src_dir) {
}
}
-function set_language($lang = 'en_US', $encoding = "ISO8859-1") {
+function set_language($lang = 'en_US', $encoding = "UTF-8") {
putenv("LANG={$lang}.{$encoding}");
setlocale(LC_ALL, "{$lang}.{$encoding}");
textdomain("pfSense");
@@ -2646,7 +2646,7 @@ $g_languages = array (
"zh_TW" => array("codeset" => "UTF-8", "desc" => gettext("Chinese (Traditional)")),
"nl" => array("codeset" => "UTF-8", "desc" => gettext("Dutch")),
"da" => array("codeset" => "UTF-8", "desc" => gettext("Danish")),
- "en_US" => array("codeset" => "ISO-8859-1", "desc" => gettext("English")),
+ "en_US" => array("codeset" => "UTF-8", "desc" => gettext("English")),
"fi" => array("codeset" => "UTF-8", "desc" => gettext("Finnish")),
"fr" => array("codeset" => "UTF-8", "desc" => gettext("French")),
"de" => array("codeset" => "UTF-8", "desc" => gettext("German")),
OpenPOWER on IntegriCloud