mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 22:08:20 +01:00
remove use of get_String("thischarset") replace it with utf-8 MDL-7570
This commit is contained in:
skodak
parent
70ad6fdbe6
commit
e3bc106621
@ -384,7 +384,7 @@
|
||||
$enstring = $string;
|
||||
if ($currentlang != 'en' and $currentfile == 'moodle.php') {
|
||||
$enstring['thislanguage'] = "<< TRANSLATORS: Specify the name of your language here. If possible use Unicode Numeric Character References >>";
|
||||
$enstring['thischarset'] = "<< TRANSLATORS: Specify the character set of your language here. Note that all text created while this language is active will be stored using this character set, so don't change it once you have set it. Example: iso-8859-1 >>";
|
||||
$enstring['thischarset'] = "<< TRANSLATORS: Charset encoding - always use utf-8 >>";
|
||||
$enstring['thisdirection'] = "<< TRANSLATORS: This string specifies the direction of your text, either left-to-right or right-to-left. Insert either 'ltr' or 'rtl' here. >>";
|
||||
$enstring['parentlanguage'] = "<< TRANSLATORS: If your language has a Parent Language that Moodle should use when strings are missing from your language pack, then specify the code for it here. If you leave this blank then English will be used. Example: nl >>";
|
||||
}
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
// entities are usually encoded twice, first in HTML editor then in tex/filter.php
|
||||
$texexp = html_entity_decode(html_entity_decode($texexp));
|
||||
// encode all entities (saves non-ISO)
|
||||
$texexp = htmlentities($texexp,ENT_COMPAT,get_string("thischarset","moodle"));
|
||||
$texexp = htmlentities($texexp,ENT_COMPAT,'utf-8');
|
||||
?>
|
||||
<html>
|
||||
<head>
|
||||
<title>TeX Source</title>
|
||||
<meta http-equiv="content-type" content="text/html; charset=<?php echo get_string('thischarset'); ?>" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
</head>
|
||||
<body bgcolor="#FFFFFF">
|
||||
<?php echo $texexp; ?>
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=<?php print_string("thischarset");?>" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<title>coursefiles</title>
|
||||
<script language="javscript" type="text/javascript">
|
||||
<!--
|
||||
|
||||
@ -13,8 +13,7 @@
|
||||
// ob_start("ob_gzhandler");
|
||||
//}
|
||||
|
||||
$charset = get_string('thischarset');
|
||||
header("Content-type: application/x-javascript; charset: $charset"); // Correct MIME type
|
||||
header("Content-type: application/x-javascript; charset: utf-8"); // Correct MIME type
|
||||
header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastmodified) . " GMT");
|
||||
header("Expires: " . gmdate("D, d M Y H:i:s", time() + $lifetime) . " GMT");
|
||||
header("Cache-control: max_age = $lifetime");
|
||||
@ -694,7 +693,7 @@ HTMLArea.prototype.generate = function () {
|
||||
if (!editor.config.fullPage) {
|
||||
html = "<html>\n";
|
||||
html += "<head>\n";
|
||||
html += '<meta http-equiv="content-type" content="text/html; charset=<?php echo $charset; ?>" />\n';
|
||||
html += '<meta http-equiv="content-type" content="text/html; charset=utf-8" />\n';
|
||||
if (editor.config.baseURL)
|
||||
html += '<base href="' + editor.config.baseURL + '" />';
|
||||
html += '<style type="text/css">\n' + editor.config.pageStyle + "td { border: 1px dotted gray; }</style>\n";
|
||||
|
||||
@ -10,8 +10,7 @@
|
||||
// ob_start("ob_gzhandler");
|
||||
//}
|
||||
|
||||
$charset = get_string('thischarset');
|
||||
header("Content-type: application/x-javascript; charset: $charset"); // Correct MIME type
|
||||
header("Content-type: application/x-javascript; charset: utf-8"); // Correct MIME type
|
||||
header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastmodified) . " GMT");
|
||||
header("Expires: " . gmdate("D, d M Y H:i:s", time() + $lifetime) . " GMT");
|
||||
// See Bug #2387
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=<?php print_string("thischarset");?>" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<title>Create anchor</title>
|
||||
<script language="javascript" type="text/javascript" src="popup.js"></script>
|
||||
<script language="javascript" type="text/javascript">
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=<?php print_string("thischarset");?>" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<style type="text/css">
|
||||
<!--
|
||||
body { background: ButtonFace; color: ButtonText; font: 11px Tahoma,Verdana,sans-serif;
|
||||
@ -73,7 +73,7 @@ font-size: small; }
|
||||
function Init() {
|
||||
__dlg_init();
|
||||
}
|
||||
var chars = ["!",""","#","$","%","&","'","(",")","*","+","-",".","/","0","1","2","3","4","5","6","7","8","9",":",";","<","=",">","?","@","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","[","]","^","_","`","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","{","|","}","~","€","ƒ","„","…","†","‡","ˆ","\‰","Š","‹","Œ","‘","’","’","“","”","•","–","—","˜","™","š","›","œ","Ÿ","¡","¢","£","£","¤","¥","¦","§","¨","©","ª","«","¬","","®","¯","°","±","²","³","´","µ","¶","·","¸","¹","º","»","¼","½","¾","¿","À","Á","Â","Ã","Ä","Å","Æ","Ç","È","É","Ê","Ë","Ì","Í","Î","Ï","Ð","Ñ","Ò","Ó","Ô","Õ","Ö","×","Ø","Ù","Ú","Û","Ü","Ý","Þ","ß","à","á","â","ã","ä","å","æ","ç","è","é","ê","ë","ì","í","î","ï","ð","ñ","ò","ó","ô","õ","ö","÷","ø","ù","ú","û","ü","ü","ý","þ","ÿ"]
|
||||
var chars = ["!",""","#","$","%","&","'","(",")","*","+","-",".","/","0","1","2","3","4","5","6","7","8","9",":",";","<","=",">","?","@","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","[","]","^","_","`","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","{","|","}","~","€","ƒ","„","…","†","‡","ˆ","\‰","Š","‹","Œ","‘","’","’","“","”","•","–","—","˜","™","š","›","œ","Ÿ","¡","¢","£","£","¤","¥","¦","§","¨","©","ª","«","¬","","®","¯","°","±","²","³","´","µ","¶","·","¸","¹","º","»","¼","½","¾","¿","À","Á","Â","Ã","Ä","Å","Æ","Ç","È","É","Ê","Ë","Ì","Í","Î","Ï","Ð","Ñ","Ò","Ó","Ô","Õ","Ö","×","Ø","Ù","Ú","Û","Ü","Ý","Þ","ß","à","á","â","ã","ä","å","æ","ç","è","é","ê","ë","ì","í","î","ï","ð","ñ","ò","ó","ô","õ","ö","÷","ø","ù","ú","û","ü","ü","ý","þ","ÿ"]
|
||||
|
||||
function tab(w,h) {
|
||||
var strtab = ["<table border='0' cellspacing='0' cellpadding='0' align='center' bordercolor='#dcdcdc' bgcolor='#C0C0C0'>"]
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=<?php print_string('thischarset'); ?>" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<title><?php print_string('insertsmile', 'editor'); ?></title>
|
||||
<link rel="stylesheet" href="dialog.css" type="text/css" />
|
||||
<script language="javascript" type="text/javascript" src="popup.js"></script>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
?>
|
||||
<html>
|
||||
<head><title><?php print_string("fullscreen","editor");?></title>
|
||||
<meta http-equiv="content-type" content="text/html; charset=<?php print_string("thischarset");?>" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<style type="text/css">
|
||||
@import url(../htmlarea.css);
|
||||
html, body { margin: 0px; border: 0px; background-color: buttonface; } </style>
|
||||
@ -17,9 +17,9 @@ html, body { margin: 0px; border: 0px; background-color: buttonface; } </styl
|
||||
|
||||
<script type="text/javascript" src="../htmlarea.php?id=<?php p($id); ?>"></script>
|
||||
<script type="text/javascript" src="../lang/en.php"></script>
|
||||
<script type="text/javascript" src="../dialog.js" charset="<?php print_string('thischarset'); ?>"></script>
|
||||
<script type="text/javascript" src="../plugins/TableOperations/table-operations.js" charset="<?php print_string('thischarset'); ?>"></script>
|
||||
<script type="text/javascript" src="../plugins/TableOperations/lang/en.js" charset="<?php print_string('thischarset'); ?>"></script>
|
||||
<script type="text/javascript" src="../dialog.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../plugins/TableOperations/table-operations.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../plugins/TableOperations/lang/en.js" charset="utf-8"></script>
|
||||
<script type="text/javascript">
|
||||
// load same scripts that were present in the opener page
|
||||
var scripts = opener.document.getElementsByTagName("script");
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=<?php print_string("thischarset");?>" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<title><?php print_string("insertimage","editor");?></title>
|
||||
<script language="javascript" type="text/javascript" src="popup.js"></script>
|
||||
<script language="javascript" type="text/javascript">
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=<?php print_string("thischarset");?>" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<title><?php print_string("insertimage","editor");?></title>
|
||||
|
||||
<script language="javascript" type="text/javascript" src="popup.js"></script>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=<?php print_string("thischarset");?>" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<title><?php print_string("inserttable","editor");?></title>
|
||||
<script language="javascript" type="text/javascript" src="popup.js"></script>
|
||||
<script language="javascript" type="text/javascript">
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
<html>
|
||||
<head>
|
||||
<title><?php print_string("insertlink","editor");?></title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=<?php print_string("thischarset");?>" />
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<script language="javascript" type="text/javascript">
|
||||
|
||||
function onCancel() {
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=<?php print_string("thischarset");?>" />
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title><?php print_string("insertlink","editor");?></title>
|
||||
<script language="javascript" type="text/javascript" src="popup.js"></script>
|
||||
<script language="javascript" type="text/javascript">
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=<?php print_string("thischarset");?>" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<title><?php print_string("searchandreplace","editor");?></title>
|
||||
<script language="javascript" type="text/javascript" src="popup.js"></script>
|
||||
<script language="javascript" type="text/javascript">
|
||||
|
||||
@ -5,7 +5,7 @@ include("../../../../config.php");
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=<?php print_string("thischarset");?>" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<title><?php print_string("selectcolor","editor");?></title>
|
||||
<style type="text/css">
|
||||
html, body { width: 238; height: 188; }
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user