From e3bc1066215e0b18134ceb12577a9967880367dd Mon Sep 17 00:00:00 2001 From: skodak Date: Wed, 15 Nov 2006 20:39:26 +0000 Subject: [PATCH] remove use of get_String("thischarset") replace it with utf-8 MDL-7570 --- admin/lang.php | 2 +- filter/tex/displaytex.php | 4 ++-- lib/editor/htmlarea/coursefiles.php | 2 +- lib/editor/htmlarea/htmlarea.php | 5 ++--- lib/editor/htmlarea/lang/en.php | 3 +-- lib/editor/htmlarea/popups/createanchor.php | 2 +- lib/editor/htmlarea/popups/dlg_ins_char.php | 4 ++-- lib/editor/htmlarea/popups/dlg_ins_smile.php | 2 +- lib/editor/htmlarea/popups/fullscreen.php | 8 ++++---- lib/editor/htmlarea/popups/insert_image.php | 2 +- lib/editor/htmlarea/popups/insert_image_std.php | 2 +- lib/editor/htmlarea/popups/insert_table.php | 2 +- lib/editor/htmlarea/popups/link.php | 2 +- lib/editor/htmlarea/popups/link_std.php | 2 +- lib/editor/htmlarea/popups/searchandreplace.php | 2 +- lib/editor/htmlarea/popups/select_color.php | 2 +- 16 files changed, 22 insertions(+), 24 deletions(-) diff --git a/admin/lang.php b/admin/lang.php index 73be689d87..fbc97848e3 100644 --- a/admin/lang.php +++ b/admin/lang.php @@ -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 >>"; } diff --git a/filter/tex/displaytex.php b/filter/tex/displaytex.php index 70b1b68d8b..4200aa87dc 100644 --- a/filter/tex/displaytex.php +++ b/filter/tex/displaytex.php @@ -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'); ?> TeX Source - + diff --git a/lib/editor/htmlarea/coursefiles.php b/lib/editor/htmlarea/coursefiles.php index 0755aa8d88..f75284850b 100644 --- a/lib/editor/htmlarea/coursefiles.php +++ b/lib/editor/htmlarea/coursefiles.php @@ -47,7 +47,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - " /> + coursefiles