Merge master

lib/activation.php

@@ -123,7 +123,7 @@ function roots_theme_activation_action() {
   if ($roots_theme_activation_options['create_front_page'] === 'true') {
     $roots_theme_activation_options['create_front_page'] = false;
 
-    $default_pages = array('Home');
+    $default_pages = array(__('Home', 'roots'));
     $existing_pages = get_pages();
     $temp = array();
 
@@ -144,7 +144,7 @@ function roots_theme_activation_action() {
       $result = wp_insert_post($add_default_pages);
     }
 
-    $home = get_page_by_title('Home');
+    $home = get_page_by_title(__('Home', 'roots'));
     update_option('show_on_front', 'page');
     update_option('page_on_front', $home->ID);
 
@@ -170,10 +170,10 @@ function roots_theme_activation_action() {
 
     $roots_nav_theme_mod = false;
 
-    $primary_nav = wp_get_nav_menu_object('Primary Navigation');
+    $primary_nav = wp_get_nav_menu_object(__('Primary Navigation', 'roots'));
 
     if (!$primary_nav) {
-      $primary_nav_id = wp_create_nav_menu('Primary Navigation', array('slug' => 'primary_navigation'));
+      $primary_nav_id = wp_create_nav_menu(__('Primary Navigation', 'roots'), array('slug' => 'primary_navigation'));
       $roots_nav_theme_mod['primary_navigation'] = $primary_nav_id;
     } else {
       $roots_nav_theme_mod['primary_navigation'] = $primary_nav->term_id;
@@ -187,7 +187,7 @@ function roots_theme_activation_action() {
   if ($roots_theme_activation_options['add_pages_to_primary_navigation'] === 'true') {
     $roots_theme_activation_options['add_pages_to_primary_navigation'] = false;
 
-    $primary_nav = wp_get_nav_menu_object('Primary Navigation');
+    $primary_nav = wp_get_nav_menu_object(__('Primary Navigation', 'roots'));
     $primary_nav_term_id = (int) $primary_nav->term_id;
     $menu_items= wp_get_nav_menu_items($primary_nav_term_id);
 

lib/comments.php

@@ -38,6 +38,7 @@ class Roots_Walker_Comment extends Walker_Comment {
       call_user_func($args['end-callback'], $comment, $args, $depth);
       return;
     }
+    // Close ".media-body" <div> located in templates/comment.php, and then the comment's <li>
     echo "</div></li>\n";
   }
 }

lib/titles.php

@@ -23,7 +23,7 @@ function roots_title() {
       return sprintf(__('Yearly Archives: %s', 'roots'), get_the_date('Y'));
     } elseif (is_author()) {
       $author = get_queried_object();
-      return sprintf(__('Author Archives: %s', 'roots'), $author->display_name);
+      return sprintf(__('Author Archives: %s', 'roots'), apply_filters('the_author', is_object($author) ? $author->display_name : null));
     } else {
       return single_cat_title('', false);
     }
@@ -34,4 +34,4 @@ function roots_title() {
   } else {
     return get_the_title();
   }
-}
+}

lib/utils.php

@@ -4,7 +4,7 @@
  */
 function is_element_empty($element) {
   $element = trim($element);
-  return empty($element) ? false : true;
+  return !empty($element);
 }
 
 // Tell WordPress to use searchform.php from the templates/ directory