From 3537fc873de8bbc630b4a3f4cc239b94bdcaea0a Mon Sep 17 00:00:00 2001
From: Anass Rahou <nsrahou@gmail.com>
Date: Wed, 6 Nov 2024 00:26:35 -0500
Subject: [PATCH 1/6] New 'not found' filter and accessibility attribute

---
 no-results.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/no-results.php b/no-results.php
index fc6bba2f..d81e3bd7 100644
--- a/no-results.php
+++ b/no-results.php
@@ -10,7 +10,7 @@
 }
 ?>
 
-<div class="no-results not-found">
+<div class="no-results not-found" role="alert" aria-live="polite">
 	<div class="inside-article">
 		<?php
 		/**
@@ -54,12 +54,17 @@
 
 				<?php elseif ( is_search() ) : ?>
 
-					<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'generatepress' ); ?></p>
+					<p><?php _e( 'Sorry, we couldn’t find what you’re looking for. Try a different search or browse our recent posts.', 'generatepress' ); ?></p>
 					<?php get_search_form(); ?>
 
 				<?php else : ?>
-
-					<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'generatepress' ); ?></p>
+					<?php
+					$nothing_found_message = apply_filters(
+						'generate_nothing_found_message',
+						__( 'It seems we can&rsquo;t find what you’re looking for. Perhaps searching can help.', 'generatepress' )
+					);
+					?>
+					<p><?php echo esc_html( $nothing_found_message ); ?></p>
 					<?php get_search_form(); ?>
 
 				<?php endif; ?>

From 13fc521cffffb00f371dc1fa6f56e060cc7c278f Mon Sep 17 00:00:00 2001
From: Anass Rahou <nsrahou@gmail.com>
Date: Wed, 6 Nov 2024 01:37:07 -0500
Subject: [PATCH 2/6] Accessibility and new filters

---
 no-results.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/no-results.php b/no-results.php
index d81e3bd7..2321ddd9 100644
--- a/no-results.php
+++ b/no-results.php
@@ -53,18 +53,23 @@
 					</p>
 
 				<?php elseif ( is_search() ) : ?>
-
-					<p><?php _e( 'Sorry, we couldn’t find what you’re looking for. Try a different search or browse our recent posts.', 'generatepress' ); ?></p>
+					<?php
+					$nothing_found_search = apply_filters(
+						'generate_search_not_found',
+						__( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'generatepress' )	
+					);
+					?>
+					<p><?php echo esc_html( $nothing_found_search ); ?></p>
 					<?php get_search_form(); ?>
 
 				<?php else : ?>
 					<?php
-					$nothing_found_message = apply_filters(
+					$nothing_found_other = apply_filters(
 						'generate_nothing_found_message',
 						__( 'It seems we can&rsquo;t find what you’re looking for. Perhaps searching can help.', 'generatepress' )
 					);
 					?>
-					<p><?php echo esc_html( $nothing_found_message ); ?></p>
+					<p><?php echo esc_html( $nothing_found_other ); ?></p>
 					<?php get_search_form(); ?>
 
 				<?php endif; ?>

From 616d98883bf21ea160c958934df53a071738016a Mon Sep 17 00:00:00 2001
From: Anass Rahou <nsrahou@gmail.com>
Date: Wed, 6 Nov 2024 01:45:38 -0500
Subject: [PATCH 3/6] Updates

---
 no-results.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/no-results.php b/no-results.php
index 2321ddd9..4cc7e942 100644
--- a/no-results.php
+++ b/no-results.php
@@ -55,7 +55,7 @@
 				<?php elseif ( is_search() ) : ?>
 					<?php
 					$nothing_found_search = apply_filters(
-						'generate_search_not_found',
+						'generate_not_found_search',
 						__( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'generatepress' )	
 					);
 					?>
@@ -65,7 +65,7 @@
 				<?php else : ?>
 					<?php
 					$nothing_found_other = apply_filters(
-						'generate_nothing_found_message',
+						'generate_not_found_other',
 						__( 'It seems we can&rsquo;t find what you’re looking for. Perhaps searching can help.', 'generatepress' )
 					);
 					?>

From c3ba65ff20fb1ef0e75d769b6f4a73a27f2fbf66 Mon Sep 17 00:00:00 2001
From: Anass Rahou <nsrahou@gmail.com>
Date: Wed, 6 Nov 2024 01:48:20 -0500
Subject: [PATCH 4/6] Accessibility and new filters

---
 no-results.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/no-results.php b/no-results.php
index 4cc7e942..54914d10 100644
--- a/no-results.php
+++ b/no-results.php
@@ -55,7 +55,7 @@
 				<?php elseif ( is_search() ) : ?>
 					<?php
 					$nothing_found_search = apply_filters(
-						'generate_not_found_search',
+						'generate_search_not_found',
 						__( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'generatepress' )	
 					);
 					?>
@@ -65,7 +65,7 @@
 				<?php else : ?>
 					<?php
 					$nothing_found_other = apply_filters(
-						'generate_not_found_other',
+						'generate_other_not_found',
 						__( 'It seems we can&rsquo;t find what you’re looking for. Perhaps searching can help.', 'generatepress' )
 					);
 					?>

From c7b94845a3ca08d9e856e65c67a0a9038be01ae7 Mon Sep 17 00:00:00 2001
From: Anass Rahou <nsrahou@gmail.com>
Date: Wed, 6 Nov 2024 17:33:55 -0500
Subject: [PATCH 5/6] Minor changes

---
 comments.php | 13 ++++---------
 content.php  |  6 ++++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/comments.php b/comments.php
index 7083c12c..3dd682de 100644
--- a/comments.php
+++ b/comments.php
@@ -61,14 +61,9 @@
 		);
 
 		// phpcs:ignore -- Title escaped in output.
-		echo apply_filters(
-			'generate_comments_title_output',
-			sprintf(
-				'<h2 class="comments-title">%s</h2>',
-				esc_html( $comments_title )
-			),
-			$comments_title,
-			$comments_number
+		echo sprintf(
+			'<h2 class="comments-title">%s</h2>',
+			esc_html( apply_filters( 'generate_comments_title_output', $comments_title, $comments_number ) )
 		);
 
 		/**
@@ -124,7 +119,7 @@
 		<?php
 	endif;
 
-	comment_form();
+	comment_form( apply_filters( 'generate_comment_form_args', array() ) );
 	?>
 
 </div><!-- #comments -->
diff --git a/content.php b/content.php
index f82ed9f5..5b94c3b7 100644
--- a/content.php
+++ b/content.php
@@ -81,8 +81,10 @@
 
 				wp_link_pages(
 					array(
-						'before' => '<div class="page-links">' . __( 'Pages:', 'generatepress' ),
-						'after'  => '</div>',
+						'before'      => '<div class="page-links" role="navigation" aria-label="' . esc_attr__( 'Page Navigation', 'generatepress' ) . '">' . esc_html__( 'Pages:', 'generatepress' ),
+						'after'       => '</div>',
+						'link_before' => '<span class="page-link-item">',
+						'link_after'  => '</span>',
 					)
 				);
 				?>

From 531cc48557bc0b33e8c658dd7c01aed520eca3b4 Mon Sep 17 00:00:00 2001
From: Anass Rahou <nsrahou@gmail.com>
Date: Fri, 8 Nov 2024 22:02:16 -0500
Subject: [PATCH 6/6] Refactor conditionals to reduce redundancy and increase
 readability.

---
 inc/theme-functions.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/inc/theme-functions.php b/inc/theme-functions.php
index 7dcf5eb5..b74ec293 100644
--- a/inc/theme-functions.php
+++ b/inc/theme-functions.php
@@ -45,17 +45,12 @@ function generate_get_layout() {
 
 		if ( is_single() ) {
 			$layout = generate_get_option( 'single_layout_setting' );
-		}
-
-		if ( is_singular() ) {
+		} elseif ( is_singular() ) {
 			$layout_meta = get_post_meta( get_the_ID(), '_generate-sidebar-layout-meta', true );
 
-			if ( $layout_meta ) {
-				$layout = $layout_meta;
-			}
-		}
-
-		if ( is_home() || is_archive() || is_search() || is_tax() ) {
+			$layout = $layout_meta ?: $layout;
+			
+		} elseif ( is_home() || is_archive() || is_search() || is_tax() ) {
 			$layout = generate_get_option( 'blog_layout_setting' );
 		}