Skip to content

Commit

Permalink
Replaced xml:lang attributes by lang for HTML5
Browse files Browse the repository at this point in the history
  • Loading branch information
@mynetx
mynetx committed Mar 18, 2012
1 parent 1b23bfa commit 653f086
Show file tree
Hide file tree
Showing 19 changed files with 25 additions and 32 deletions.
3 changes: 1 addition & 2 deletions Documentation.html
View file
Expand Up @@ -2,8 +2,7 @@
<!--
vim: expandtab ts=4 sw=4 sts=4 tw=78
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
<html lang="en-US" dir="ltr">
<head>
<link rel="icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
Expand Down
5 changes: 1 addition & 4 deletions browse_foreigners.php
View file
Expand Up @@ -73,10 +73,7 @@
}
?>
<!DOCTYPE HTML>
<html xmlns="http://www.w3.org/1999/xhtml"
xml:lang="<?php echo $available_languages[$lang][1]; ?>"
lang="<?php echo $available_languages[$lang][1]; ?>"
dir="<?php echo $text_dir; ?>">
<html lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $text_dir; ?>">

<head>
<title>phpMyAdmin</title>
Expand Down
2 changes: 1 addition & 1 deletion changelog.php
View file
Expand Up @@ -101,7 +101,7 @@
header('Content-type: text/html; charset=utf-8');
?>
<!DOCTYPE HTML>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
<html lang="en" dir="ltr">
<head>
<link rel="icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
Expand Down
2 changes: 1 addition & 1 deletion db_datadict.php
View file
Expand Up @@ -228,7 +228,7 @@
}
?>
</td>
<td<?php echo $type_nowrap; ?> xml:lang="en" dir="ltr"><?php echo $type; ?></td>
<td<?php echo $type_nowrap; ?> lang="en" dir="ltr"><?php echo $type; ?></td>
<?php /* <td<?php echo $type_nowrap; ?>><?php echo $attribute; ?></td>*/ ?>
<td><?php echo (($row['Null'] == 'NO') ? __('No') : __('Yes')); ?></td>
<td nowrap="nowrap"><?php if (isset($row['Default'])) { echo $row['Default']; } ?></td>
Expand Down
2 changes: 1 addition & 1 deletion examples/openid.php
View file
Expand Up @@ -37,7 +37,7 @@ function show_page($contents)
echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
?>
<!DOCTYPE HTML>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
<html lang="en" dir="ltr">
<head>
<link rel="icon" href="../favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
Expand Down
2 changes: 1 addition & 1 deletion examples/signon.php
View file
Expand Up @@ -38,7 +38,7 @@
echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
?>
<!DOCTYPE HTML>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
<html lang="en" dir="ltr">
<head>
<link rel="icon" href="../favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
Expand Down
4 changes: 2 additions & 2 deletions libraries/List_Database.class.php
View file
Expand Up @@ -317,7 +317,7 @@ public function getHtmlListGrouped($selected = '', $offset, $count)
$selected = $this->getDefault();
}

$return = '<ul id="databaseList" xml:lang="en" dir="ltr">' . "\n";
$return = '<ul id="databaseList" lang="en" dir="ltr">' . "\n";
foreach ($this->getGroupedDetails($offset, $count) as $group => $dbs) {
if (count($dbs) > 1) {
$return .= '<li class="group"><span>' . htmlspecialchars($group) . '</span><ul>' . "\n";
Expand Down Expand Up @@ -373,7 +373,7 @@ public function getHtmlSelectGrouped($selected = '', $offset, $count)
$selected = $this->getDefault();
}

$return = '<select name="db" id="lightm_db" xml:lang="en" dir="ltr"'
$return = '<select name="db" id="lightm_db" lang="en" dir="ltr"'
. ' onchange="if (this.value != \'\') window.parent.openDb(this.value);">' . "\n"
. '<option value="" dir="' . $GLOBALS['text_dir'] . '">'
. '(' . __('Databases') . ') ...</option>' . "\n";
Expand Down
2 changes: 1 addition & 1 deletion libraries/Theme_Manager.class.php
View file
Expand Up @@ -295,7 +295,7 @@ function getHtmlSelectBox($form = true)
$theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" class="themeselect">';
$select_box .= $theme_preview_href . __('Theme') . '</a>:' . "\n";

$select_box .= '<select name="set_theme" xml:lang="en" dir="ltr" class="autosubmit">';
$select_box .= '<select name="set_theme" lang="en" dir="ltr" class="autosubmit">';
foreach ($this->themes as $each_theme_id => $each_theme) {
$select_box .= '<option value="' . $each_theme_id . '"';
if ($this->active_theme === $each_theme_id) {
Expand Down
2 changes: 1 addition & 1 deletion libraries/auth/cookie.auth.lib.php
View file
Expand Up @@ -172,7 +172,7 @@ function PMA_auth()
<?php
echo sprintf(
__('Welcome to %s'),
'<bdo dir="ltr" xml:lang="en">' . $page_title . '</bdo>'
'<bdo dir="ltr" lang="en">' . $page_title . '</bdo>'
);
?>
</h1>
Expand Down
6 changes: 3 additions & 3 deletions libraries/display_select_lang.lib.php
View file
Expand Up @@ -50,13 +50,13 @@ function PMA_select_language($use_fieldset = false, $show_doc = true)
$language_title .= PMA_showDocu('faq7_2');
}
if ($use_fieldset) {
echo '<fieldset><legend xml:lang="en" dir="ltr">' . $language_title . '</legend>';
echo '<fieldset><legend lang="en" dir="ltr">' . $language_title . '</legend>';
} else {
echo '<bdo xml:lang="en" dir="ltr">' . $language_title . ':</bdo>';
echo '<bdo lang="en" dir="ltr">' . $language_title . ':</bdo>';
}
?>

<select name="lang" class="autosubmit" xml:lang="en" dir="ltr">
<select name="lang" class="autosubmit" lang="en" dir="ltr">
<?php

uasort($GLOBALS['available_languages'], 'PMA_language_cmp');
Expand Down
2 changes: 1 addition & 1 deletion libraries/error.inc.php
View file
Expand Up @@ -13,7 +13,7 @@
header('Content-Type: text/html; charset=utf-8');
?>
<!DOCTYPE HTML>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang; ?>" dir="<?php echo $dir; ?>">
<html lang="<?php echo $lang; ?>" dir="<?php echo $dir; ?>">
<head>
<link rel="icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
Expand Down
2 changes: 1 addition & 1 deletion libraries/header_meta_style.inc.php
View file
Expand Up @@ -32,7 +32,7 @@

?>
<!DOCTYPE HTML>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
<html lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
<head>
<meta charset="utf-8" />
<link rel="icon" href="favicon.ico" type="image/x-icon" />
Expand Down
2 changes: 1 addition & 1 deletion libraries/header_printview.inc.php
View file
Expand Up @@ -39,7 +39,7 @@
}
?>
<!DOCTYPE HTML>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $available_languages[$lang][1]; ?>" lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $text_dir; ?>">
<html lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $text_dir; ?>">

<head>
<meta charset="utf-8" />
Expand Down
2 changes: 1 addition & 1 deletion libraries/mysql_charsets.lib.php
View file
Expand Up @@ -104,7 +104,7 @@ function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION,
}
}

$return_str = '<select xml:lang="en" dir="ltr" name="'
$return_str = '<select lang="en" dir="ltr" name="'
. htmlspecialchars($name) . '"'
. (empty($id) ? '' : ' id="' . htmlspecialchars($id) . '"')
. ($submitOnChange ? ' class="autosubmit"' : '') . '>' . "\n";
Expand Down
2 changes: 1 addition & 1 deletion main.php
View file
Expand Up @@ -182,7 +182,7 @@

echo ' <li id="li_select_mysql_charset">';
echo ' ' . __('Server charset') . ': '
. ' <span xml:lang="en" dir="ltr">'
. ' <span lang="en" dir="ltr">'
. ' ' . $mysql_charsets_descriptions[$mysql_charset_map['utf-8']] . "\n"
. ' (' . $mysql_charset_map['utf-8'] . ')' . "\n"
. ' </span>' . "\n"
Expand Down
5 changes: 1 addition & 4 deletions navigation.php
View file
Expand Up @@ -89,10 +89,7 @@ function PMA_exitNavigationFrame()
/* echo '<?xml version="1.0" encoding="utf-8"?>'; */
?>
<!DOCTYPE HTML>
<html xmlns="http://www.w3.org/1999/xhtml"
xml:lang="<?php echo $available_languages[$lang][1]; ?>"
lang="<?php echo $available_languages[$lang][1]; ?>"
dir="<?php echo $GLOBALS['text_dir']; ?>">
<html lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">

<head>
<link rel="icon" href="favicon.ico" type="image/x-icon" />
Expand Down
6 changes: 3 additions & 3 deletions scripts/decode_bug.php
View file
Expand Up @@ -16,11 +16,11 @@
*/
?>
<!DOCTYPE HTML>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" dir="ltr">

<head>
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<link rel="icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<meta charset="iso-8859-1" />
<title>phpMyAdmin - Parser bug report decoder</title>
<style type="text/css">
Expand Down
4 changes: 2 additions & 2 deletions setup/frames/index.inc.php
View file
Expand Up @@ -68,10 +68,10 @@

<form id="select_lang" method="post" action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI']) ?>">
<?php echo PMA_generate_common_hidden_inputs() ?>
<bdo xml:lang="en" dir="ltr"><label for="lang">
<bdo lang="en" dir="ltr"><label for="lang">
<?php echo __('Language') . (__('Language') != 'Language' ? ' - Language' : '') ?>
</label></bdo><br />
<select id="lang" name="lang" class="autosubmit" xml:lang="en" dir="ltr">
<select id="lang" name="lang" class="autosubmit" lang="en" dir="ltr">
<?php
// create language list
$lang_list = array();
Expand Down
2 changes: 1 addition & 1 deletion tbl_structure.php
View file
Expand Up @@ -343,7 +343,7 @@
<?php echo $rownum; ?>
</td>
<th nowrap="nowrap"><label for="checkbox_row_<?php echo $rownum; ?>"><?php echo $displayed_field_name; ?></label></th>
<td<?php echo $type_nowrap; ?>><bdo dir="ltr" xml:lang="en"><?php echo $type; echo $type_mime; ?></bdo></td>
<td<?php echo $type_nowrap; ?>><bdo dir="ltr" lang="en"><?php echo $type; echo $type_mime; ?></bdo></td>
<td><?php echo (empty($field_charset) ? '' : '<dfn title="' . PMA_getCollationDescr($field_charset) . '">' . $field_charset . '</dfn>'); ?></td>
<td nowrap="nowrap" class="column_attribute"><?php echo $attribute; ?></td>
<td><?php echo (($row['Null'] == 'YES') ? __('Yes') : __('No')); ?></td>
Expand Down

0 comments on commit 653f086

Please sign in to comment.