diff --git a/eme-calendar.php b/eme-calendar.php index 8f6b69b8..f27d70b7 100644 --- a/eme-calendar.php +++ b/eme-calendar.php @@ -675,7 +675,7 @@ function eme_calendar_ajax() { function eme_replace_calendar_placeholders( $format, $event, $cal_day, $target = 'html', $lang = '' ) { // replace EME language tags as early as possible - $format = eme_translate_string_nowptrans( $format ); + $format = eme_translate_string( $format ); if ( $target == 'htmlmail' || $target == 'html_nohtml2br' ) { $target = 'html'; diff --git a/eme-events.php b/eme-events.php index 1724d3b9..fd8bfccd 100644 --- a/eme-events.php +++ b/eme-events.php @@ -668,7 +668,7 @@ function eme_events_page() { } $feedback_message = __( 'New event successfully inserted!', 'events-made-easy' ); if ( $stay_on_edit_page ) { - $info = [ 'title' => sprintf( __( "Edit Event '%s'", 'events-made-easy' ), eme_translate_nowptrans( $event['event_name'] ) ) ]; + $info = [ 'title' => sprintf( __( "Edit Event '%s'", 'events-made-easy' ), eme_translate( $event['event_name'] ) ) ]; $info['feedback'] = $feedback_message; $event = eme_get_event( $event_id ); if ( ! empty( $event ) ) { @@ -701,7 +701,7 @@ function eme_events_page() { $feedback_message = __( 'Recurrence no longer contains events, so it has been removed', 'events-made-easy' ); } } else { - $feedback_message = sprintf( __( "You have no right to update '%s'", 'events-made-easy' ), eme_translate_nowptrans( $orig_event['event_name'] ) ); + $feedback_message = sprintf( __( "You have no right to update '%s'", 'events-made-easy' ), eme_translate( $orig_event['event_name'] ) ); } } elseif ( current_user_can( get_option( 'eme_cap_edit_events' ) ) || ( current_user_can( get_option( 'eme_cap_author_event' ) ) && $orig_event['event_author'] == $current_userid ) ) { @@ -736,9 +736,9 @@ function eme_events_page() { $event = eme_get_event( $event_ID ); do_action( 'eme_update_event_action', $event ); } - $feedback_message = sprintf( __( "Updated '%s'", 'events-made-easy' ), eme_translate_nowptrans( $event['event_name'] ) ); + $feedback_message = sprintf( __( "Updated '%s'", 'events-made-easy' ), eme_translate( $event['event_name'] ) ); if ( $stay_on_edit_page ) { - $info = [ 'title' => sprintf( __( "Edit Event '%s'", 'events-made-easy' ), eme_translate_nowptrans( $event['event_name'] ) ) ]; + $info = [ 'title' => sprintf( __( "Edit Event '%s'", 'events-made-easy' ), eme_translate( $event['event_name'] ) ) ]; $info['feedback'] = $feedback_message; $event = eme_get_event( $event_ID ); if ( ! empty( $event ) ) { @@ -747,11 +747,11 @@ function eme_events_page() { return; } } else { - $feedback_message = sprintf( __( "Failed to update '%s'", 'events-made-easy' ), eme_translate_nowptrans( $event['event_name'] ) ); + $feedback_message = sprintf( __( "Failed to update '%s'", 'events-made-easy' ), eme_translate( $event['event_name'] ) ); } } } else { - $feedback_message = sprintf( __( "You have no right to update '%s'", 'events-made-easy' ), eme_translate_nowptrans( $orig_event['event_name'] ) ); + $feedback_message = sprintf( __( "You have no right to update '%s'", 'events-made-easy' ), eme_translate( $orig_event['event_name'] ) ); } } @@ -797,10 +797,10 @@ function eme_events_page() { } elseif ( current_user_can( get_option( 'eme_cap_edit_events' ) ) || ( current_user_can( get_option( 'eme_cap_author_event' ) ) && $event['event_author'] == $current_userid ) ) { // UPDATE event - $info = [ 'title' => sprintf( __( "Edit Event '%s'", 'events-made-easy' ), eme_translate_nowptrans( $event['event_name'] ) ) ]; + $info = [ 'title' => sprintf( __( "Edit Event '%s'", 'events-made-easy' ), eme_translate( $event['event_name'] ) ) ]; eme_event_form( $event, $info ); } else { - $feedback_message = sprintf( __( "You have no right to update '%s'", 'events-made-easy' ), eme_translate_nowptrans( $event['event_name'] ) ); + $feedback_message = sprintf( __( "You have no right to update '%s'", 'events-made-easy' ), eme_translate( $event['event_name'] ) ); eme_events_table( $feedback_message ); } return; @@ -823,7 +823,7 @@ function eme_events_page() { $info = [ 'title' => sprintf( __( "Edit event copy '%s'", 'events-made-easy' ), $event['event_name'] ) ]; eme_event_form( $event, $info ); } else { - $feedback_message = sprintf( __( "You have no right to copy '%s'", 'events-made-easy' ), eme_translate_nowptrans( $event['event_name'] ) ); + $feedback_message = sprintf( __( "You have no right to copy '%s'", 'events-made-easy' ), eme_translate( $event['event_name'] ) ); eme_events_table( $feedback_message ); } return; @@ -844,7 +844,7 @@ function eme_events_page() { $info = [ 'title' => sprintf( __( "Edit recurrence copy '%s'", 'events-made-easy' ), $event['event_name'] ) ]; eme_event_form( $event, $info, 1 ); } else { - $feedback_message = sprintf( __( "You have no right to copy '%s'", 'events-made-easy' ), eme_translate_nowptrans( $event['event_name'] ) ); + $feedback_message = sprintf( __( "You have no right to copy '%s'", 'events-made-easy' ), eme_translate( $event['event_name'] ) ); eme_events_table( $feedback_message ); } return; @@ -859,10 +859,10 @@ function eme_events_page() { } if ( current_user_can( get_option( 'eme_cap_edit_events' ) ) || ( current_user_can( get_option( 'eme_cap_author_event' ) ) && $event['event_author'] == $current_userid ) ) { - $info = [ 'title' => __( 'Edit Recurrence', 'events-made-easy' ) . " '" . eme_translate_nowptrans( $event['event_name'] ) . "'" ]; + $info = [ 'title' => __( 'Edit Recurrence', 'events-made-easy' ) . " '" . eme_translate( $event['event_name'] ) . "'" ]; eme_event_form( $event, $info, 1 ); } else { - $feedback_message = sprintf( __( "You have no right to update '%s'", 'events-made-easy' ), eme_translate_nowptrans( $event['event_name'] ) ); + $feedback_message = sprintf( __( "You have no right to update '%s'", 'events-made-easy' ), eme_translate( $event['event_name'] ) ); eme_recurrences_table( $feedback_message ); } return; @@ -1899,7 +1899,7 @@ function eme_replace_generic_placeholders( $format, $target = 'html' ) { return $format; } // replace EME language tags as early as possible - $format = eme_translate_nowptrans( $format ); + $format = eme_translate( $format ); if ( $target == 'htmlmail' || $target == 'html_nohtml2br' ) { $target = 'html'; @@ -4063,7 +4063,7 @@ function eme_replace_event_placeholders( $format, $event, $target = 'html', $lan function eme_replace_notes_placeholders( $format, $event = '', $target = 'html' ) { // replace EME language tags as early as possible - $format = eme_translate_string_nowptrans( $format ); + $format = eme_translate_string( $format ); $orig_target = $target; if ( $target == 'htmlmail' || $target == 'html_nohtml2br' ) { @@ -10803,7 +10803,7 @@ function eme_ajax_events_select2() { ( current_user_can( get_option( 'eme_cap_send_mails' ) ) && ( $event['event_author'] == $current_userid || $event['event_contactperson_id'] == $current_userid ) ) ) { $records[] = [ 'id' => $event['event_id'], - 'text' => trim( eme_translate_nowptrans( $event['event_name'] ) . ' (' . eme_localized_date( $event['event_start'], EME_TIMEZONE, 1 ) . ')' ), + 'text' => trim( eme_translate( $event['event_name'] ) . ' (' . eme_localized_date( $event['event_start'], EME_TIMEZONE, 1 ) . ')' ), ]; ++$recordCount; } diff --git a/eme-formfields.php b/eme-formfields.php index 397227dc..dc36ca5d 100644 --- a/eme-formfields.php +++ b/eme-formfields.php @@ -711,7 +711,7 @@ function eme_get_formfield_html( $formfield, $field_name, $entered_val, $require # for text fields $value = $entered_val; if ( empty( $value ) ) { - $value = eme_translate_nowptrans( $field_tags ); + $value = eme_translate( $field_tags ); } if ( empty( $value ) ) { $value = $field_values; @@ -720,7 +720,7 @@ function eme_get_formfield_html( $formfield, $field_name, $entered_val, $require $html = ""; break; case 'hidden': - $value = eme_translate_nowptrans( $field_tags ); + $value = eme_translate( $field_tags ); if ( empty( $value ) ) { $value = $field_values; } @@ -740,7 +740,7 @@ function eme_get_formfield_html( $formfield, $field_name, $entered_val, $require case 'readonly': $value = eme_esc_html( $entered_val ); if ( empty( $value ) ) { - $value = eme_translate_nowptrans( $field_tags ); + $value = eme_translate( $field_tags ); } if ( empty( $value ) ) { $value = $field_values; @@ -755,7 +755,7 @@ function eme_get_formfield_html( $formfield, $field_name, $entered_val, $require $my_arr = []; // since the values for a dropdown field need not be unique, we give them as an array to be built with eme_ui_select foreach ( $values as $key => $val ) { - $tag = eme_translate_nowptrans( $tags[ $key ] ); + $tag = eme_translate( $tags[ $key ] ); $new_el = [ 0 => $val, 1 => $tag, @@ -771,7 +771,7 @@ function eme_get_formfield_html( $formfield, $field_name, $entered_val, $require $my_arr = []; // since the values for a dropdown field need not be unique, we give them as an array to be built with eme_ui_select foreach ( $values as $key => $val ) { - $tag = eme_translate_nowptrans( $tags[ $key ] ); + $tag = eme_translate( $tags[ $key ] ); $new_el = [ 0 => $val, 1 => $tag, @@ -789,7 +789,7 @@ function eme_get_formfield_html( $formfield, $field_name, $entered_val, $require # textarea $value = $entered_val; if ( empty( $value ) ) { - $value = eme_translate_nowptrans( $field_tags ); + $value = eme_translate( $field_tags ); } if ( empty( $value ) ) { $value = $field_values; @@ -804,7 +804,7 @@ function eme_get_formfield_html( $formfield, $field_name, $entered_val, $require $my_arr = []; foreach ( $values as $key => $val ) { $tag = $tags[ $key ]; - $my_arr[ $val ] = eme_translate_nowptrans( $tag ); + $my_arr[ $val ] = eme_translate( $tag ); } $html = eme_ui_radio( $entered_val, $field_name, $my_arr, true, $required, $class, $field_attributes . ' ' . $disabled ); break; @@ -815,7 +815,7 @@ function eme_get_formfield_html( $formfield, $field_name, $entered_val, $require $my_arr = []; foreach ( $values as $key => $val ) { $tag = $tags[ $key ]; - $my_arr[ $val ] = eme_translate_nowptrans( $tag ); + $my_arr[ $val ] = eme_translate( $tag ); } $html = eme_ui_radio( $entered_val, $field_name, $my_arr, false, $required, $class, $field_attributes . ' ' . $disabled ); break; @@ -826,7 +826,7 @@ function eme_get_formfield_html( $formfield, $field_name, $entered_val, $require $my_arr = []; foreach ( $values as $key => $val ) { $tag = $tags[ $key ]; - $my_arr[ $val ] = eme_translate_nowptrans( $tag ); + $my_arr[ $val ] = eme_translate( $tag ); } // checkboxes can't be made required in the frontend, since that would require all checkboxes to be checked // so we use a div+jquery to accomplish this @@ -846,7 +846,7 @@ function eme_get_formfield_html( $formfield, $field_name, $entered_val, $require $my_arr = []; foreach ( $values as $key => $val ) { $tag = $tags[ $key ]; - $my_arr[ $val ] = eme_translate_nowptrans( $tag ); + $my_arr[ $val ] = eme_translate( $tag ); } // checkboxes can't be made required in the frontend, since that would require all checkboxes to be checked // so we use a div+jquery to accomplish this @@ -927,7 +927,7 @@ function eme_get_formfield_html( $formfield, $field_name, $entered_val, $require # for date JS field $value = $entered_val; if ( empty( $value ) ) { - $value = eme_translate_nowptrans( $field_tags ); + $value = eme_translate( $field_tags ); } if ( empty( $value ) ) { $value = $field_values; @@ -949,7 +949,7 @@ function eme_get_formfield_html( $formfield, $field_name, $entered_val, $require # for datetime JS field $value = $entered_val; if ( empty( $value ) ) { - $value = eme_translate_nowptrans( $field_tags ); + $value = eme_translate( $field_tags ); } if ( empty( $value ) ) { $value = $field_values; @@ -971,7 +971,7 @@ function eme_get_formfield_html( $formfield, $field_name, $entered_val, $require # for time JS field $value = $entered_val; if ( empty( $value ) ) { - $value = eme_translate_nowptrans( $field_tags ); + $value = eme_translate( $field_tags ); } if ( empty( $value ) ) { $value = $field_values; @@ -1165,7 +1165,7 @@ function eme_replace_task_signupformfields_placeholders( $format ) { if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Last name', 'events-made-easy' ); } @@ -1181,7 +1181,7 @@ function eme_replace_task_signupformfields_placeholders( $format ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'First name', 'events-made-easy' ); } @@ -1190,7 +1190,7 @@ function eme_replace_task_signupformfields_placeholders( $format ) { if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Email', 'events-made-easy' ); } @@ -1203,7 +1203,7 @@ function eme_replace_task_signupformfields_placeholders( $format ) { if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Phone number', 'events-made-easy' ); } @@ -1212,7 +1212,7 @@ function eme_replace_task_signupformfields_placeholders( $format ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Comment', 'events-made-easy' ); } @@ -1231,7 +1231,7 @@ function eme_replace_task_signupformfields_placeholders( $format ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Date of birth', 'events-made-easy' ); } @@ -1243,7 +1243,7 @@ function eme_replace_task_signupformfields_placeholders( $format ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Place of birth', 'events-made-easy' ); } @@ -1253,7 +1253,7 @@ function eme_replace_task_signupformfields_placeholders( $format ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = eme_trans_esc_html( get_option( 'eme_address1_string' ) ); } @@ -1263,7 +1263,7 @@ function eme_replace_task_signupformfields_placeholders( $format ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = eme_trans_esc_html( get_option( 'eme_address2_string' ) ); } @@ -1273,7 +1273,7 @@ function eme_replace_task_signupformfields_placeholders( $format ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'City', 'events-made-easy' ); } @@ -1283,7 +1283,7 @@ function eme_replace_task_signupformfields_placeholders( $format ) { if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Postal code', 'events-made-easy' ); } @@ -1352,7 +1352,7 @@ function eme_replace_task_signupformfields_placeholders( $format ) { } else { $label = __( 'Subscribe', 'events-made-easy' ); } - $replacement = ""; + $replacement = ""; } else { $found = 0; } @@ -1482,7 +1482,7 @@ function eme_replace_cancelformfields_placeholders( $event ) { if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Last name', 'events-made-easy' ); } @@ -1494,7 +1494,7 @@ function eme_replace_cancelformfields_placeholders( $event ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'First name', 'events-made-easy' ); } @@ -1503,7 +1503,7 @@ function eme_replace_cancelformfields_placeholders( $event ) { if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Email', 'events-made-easy' ); } @@ -1515,7 +1515,7 @@ function eme_replace_cancelformfields_placeholders( $event ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Cancel reason', 'events-made-easy' ); } @@ -1533,7 +1533,7 @@ function eme_replace_cancelformfields_placeholders( $event ) { } else { $label = get_option( 'eme_rsvp_delbooking_submit_string' ); } - $replacement = ""; + $replacement = ""; } else { $found = 0; } @@ -1651,7 +1651,7 @@ function eme_replace_cancel_payment_placeholders( $format, $person, $booking_ids } else { $label = get_option( 'eme_rsvp_delbooking_submit_string' ); } - $replacement = ""; + $replacement = ""; } else { $found = 0; } @@ -1798,7 +1798,7 @@ function eme_replace_extra_multibooking_formfields_placeholders( $format, $event if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Last name', 'events-made-easy' ); } @@ -1814,7 +1814,7 @@ function eme_replace_extra_multibooking_formfields_placeholders( $format, $event if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'First name', 'events-made-easy' ); } @@ -1823,7 +1823,7 @@ function eme_replace_extra_multibooking_formfields_placeholders( $format, $event if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Date of birth', 'events-made-easy' ); } @@ -1833,7 +1833,7 @@ function eme_replace_extra_multibooking_formfields_placeholders( $format, $event if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Place of birth', 'events-made-easy' ); } @@ -1842,7 +1842,7 @@ function eme_replace_extra_multibooking_formfields_placeholders( $format, $event if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = eme_trans_esc_html( get_option( 'eme_address1_string' ) ); } @@ -1851,7 +1851,7 @@ function eme_replace_extra_multibooking_formfields_placeholders( $format, $event if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = eme_trans_esc_html( get_option( 'eme_address2_string' ) ); } @@ -1860,7 +1860,7 @@ function eme_replace_extra_multibooking_formfields_placeholders( $format, $event if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'City', 'events-made-easy' ); } @@ -1876,7 +1876,7 @@ function eme_replace_extra_multibooking_formfields_placeholders( $format, $event if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Postal code', 'events-made-easy' ); } @@ -1909,7 +1909,7 @@ function eme_replace_extra_multibooking_formfields_placeholders( $format, $event if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Email', 'events-made-easy' ); } @@ -1980,7 +1980,7 @@ function eme_replace_extra_multibooking_formfields_placeholders( $format, $event if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Password', 'events-made-easy' ); } @@ -1992,7 +1992,7 @@ function eme_replace_extra_multibooking_formfields_placeholders( $format, $event if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Phone number', 'events-made-easy' ); } @@ -2001,7 +2001,7 @@ function eme_replace_extra_multibooking_formfields_placeholders( $format, $event if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Phone number', 'events-made-easy' ); } @@ -2010,7 +2010,7 @@ function eme_replace_extra_multibooking_formfields_placeholders( $format, $event if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Comment', 'events-made-easy' ); } @@ -2028,14 +2028,14 @@ function eme_replace_extra_multibooking_formfields_placeholders( $format, $event } else { $label = get_option( 'eme_rsvp_addbooking_submit_string' ); } - $replacement = ""; + $replacement = ""; } elseif ( preg_match( '/#_DYNAMICPRICE$/', $result ) ) { $replacement = ""; } elseif ( preg_match( '/#_FIELDNAME\{(.+)\}/', $result, $matches ) ) { $field_key = $matches[1]; $formfield = eme_get_formfield( $field_key ); if ( ! empty( $formfield ) ) { - $replacement = eme_trans_nowptrans_esc_html( $formfield['field_name'] ); + $replacement = eme_trans_esc_html( $formfield['field_name'] ); } else { $found = 0; } @@ -2132,7 +2132,7 @@ function eme_replace_dynamic_rsvp_formfields_placeholders( $event, $booking, $fo $field_key = $matches[1]; $formfield = eme_get_formfield( $field_key ); if ( ! empty( $formfield ) ) { - $replacement = eme_trans_nowptrans_esc_html( $formfield['field_name'] ); + $replacement = eme_trans_esc_html( $formfield['field_name'] ); } else { $found = 0; } @@ -2247,7 +2247,7 @@ function eme_replace_dynamic_membership_formfields_placeholders( $membership, $m $field_key = $matches[1]; $formfield = eme_get_formfield( $field_key ); if ( ! empty( $formfield ) ) { - $replacement = eme_trans_nowptrans_esc_html( $formfield['field_name'] ); + $replacement = eme_trans_esc_html( $formfield['field_name'] ); } else { $found = 0; } @@ -2838,7 +2838,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Last name', 'events-made-easy' ); } @@ -2865,7 +2865,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'First name', 'events-made-easy' ); } @@ -2876,7 +2876,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Date of birth', 'events-made-easy' ); } @@ -2890,7 +2890,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Place of birth', 'events-made-easy' ); } @@ -2902,7 +2902,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = eme_trans_esc_html( get_option( 'eme_address1_string' ) ); } @@ -2914,7 +2914,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = eme_trans_esc_html( get_option( 'eme_address2_string' ) ); } @@ -2926,7 +2926,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'City', 'events-made-easy' ); } @@ -2938,7 +2938,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Postal code', 'events-made-easy' ); } @@ -2979,7 +2979,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Email', 'events-made-easy' ); } @@ -2998,7 +2998,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Phone number', 'events-made-easy' ); } @@ -3010,7 +3010,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Phone number', 'events-made-easy' ); } @@ -3102,7 +3102,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'First name', 'events-made-easy' ); } @@ -3187,7 +3187,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Comment', 'events-made-easy' ); } @@ -3203,7 +3203,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' $field_key = $matches[1]; $formfield = eme_get_formfield( $field_key ); if ( ! empty( $formfield ) ) { - $replacement = eme_trans_nowptrans_esc_html( $formfield['field_name'] ); + $replacement = eme_trans_esc_html( $formfield['field_name'] ); } else { $found = 0; } @@ -3288,7 +3288,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Discount code', 'events-made-easy' ); } @@ -3332,7 +3332,7 @@ function eme_replace_rsvp_formfields_placeholders( $event, $booking, $format = ' } else { $label = get_option( 'eme_rsvp_addbooking_submit_string' ); } - $replacement .= ""; + $replacement .= ""; } } else { $found = 0; @@ -3418,7 +3418,7 @@ function eme_replace_membership_familyformfields_placeholders( $format, $counter if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Last name', 'events-made-easy' ); } @@ -3434,7 +3434,7 @@ function eme_replace_membership_familyformfields_placeholders( $format, $counter if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'First name', 'events-made-easy' ); } @@ -3450,7 +3450,7 @@ function eme_replace_membership_familyformfields_placeholders( $format, $counter if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Phone number', 'events-made-easy' ); } @@ -3465,7 +3465,7 @@ function eme_replace_membership_familyformfields_placeholders( $format, $counter if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Email', 'events-made-easy' ); } @@ -3506,7 +3506,7 @@ function eme_replace_membership_familyformfields_placeholders( $format, $counter if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Place of birth', 'events-made-easy' ); } @@ -3522,7 +3522,7 @@ function eme_replace_membership_familyformfields_placeholders( $format, $counter if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Date of birth', 'events-made-easy' ); } @@ -3533,7 +3533,7 @@ function eme_replace_membership_familyformfields_placeholders( $format, $counter $field_key = $matches[1]; $formfield = eme_get_formfield( $field_key ); if ( ! empty( $formfield ) ) { - $replacement = eme_trans_nowptrans_esc_html( $formfield['field_name'] ); + $replacement = eme_trans_esc_html( $formfield['field_name'] ); } else { $found = 0; } @@ -3804,7 +3804,7 @@ function eme_replace_membership_formfields_placeholders( $membership, $member, $ if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Last name', 'events-made-easy' ); } @@ -3828,7 +3828,7 @@ function eme_replace_membership_formfields_placeholders( $membership, $member, $ if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'First name', 'events-made-easy' ); } @@ -3839,7 +3839,7 @@ function eme_replace_membership_formfields_placeholders( $membership, $member, $ if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Date of birth', 'events-made-easy' ); } @@ -3850,7 +3850,7 @@ function eme_replace_membership_formfields_placeholders( $membership, $member, $ if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Place of birth', 'events-made-easy' ); } @@ -3860,7 +3860,7 @@ function eme_replace_membership_formfields_placeholders( $membership, $member, $ if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = eme_trans_esc_html( get_option( 'eme_address1_string' ) ); } @@ -3870,7 +3870,7 @@ function eme_replace_membership_formfields_placeholders( $membership, $member, $ if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = eme_trans_esc_html( get_option( 'eme_address2_string' ) ); } @@ -3880,7 +3880,7 @@ function eme_replace_membership_formfields_placeholders( $membership, $member, $ if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'City', 'events-made-easy' ); } @@ -3890,7 +3890,7 @@ function eme_replace_membership_formfields_placeholders( $membership, $member, $ if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Postal code', 'events-made-easy' ); } @@ -3928,7 +3928,7 @@ function eme_replace_membership_formfields_placeholders( $membership, $member, $ if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Email', 'events-made-easy' ); } @@ -3939,7 +3939,7 @@ function eme_replace_membership_formfields_placeholders( $membership, $member, $ if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Phone number', 'events-made-easy' ); } @@ -4026,7 +4026,7 @@ function eme_replace_membership_formfields_placeholders( $membership, $member, $ if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Discount code', 'events-made-easy' ); } @@ -4099,7 +4099,7 @@ function eme_replace_membership_formfields_placeholders( $membership, $member, $ $field_key = $matches[1]; $formfield = eme_get_formfield( $field_key ); if ( ! empty( $formfield ) ) { - $replacement = eme_trans_nowptrans_esc_html( $formfield['field_name'] ); + $replacement = eme_trans_esc_html( $formfield['field_name'] ); } else { $found = 0; } @@ -4158,7 +4158,7 @@ function eme_replace_membership_formfields_placeholders( $membership, $member, $ } else { $label = __( 'Become member', 'events-made-easy' ); } - $replacement = ""; + $replacement = ""; } else { $found = 0; } @@ -4266,7 +4266,7 @@ function eme_replace_subscribeform_placeholders( $format, $unsubscribe = 0 ) { if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Last name', 'events-made-easy' ); } @@ -4280,7 +4280,7 @@ function eme_replace_subscribeform_placeholders( $format, $unsubscribe = 0 ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'First name', 'events-made-easy' ); } @@ -4293,7 +4293,7 @@ function eme_replace_subscribeform_placeholders( $format, $unsubscribe = 0 ) { if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Email', 'events-made-easy' ); } @@ -4358,7 +4358,7 @@ function eme_replace_subscribeform_placeholders( $format, $unsubscribe = 0 ) { } else { $label = __( 'Subscribe', 'events-made-easy' ); } - $replacement = ""; + $replacement = ""; } else { $found = 0; } @@ -4446,7 +4446,7 @@ function eme_replace_cpiform_placeholders( $format, $person ) { if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Last name', 'events-made-easy' ); } @@ -4461,7 +4461,7 @@ function eme_replace_cpiform_placeholders( $format, $person ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'First name', 'events-made-easy' ); } @@ -4475,7 +4475,7 @@ function eme_replace_cpiform_placeholders( $format, $person ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Date of birth', 'events-made-easy' ); } @@ -4486,7 +4486,7 @@ function eme_replace_cpiform_placeholders( $format, $person ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Place of birth', 'events-made-easy' ); } @@ -4494,7 +4494,7 @@ function eme_replace_cpiform_placeholders( $format, $person ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = eme_trans_esc_html( get_option( 'eme_address1_string' ) ); } @@ -4503,7 +4503,7 @@ function eme_replace_cpiform_placeholders( $format, $person ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = eme_trans_esc_html( get_option( 'eme_address2_string' ) ); } @@ -4512,7 +4512,7 @@ function eme_replace_cpiform_placeholders( $format, $person ) { if ( isset( $matches[1] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[1], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'City', 'events-made-easy' ); } @@ -4528,7 +4528,7 @@ function eme_replace_cpiform_placeholders( $format, $person ) { if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Postal code', 'events-made-easy' ); } @@ -4557,7 +4557,7 @@ function eme_replace_cpiform_placeholders( $format, $person ) { if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Email', 'events-made-easy' ); } @@ -4571,7 +4571,7 @@ function eme_replace_cpiform_placeholders( $format, $person ) { if ( isset( $matches[2] ) ) { // remove { and } (first and last char of second match) $placeholder_text = substr( $matches[2], 1, -1 ); - $placeholder_text = eme_trans_nowptrans_esc_html( $placeholder_text ); + $placeholder_text = eme_trans_esc_html( $placeholder_text ); } else { $placeholder_text = esc_html__( 'Phone number', 'events-made-easy' ); } @@ -4620,7 +4620,7 @@ function eme_replace_cpiform_placeholders( $format, $person ) { $field_key = $matches[1]; $formfield = eme_get_formfield( $field_key ); if ( ! empty( $formfield ) ) { - $replacement = eme_trans_nowptrans_esc_html( $formfield['field_name'] ); + $replacement = eme_trans_esc_html( $formfield['field_name'] ); } else { $found = 0; } @@ -4676,7 +4676,7 @@ function eme_replace_cpiform_placeholders( $format, $person ) { } else { $label = __( 'Save personal info', 'events-made-easy' ); } - $replacement = ""; + $replacement = ""; } else { $found = 0; } diff --git a/eme-fs.php b/eme-fs.php index d7bb08de..13ca05a1 100644 --- a/eme-fs.php +++ b/eme-fs.php @@ -364,7 +364,7 @@ function eme_event_fs_form( $template_id, $startdatetime ) { } else { $label = __( 'Create event', 'events-made-easy' ); } - $replacement = ""; + $replacement = ""; } else { $found = 0; } diff --git a/eme-locations.php b/eme-locations.php index 6dc89cb3..17d6e2ab 100644 --- a/eme-locations.php +++ b/eme-locations.php @@ -1843,7 +1843,7 @@ function eme_get_locations_shortcode( $atts ) { function eme_replace_event_location_placeholders( $format, $event, $target = 'html', $do_shortcode = 1, $lang = '' ) { // replace EME language tags as early as possible - $format = eme_translate_string_nowptrans( $format ); + $format = eme_translate_string( $format ); $orig_target = $target; if ( $target == 'htmlmail' || $target == 'html_nohtml2br' ) { @@ -1872,7 +1872,7 @@ function eme_replace_event_location_placeholders( $format, $event, $target = 'ht function eme_replace_locations_placeholders( $format, $location = '', $target = 'html', $do_shortcode = 1, $lang = '', $avoid_double_code = 0 ) { // replace EME language tags as early as possible - $format = eme_translate_string_nowptrans( $format ); + $format = eme_translate_string( $format ); $orig_target = $target; if ( $target == 'htmlmail' || $target == 'html_nohtml2br' ) { @@ -2545,7 +2545,7 @@ function eme_replace_locations_placeholders( $format, $location = '', $target = function eme_replace_locationnotes_placeholders( $format, $location, $target = 'html' ) { // replace EME language tags as early as possible - $format = eme_translate_string_nowptrans( $format ); + $format = eme_translate_string( $format ); if ( $target == 'htmlmail' || $target == 'html_nohtml2br' ) { $target = 'html'; diff --git a/eme-members.php b/eme-members.php index 180023d3..c7260699 100644 --- a/eme-members.php +++ b/eme-members.php @@ -5123,7 +5123,7 @@ function eme_replace_member_placeholders( $format, $membership, $member, $target } // replace EME language tags as early as possible - $format = eme_translate_string_nowptrans( $format ); + $format = eme_translate_string( $format ); if ( $member['person_id'] == -1 ) { // -1 ? then this is from a fake member @@ -5672,7 +5672,7 @@ function eme_replace_member_placeholders( $format, $membership, $member, $target function eme_replace_membership_placeholders( $format, $membership, $target = 'html', $lang = '', $do_shortcode = 1, $recursion_level = 0 ) { // replace EME language tags as early as possible - $format = eme_translate_string_nowptrans( $format ); + $format = eme_translate_string( $format ); $orig_target = $target; if ( $target == 'htmlmail' || $target == 'html_nohtml2br' ) { diff --git a/eme-people.php b/eme-people.php index 8b81e01f..e7db47a7 100644 --- a/eme-people.php +++ b/eme-people.php @@ -273,7 +273,7 @@ function eme_people_shortcode( $atts ) { function eme_replace_email_event_placeholders( $format, $email, $lastname, $firstname, $event, $lang = '' ) { // EME language tags are already replaced - //$format = eme_translate_string_nowptrans( $format ); + //$format = eme_translate_string( $format ); $needle_offset = 0; preg_match_all( '/#(ESC|URL)?@?_?[A-Za-z0-9_]+(\{(?>[^{}]+|(?2))*\})*+/', $format, $placeholders, PREG_OFFSET_CAPTURE ); diff --git a/eme-rsvp.php b/eme-rsvp.php index e405d2c1..c8ace855 100644 --- a/eme-rsvp.php +++ b/eme-rsvp.php @@ -3380,7 +3380,7 @@ function eme_get_bookings_list_for_wp_id( $wp_id, $scope, $template = '', $templ function eme_replace_booking_placeholders( $format, $event, $booking, $is_multibooking = 0, $target = 'html', $lang = '', $take_answers_from_post = 0 ) { // replace EME language tags as early as possible - $format = eme_translate_string_nowptrans( $format ); + $format = eme_translate_string( $format ); $orig_target = $target; if ( $target == 'htmlmail' || $target == 'html_nohtml2br' ) { @@ -3976,7 +3976,7 @@ function eme_replace_booking_placeholders( $format, $event, $booking, $is_multib function eme_replace_attendees_placeholders( $format, $event, $person, $target = 'html', $lang = '' ) { // replace EME language tags as early as possible - $format = eme_translate_string_nowptrans( $format ); + $format = eme_translate_string( $format ); $orig_target = $target; if ( $target == 'htmlmail' || $target == 'html_nohtml2br' ) { diff --git a/eme-tasks.php b/eme-tasks.php index d4ea0426..c6723f65 100644 --- a/eme-tasks.php +++ b/eme-tasks.php @@ -887,7 +887,7 @@ function eme_mytasks_signups_shortcode( $atts ) { $format = eme_get_template_format( $template_id ); } if ( empty( $format ) ) { - $format = eme_translate_string_nowptrans( get_option( 'eme_task_signup_format' ) ); + $format = eme_translate_string( get_option( 'eme_task_signup_format' ) ); } if ( ! empty( $template_id_header ) ) { diff --git a/eme-templates.php b/eme-templates.php index a52ce61f..92e64f14 100644 --- a/eme-templates.php +++ b/eme-templates.php @@ -430,7 +430,7 @@ function eme_get_template_format( $template_id, $nl2br_wanted = 1 ) { } } // interpret EME language tags already, so if the format contains placeholders (that - once expanded - might contain other language tags), don't get confused (nested tags not supported yet). - $format = eme_translate_string_nowptrans( $format ); + $format = eme_translate_string( $format ); // if we don't want nl2br, return the format as is if ( $nl2br_wanted == 0 || empty( $format ) ) { return $format; diff --git a/eme-translate.php b/eme-translate.php index ab9eda02..c95d565e 100644 --- a/eme-translate.php +++ b/eme-translate.php @@ -95,16 +95,8 @@ function eme_trans_sanitize_html( $value, $lang = '' ) { return eme_trans_esc_html( $value, $lang ); } -function eme_trans_nowptrans_esc_html( $value, $lang = '' ) { - return eme_trans_esc_html( $value, $lang, 0 ); -} - -function eme_trans_esc_html( $value, $lang = '', $use_wp_trans = 1 ) { - return eme_esc_html( eme_translate( $value, $lang, $use_wp_trans ) ); -} - -function eme_translate_nowptrans( $value, $lang = '' ) { - return eme_translate( $value, $lang, 0 ); +function eme_trans_esc_html( $value, $lang = '' ) { + return eme_esc_html( eme_translate( $value, $lang ) ); } function eme_translate( $value, $lang = '', $use_wp_trans = 1 ) { @@ -129,7 +121,7 @@ function eme_translate( $value, $lang = '', $use_wp_trans = 1 ) { } } elseif ( function_exists( 'pll_translate_string' ) && function_exists( 'pll__' ) ) { // pll language notation is different from what qtrans (and eme) support, so lets also translate the eme language tags - $value = eme_translate_string( $value, $lang, $use_wp_trans ); + $value = eme_translate_string( $value, $lang ); if ( empty( $lang ) ) { $translated = pll__( $value ); } else { @@ -139,15 +131,11 @@ function eme_translate( $value, $lang = '', $use_wp_trans = 1 ) { if ( $translated != $value ) { return $translated; } else { - return eme_translate_string( $value, $lang, $use_wp_trans ); + return eme_translate_string( $value, $lang ); } } -function eme_translate_string_nowptrans( $value, $lang = '' ) { - return eme_translate_string( $value, $lang, 0 ); -} - -function eme_translate_string( $text, $lang = '', $use_wp_trans = 1 ) { +function eme_translate_string( $text, $lang = '' ) { if ( empty( $text ) ) { return $text; } @@ -156,12 +144,7 @@ function eme_translate_string( $text, $lang = '', $use_wp_trans = 1 ) { } $languages = eme_detect_used_languages( $text ); if ( empty( $languages ) ) { - if ( $use_wp_trans ) { - // no language is encoded in the $text (most frequent case), then run it through wp trans and be done with it - return __( $text, 'events-made-easy' ); - } else { - return $text; - } + return $text; } $content = eme_split_language_blocks( $text, $languages ); $languages = array_keys( $content );