Skip to content

Commit c66d974

Browse files
authored
Merge pull request #547 from devgeniem/TMS-1199
TMS-1199: Change events-search no-results text
2 parents 24b070a + 96fe33a commit c66d974

File tree

2 files changed

+27
-26
lines changed

2 files changed

+27
-26
lines changed

CHANGELOG.MD

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [Unreleased]
99

10+
- TMS-1199: Change events-search no-results text
11+
1012
## [1.66.0] - 2025-10-01
1113

1214
- TMS-1201: Add iframe-field for video fields
1315

16+
1417
## [1.65.0] - 2025-09-08
1518

1619
- TMS-1166: Fix duet-datepicker border on focus

models/page-events-search.php

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ class PageEventsSearch extends BaseModel {
4646
*/
4747
public function form() {
4848
return [
49-
'search_term' => trim( get_query_var( self::EVENT_SEARCH_TEXT ) ),
50-
'form_start_date' => get_query_var( self::EVENT_SEARCH_START_DATE ),
51-
'form_end_date' => get_query_var( self::EVENT_SEARCH_END_DATE ),
52-
'seach_term_label' => __( 'Search term', 'tms-theme-base' ),
53-
'time_frame_label' => __( 'Events from', 'tms-theme-base' ),
54-
'start_date_label' => __( 'Start date', 'tms-theme-base' ),
55-
'end_date_label' => __( 'End date', 'tms-theme-base' ),
56-
'action' => get_the_permalink(),
49+
'search_term' => trim( \get_query_var( self::EVENT_SEARCH_TEXT ) ),
50+
'form_start_date' => \get_query_var( self::EVENT_SEARCH_START_DATE ),
51+
'form_end_date' => \get_query_var( self::EVENT_SEARCH_END_DATE ),
52+
'seach_term_label' => \__( 'Search term', 'tms-theme-base' ),
53+
'time_frame_label' => \__( 'Events from', 'tms-theme-base' ),
54+
'start_date_label' => \__( 'Start date', 'tms-theme-base' ),
55+
'end_date_label' => \__( 'End date', 'tms-theme-base' ),
56+
'action' => \get_the_permalink(),
5757
];
5858
}
5959

@@ -63,7 +63,7 @@ public function form() {
6363
* @return string
6464
*/
6565
public function item_classes() : array {
66-
return apply_filters( 'tms/theme/page_events_search/item_classes', [
66+
return \apply_filters( 'tms/theme/page_events_search/item_classes', [
6767
'list' => [
6868
'item' => 'has-background-secondary',
6969
'item_inner' => '',
@@ -84,7 +84,7 @@ public function item_classes() : array {
8484
* @return array
8585
*/
8686
public function template_classes() {
87-
return apply_filters(
87+
return \apply_filters(
8888
'tms/theme/search/search_item',
8989
[
9090
'search_form' => 'has-background-secondary',
@@ -114,9 +114,7 @@ public function events() : ?array {
114114
* @return ?string
115115
*/
116116
public function no_results() : ?string {
117-
return empty( get_query_var( self::EVENT_SEARCH_TEXT ) )
118-
? __( 'No search term given', 'tms-theme-base' )
119-
: __( 'No results', 'tms-theme-base' );
117+
return \__( 'No results', 'tms-theme-base' );
120118
}
121119

122120
/**
@@ -125,8 +123,8 @@ public function no_results() : ?string {
125123
* @return array
126124
*/
127125
protected function get_events() : array {
128-
$event_search_text = get_query_var( self::EVENT_SEARCH_TEXT );
129-
$start_date = get_query_var( self::EVENT_SEARCH_START_DATE );
126+
$event_search_text = \get_query_var( self::EVENT_SEARCH_TEXT );
127+
$start_date = \get_query_var( self::EVENT_SEARCH_START_DATE );
130128
$start_date = ! empty( $start_date ) ? $start_date : date( 'Y-m-d' );
131129

132130
// Start date can not be in the past.
@@ -135,15 +133,15 @@ protected function get_events() : array {
135133
$start_date = $today;
136134
}
137135

138-
$end_date = get_query_var( self::EVENT_SEARCH_END_DATE );
136+
$end_date = \get_query_var( self::EVENT_SEARCH_END_DATE );
139137
$end_date = ! empty( $end_date ) ? $end_date : date( 'Y-m-d', strtotime( '+1 year' ) );
140138

141-
$paged = get_query_var( 'paged', 1 );
139+
$paged = \get_query_var( 'paged', 1 );
142140
$skip = 0;
143141
$count = 0;
144142

145143
if ( $paged > 1 ) {
146-
$skip = ( $paged - 1 ) * get_option( 'posts_per_page' );
144+
$skip = ( $paged - 1 ) * \get_option( 'posts_per_page' );
147145
}
148146

149147
// Set user defined and default search parameters
@@ -152,21 +150,21 @@ protected function get_events() : array {
152150
'start' => $start_date,
153151
'end' => $end_date,
154152
'sort' => 'startDate',
155-
'category_id' => get_field( 'category' ) ?? [],
153+
'category_id' => \get_field( 'category' ) ?? [],
156154
];
157155

158156
$formatter = new EventzFormatter();
159157
$params = $formatter->format_query_params( $params );
160158

161159
$cache_group = 'page-events-search';
162-
$cache_key = md5( wp_json_encode( $params ) );
163-
$response = wp_cache_get( $cache_key, $cache_group );
160+
$cache_key = md5( \wp_json_encode( $params ) );
161+
$response = \wp_cache_get( $cache_key, $cache_group );
164162

165163
if ( empty( $response ) ) {
166164
$response = $this->do_get_events( $params );
167165

168166
if ( ! empty( $response ) ) {
169-
wp_cache_set(
167+
\wp_cache_set(
170168
$cache_key,
171169
$response,
172170
$cache_group,
@@ -203,7 +201,7 @@ protected function get_events() : array {
203201
* @return string|null
204202
*/
205203
protected function get_results_text( $event_count ) : ?string {
206-
$event_search_text = get_query_var( self::EVENT_SEARCH_TEXT );
204+
$event_search_text = \get_query_var( self::EVENT_SEARCH_TEXT );
207205

208206
if ( $event_count > 0 && ! empty( $event_search_text ) ) {
209207
$results_text = sprintf(
@@ -243,7 +241,7 @@ protected function do_get_events( array $params ) : array {
243241
$event_data['events'] = ( new EventzFormatter() )->format_events( $event_data['events'] );
244242

245243
$event_data['events'] = array_map( function ( $item ) {
246-
$item['short_description'] = wp_trim_words( $item['short_description'], 30 );
244+
$item['short_description'] = \wp_trim_words( $item['short_description'], 30 );
247245
$item['location_icon'] = isset( $item['is_virtual_event'] )
248246
? 'globe'
249247
: 'location';
@@ -294,8 +292,8 @@ protected function do_api_call( array $params ) : array {
294292
* @return void
295293
*/
296294
protected function set_pagination_data( int $event_count ) : void {
297-
$per_page = get_option( 'posts_per_page' );
298-
$paged = get_query_var( 'paged' ) ? get_query_var( 'paged' ) : 1;
295+
$per_page = \get_option( 'posts_per_page' );
296+
$paged = \get_query_var( 'paged' ) ? \get_query_var( 'paged' ) : 1;
299297

300298
$this->pagination = new stdClass();
301299
$this->pagination->page = $paged;

0 commit comments

Comments
 (0)