Index: src/bp-templates/bp-legacy/buddypress/common/search/dir-search-form.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/common/search/dir-search-form.php	(revision 11188)
+++ src/bp-templates/bp-legacy/buddypress/common/search/dir-search-form.php	(working copy)
@@ -7,10 +7,10 @@
 ?>
 
 <div id="<?php echo esc_attr( bp_current_component() ); ?>-dir-search" class="dir-search" role="search">
-	<form action="" method="get" id="search-<?php  echo esc_attr( bp_current_component() ); ?>-form">
+	<form action="" method="get" id="search-<?php echo esc_attr( bp_current_component() ); ?>-form">
 		<label for="<?php bp_search_input_name(); ?>" class="bp-screen-reader-text"><?php bp_search_placeholder(); ?></label>
 		<input type="text" name="<?php echo esc_attr( bp_core_get_component_search_query_arg() ); ?>" id="<?php bp_search_input_name(); ?>" placeholder="<?php bp_search_placeholder(); ?>" />
 
-		<input type="submit" id="<?php echo esc_attr( bp_get_search_input_name() ); ?>_submit" name="<?php bp_search_input_name(); ?>_submit" value="<?php echo esc_html( 'Search', 'buddypress' ); ?>" />
+		<input type="submit" id="<?php echo esc_attr( bp_get_search_input_name() ); ?>_submit" name="<?php bp_search_input_name(); ?>_submit" value="<?php esc_attr_e( 'Search', 'buddypress' ); ?>" />
 	</form>
 </div><!-- #<?php echo esc_attr( bp_current_component() ); ?>-dir-search -->