fixes #37 -- adding language_attributes() in header.php

This commit is contained in:
Ben Word
2011-04-28 13:52:43 -06:00
parent a39bc3d5e3
commit edf5b263fb
2 changed files with 29 additions and 11 deletions

View File

@@ -1,8 +1,8 @@
<!doctype html>
<!--[if lt IE 7]> <html class="no-js ie6" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<!--[if lt IE 7]> <html class="no-js ie6" <?php language_attributes(); ?>> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7" <?php language_attributes(); ?>> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8" <?php language_attributes(); ?>> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" <?php language_attributes(); ?>> <!--<![endif]-->
<head>
<meta charset="utf-8">

View File

@@ -45,11 +45,11 @@ function roots_clean_plugins($content) {
// only use clean urls if the theme isn't a child or an MU (Network) install
if ((!defined('WP_ALLOW_MULTISITE') || (defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE !== true)) && $theme_data['Template'] === '') {
add_action('generate_rewrite_rules', 'roots_add_rewrites');
add_filter('plugins_url', 'roots_clean_plugins');
add_filter('bloginfo', 'roots_clean_assets');
add_filter('stylesheet_directory_uri', 'roots_clean_assets');
add_filter('template_directory_uri', 'roots_clean_assets');
add_action('generate_rewrite_rules', 'roots_add_rewrites');
add_filter('plugins_url', 'roots_clean_plugins');
add_filter('bloginfo', 'roots_clean_assets');
add_filter('stylesheet_directory_uri', 'roots_clean_assets');
add_filter('template_directory_uri', 'roots_clean_assets');
}
// redirect /?s to /search/
@@ -66,8 +66,8 @@ add_action('template_redirect', 'roots_nice_search_redirect');
// inspired by http://www.456bereastreet.com/archive/201010/how_to_make_wordpress_urls_root_relative/
// thanks to Scott Walkinshaw (scottwalkinshaw.com)
function roots_root_relative_url($input) {
preg_match('/(https?:\/\/[^\/]+)/', $input, $matches);
return str_replace(end($matches), '', $input);
preg_match('/(https?:\/\/[^\/]+)/', $input, $matches);
return str_replace(end($matches), '', $input);
}
//add_filter('site_url', 'roots_root_relative_url'); // this will break URLs sent out in emails, possibly more
@@ -103,6 +103,24 @@ function roots_relative_feed_urls() {
add_action('pre_get_posts', 'roots_relative_feed_urls' );
// remove dir and set lang="en" as default (rather than en-US)
function roots_language_attributes() {
$attributes = array();
$output = '';
if (!defined('WP_LANG')) {
$attributes[] = "lang=\"en\"";
} else if ($lang = get_bloginfo('language')) {
$attributes[] = "lang=\"$lang\"";
}
$output = implode(' ', $attributes);
$output = apply_filters('roots_language_attributes', $output);
echo $output;
}
add_filter('language_attributes', 'roots_language_attributes');
// remove WordPress version from RSS feed
function roots_no_generator() { return ''; }
add_filter('the_generator', 'roots_no_generator');