moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Followup fix for Bug MDL-8507 "Local language pack-name can appear in language code" (Merged from HEAD).

Browse source
This commit is contained in:
nfreear 2007-02-21 10:47:02 +00:00
parent c6ce18c221
commit cd735125df
2 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backup/restorelib.php
View file

@ -6361,9 +6361,8 @@
$stylesheetshtml .= '<link rel="stylesheet" type="text/css" href="'.$stylesheet.'" />'."\n"; $stylesheetshtml .= '<link rel="stylesheet" type="text/css" href="'.$stylesheet.'" />'."\n";
} }
///Accessibility: added the 'lang' attribute to $direction, used in theme <html> tag. ///Accessibility: added the 'lang' attribute to $direction, used in theme <html> tag.
$language = str_replace('_utf8','',$CFG->lang); $languagehtml = get_html_lang($dir=true);
$languagehtml = '';
$languagehtml .= ' lang="'.$language.'" xml:lang="'.$language.'"';
//Write the header in the new logging file //Write the header in the new logging file
fwrite ($restorelog_file,"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\""); fwrite ($restorelog_file,"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"");
fwrite ($restorelog_file," \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"> "); fwrite ($restorelog_file," \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"> ");

28
lib/weblib.php
View file

@ -1948,6 +1948,26 @@ function highlightfast($needle, $haystack) {
return (join('', $parts)); return (join('', $parts));
} }
/**
* Return a string containing lang, xml:lang and optionally 'dir' HTML attributes.
* Internationalisation, for print_header and backup/restorlib.
* @param $dir Default false.
* @return string Attributes.
*/
function get_html_lang($dir = false) {
$direction = '';
if ($dir) {
if (get_string('thisdirection') == 'rtl') {
$direction = ' dir="rtl"';
} else {
$direction = ' dir="ltr"';
}
}
//Accessibility: added the 'lang' attribute to $direction, used in theme <html> tag.
$language = str_replace('_', '-', str_replace('_utf8', '', current_language()));
return ($direction.' lang="'.$language.'" xml:lang="'.$language.'"');
}
/// STANDARD WEB PAGE PARTS /////////////////////////////////////////////////// /// STANDARD WEB PAGE PARTS ///////////////////////////////////////////////////
@ -2082,14 +2102,8 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
@header('Content-type: text/html; charset=utf-8'); @header('Content-type: text/html; charset=utf-8');
} }
if ( get_string('thisdirection') == 'rtl' ) {
$direction = ' dir="rtl"';
} else {
$direction = ' dir="ltr"';
}
//Accessibility: added the 'lang' attribute to $direction, used in theme <html> tag. //Accessibility: added the 'lang' attribute to $direction, used in theme <html> tag.
$language = str_replace('_', '-', str_replace('_utf8', '', current_language())); $direction = get_html_lang($dir=true);
$direction .= ' lang="'.$language.'" xml:lang="'.$language.'"';
if ($cache) { // Allow caching on "back" (but not on normal clicks) if ($cache) { // Allow caching on "back" (but not on normal clicks)
@header('Cache-Control: private, pre-check=0, post-check=0, max-age=0'); @header('Cache-Control: private, pre-check=0, post-check=0, max-age=0');