Merge pull request #1542 from WordImpress/issue/1510

Issue/1510

includes/admin/forms/class-metabox-form-data.php

@@ -476,7 +476,7 @@ function get_settings() {
 				'fields'    => apply_filters( 'give_forms_terms_options_metabox_fields', array(
 					// Donation Option
 					array(
-						'name'        => esc_html__( 'Terms & Conditions', 'give' ),
+						'name'        => esc_html__( 'Terms and Conditions', 'give' ),
 						'description' => esc_html__( 'Do you want to require the donor to accept terms prior to being able to complete their donation?', 'give' ),
 						'id'          => $prefix . 'terms_option',
 						'type'        => 'radio_inline',
@@ -508,7 +508,7 @@ function get_settings() {
 						'name'  => 'terms_docs',
 						'type'  => 'docs_link',
 						'url'   => 'http://docs.givewp.com/form-terms',
-						'title' => esc_html__( 'Terms & Conditions', 'give' ),
+						'title' => esc_html__( 'Terms and Conditions', 'give' ),
 					),
 				),
 					$post_id

includes/admin/settings/class-settings-cmb2-backward-compatibility.php

@@ -445,7 +445,7 @@ function get_filtered_addon_settings( $settings, $setting_fields = array() ) {
 		function get_section_settings( $tab_settings ) {
 			$current_section = give_get_current_setting_section();
 
-			// Note: If we are opening default tabe for addon setting then it is possible that we will get empty string as current section
+			// Note: If we are opening default tab for addon setting then it is possible that we will get empty string as current section
 			// because default section filter added after save hook fire, so we will always get problem to save first section [default] or if there are only on section
 			// This is hack to fix this.
 			if ( empty( $current_section ) ) {
@@ -473,7 +473,7 @@ function get_section_settings( $tab_settings ) {
 				}
 			}
 
-			// Remove title from setting, pevent it from render in setting tab.
+			// Remove title from setting, prevent it from render in setting tab.
 			$section_only_setting_fields[0]['title'] = '';
 
 			return apply_filters( "give_get_settings_{$this->current_tab}_{$current_section}", $section_only_setting_fields, $tab_settings );