Merge pull request roots#942 from roots/language-attributes

Remove lang cleanup and fix dir
codemonkey-jack · Dec 14, 2013 · 17ea601 · 17ea601
2 parents 72fa70a + d19f17b
commit 17ea601
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/lib/cleanup.php b/lib/cleanup.php
@@ -50,25 +50,20 @@ function roots_rel_canonical() {
 /**
  * Clean up language_attributes() used in <html> tag
  *
- * Change lang="en-US" to lang="en"
  * Remove dir="ltr"
  */
 function roots_language_attributes() {
   $attributes = array();
   $output = '';
 
-  if (function_exists('is_rtl')) {
-    if (is_rtl() == 'rtl') {
-      $attributes[] = 'dir="rtl"';
-    }
+  if (is_rtl()) {
+    $attributes[] = 'dir="rtl"';
   }
 
   $lang = get_bloginfo('language');
 
-  if ($lang && $lang !== 'en-US') {
+  if ($lang) {
     $attributes[] = "lang=\"$lang\"";
-  } else {
-    $attributes[] = 'lang="en"';
   }
 
   $output = implode(' ', $attributes);