Changeset 3453503

Timestamp:

02/04/2026 06:10:38 AM (2 weeks ago)

Author:

ThemeHigh

Message:

V2.1.6

Location:

woo-checkout-field-editor-pro/trunk

Files:

• admin/class-thwcfd-admin-form-block-field.php (modified) (2 diffs)
• admin/class-thwcfd-admin-form.php (modified) (4 diffs)
• admin/class-thwcfd-admin-settings-advanced.php (modified) (2 diffs)
• admin/class-thwcfd-admin-settings-block-fields.php (modified) (5 diffs)
• admin/class-thwcfd-admin-settings-general.php (modified) (4 diffs)
• admin/class-thwcfd-admin-settings-pro.php (modified) (2 diffs)
• admin/class-thwcfd-admin-settings-themehigh-plugins.php (modified) (3 diffs)
• admin/class-thwcfd-admin-settings.php (modified) (2 diffs)
• admin/class-thwcfd-admin.php (modified) (7 diffs)
• admin/thwcfd-landing-page.php (modified) (12 diffs)
• block/assets/dist/style-additional-sections-frontend-rtl.css (modified) (1 diff)
• block/assets/dist/style-additional-sections-frontend.css (modified) (1 diff)
• block/assets/dist/style-contact-info-section-frontend-rtl.css (modified) (1 diff)
• block/assets/dist/style-contact-info-section-frontend.css (modified) (1 diff)
• block/class-thwcfd-block-order-data.php (modified) (3 diffs)
• block/class-thwcfd-block.php (modified) (9 diffs)
• changelog.txt (modified) (1 diff)
• checkout-form-designer.php (modified) (2 diffs)
• includes/class-thwcfd.php (modified) (3 diffs)
• includes/utils/class-thwcfd-utils-block.php (modified) (3 diffs)
• includes/utils/class-thwcfd-utils.php (modified) (6 diffs)
• languages/woo-checkout-field-editor-pro.pot (modified) (14 diffs)
• public/class-thwcfd-public-checkout.php (modified) (16 diffs)
• readme.txt (modified) (10 diffs)

woo-checkout-field-editor-pro/trunk/admin/class-thwcfd-admin-form-block-field.php

@@ -380 +380 @@
     private function render_form_field_checkbox( $section = '' ){
         $value_props = $this->field_props['value'];
-        $value_props['label'] = __('Value', 'woocommerce');
+        $value_props['label'] = __('Value', 'woo-checkout-field-editor-pro');
 
         ?>
@@ -469 +469 @@
         ?>
         <tr>
-            <td class="sub-title"><?php esc_html_e('Options', 'woocommerce'); ?></td>
+            <td class="sub-title"><?php esc_html_e('Options', 'woo-checkout-field-editor-pro'); ?></td>
             <?php $this->render_form_fragment_tooltip(); ?>
             <td></td>

woo-checkout-field-editor-pro/trunk/admin/class-thwcfd-admin-form.php

@@ -205 +205 @@
             foreach($field['options'] as $value => $label){
                 $selected = $value === $fvalue ? 'selected' : '';
-                $field_html .= '<option value="'. esc_attr(trim($value)) .'" '.esc_attr($selected).'>'. esc_html__($label, 'woo-checkout-field-editor-pro') .'</option>';
+                $label = THWCFD_Utils::translate_dynamic_text($label, 'option');
+                $field_html .= '<option value="'. esc_attr(trim($value)) .'" '.esc_attr($selected).'>'. esc_html($label) .'</option>';
             }
             $field_html .= '</select>';
@@ -229 +230 @@
             foreach($field['options'] as $value => $label){
                 //$selected = $value === $fvalue ? 'selected' : '';
-                $field_html .= '<option value="'. esc_attr(trim($value)) .'" >'. esc_html__($label, 'woo-checkout-field-editor-pro') .'</option>';
+                $label = THWCFD_Utils::translate_dynamic_text($label, 'option');
+                $field_html .= '<option value="'. esc_attr(trim($value)) .'" >'. esc_html($label) .'</option>';
             }
             $field_html .= '</select>';
@@ -250 +252 @@
                         $value = $value.$field['glue'].trim($label);
                     }
-
-                    $field_html .= '<option value="'. esc_attr($value) .'">'. esc_html__($label, 'woo-checkout-field-editor-pro') .'</option>';
+                    $label = THWCFD_Utils::translate_dynamic_text($label, 'option');
+                    $field_html .= '<option value="'. esc_attr($value) .'">'. esc_html($label) .'</option>';
                 }
 
@@ -289 +291 @@
 
             $fid    = $args['id_prefix']. $field['name'];
-            $flabel = isset($field['label']) && !empty($field['label']) ? __($field['label'], 'woo-checkout-field-editor-pro') : '';
+            $flabel = isset($field['label']) && !empty($field['label']) ? THWCFD_Utils::translate_dynamic_text($field['label'], 'label') : '';
 
             $field_props  = $this->prepare_form_field_props($field, $atts);

woo-checkout-field-editor-pro/trunk/admin/class-thwcfd-admin-settings-advanced.php

@@ -218 +218 @@
         
         $imp_exp_fields = array(
-            'section_import_export' => array('title'=>__('Backup and Import Settings', 'woo-checkout-field-editor'), 'type'=>'separator', 'colspan'=>'3'),
+            'section_import_export' => array('title'=>__('Backup and Import Settings', 'woo-checkout-field-editor-pro'), 'type'=>'separator', 'colspan'=>'3'),
             'settings_data' => array(
-                'name'=>'settings_data', 'label'=>__('Plugin Settings Data', 'woo-checkout-field-editor'), 'type'=>'textarea', 'value' => $plugin_settings,
-                'sub_label'=>__('You can transfer the saved settings data between different installs by copying the text inside the text box. To import data from another install, replace the data in the text box with the one from another install and click "Import Settings".', 'woo-checkout-field-editor'),
+                'name'=>'settings_data', 'label'=>__('Plugin Settings Data', 'woo-checkout-field-editor-pro'), 'type'=>'textarea', 'value' => $plugin_settings,
+                'sub_label'=>__('You can transfer the saved settings data between different installs by copying the text inside the text box. To import data from another install, replace the data in the text box with the one from another install and click "Import Settings".', 'woo-checkout-field-editor-pro'),
             ),
         );
@@ -238 +238 @@
                             <td colspan="2">&nbsp;</td>
                             <td class="submit">
-                                <input type="submit" name="save_plugin_settings" class="btn btn-small btn-primary" value="<?php esc_attr_e('Import Settings', 'woo-checkout-field-editor'); ?>">
+                                <input type="submit" name="save_plugin_settings" class="btn btn-small btn-primary" value="<?php esc_attr_e('Import Settings', 'woo-checkout-field-editor-pro'); ?>">
                                 <?php wp_nonce_field( 'import_wcfd_settings', 'import_wcfd_nonce' ); ?>
                             </td>

woo-checkout-field-editor-pro/trunk/admin/class-thwcfd-admin-settings-block-fields.php

@@ -184 +184 @@
                                 
                                 if(isset($property['status']) && $property['status'] == 1){
-                                    $statusHtml = $pvalue == 1 ? '<span class="dashicons dashicons-yes tips" data-tip="'. esc_attr(__('Yes', 'woocommerce')).'"></span>' : '-';
+                                    $statusHtml = $pvalue == 1 ? '<span class="dashicons dashicons-yes tips" data-tip="'. esc_attr(__('Yes', 'woo-checkout-field-editor-pro')).'"></span>' : '-';
                                     ?>
                                     <td class="td_<?php echo esc_attr($pname); ?> status"><?php echo wp_kses($statusHtml, array('span' => array('class' => true))); ?></td>
@@ -319 +319 @@
             if(THWCFD_Utils_Section::is_valid_section($section)){
                 $f_names = !empty( $_POST['f_name'] ) ? $_POST['f_name'] : array(); 
+                $f_names = array_map('sanitize_key', $f_names);
                 if(empty($f_names)){
                     echo '<div class="error"><p> '. esc_html__('Your changes were not saved due to no fields found.', 'woo-checkout-field-editor-pro') .'</p></div>';
@@ -325 +326 @@
                 
                 $f_order   = !empty( $_POST['f_order'] ) ? $_POST['f_order'] : array(); 
+                $f_order = array_map('absint', $f_order);
                 $f_deleted = !empty( $_POST['f_deleted'] ) ? $_POST['f_deleted'] : array();
-                $f_enabled = !empty( $_POST['f_enabled'] ) ? $_POST['f_enabled'] : array();     
+                $f_deleted = array_map('absint', $f_deleted);
+                $f_enabled = !empty( $_POST['f_enabled'] ) ? $_POST['f_enabled'] : array();
+                $f_enabled = array_map('absint', $f_enabled);       
                 $sname = $section->get_property('name');
                 $field_set = THWCFD_Utils_Section::get_fields($section);
@@ -515 +519 @@
         $c_url = $this->get_admin_url($this->page_id, 'classic');
         $b_url = $this->get_admin_url($this->page_id, 'block');
-        $tt_content = esc_html("You're on the Classic Checkout Field Editor right now. If your store is not using Classic Checkout, fields you add here won’t appear on the checkout page. Unsure which checkout type your store is using?", 'woocommerce-checkout-field-editor-pro');
-        if ( !empty( $_GET['c_type'] ) && 'block' == $_GET['c_type'] ) {
-            $tt_content = esc_html("You're on the Block Checkout Field Editor right now. If your store is not using Block Checkout, fields you add here won’t appear on the checkout page. Unsure which checkout type your store is using?", 'woocommerce-checkout-field-editor-pro');
+        $tt_content = esc_html("You're on the Classic Checkout Field Editor right now. If your store is not using Classic Checkout, fields you add here won’t appear on the checkout page. Unsure which checkout type your store is using?", 'woo-checkout-field-editor-pro');
+        if ( !empty( $_GET['c_type'] ) && 'block' == sanitize_key($_GET['c_type'] )) {
+            $tt_content = esc_html("You're on the Block Checkout Field Editor right now. If your store is not using Block Checkout, fields you add here won’t appear on the checkout page. Unsure which checkout type your store is using?", 'woo-checkout-field-editor-pro');
         }
         ?>
@@ -555 +559 @@
         
         $result = false;
-        $s_action = isset($_POST['s_action']) ? $_POST['s_action'] : false;
+        $s_action = isset($_POST['s_action']) ? sanitize_text_field(wp_unslash($_POST['s_action'])) : false;
 
         if($s_action == 'edit'){

woo-checkout-field-editor-pro/trunk/admin/class-thwcfd-admin-settings-general.php

@@ -153 +153 @@
                         $label = isset($field['label']) ? $field['label'] : '';
                         $placeholder = isset($field['placeholder']) ? $field['placeholder'] : '';
+                        $label = THWCFD_Utils::translate_dynamic_text($label, 'label');
+                        $placeholder = THWCFD_Utils::translate_dynamic_text($placeholder, 'placeholder');
                         $validate = isset($field['validate']) ? $field['validate'] : '';
                         $required = isset($field['required']) && $field['required'] ? 1 : 0;
@@ -185 +187 @@
                             <td class="td_name"><?php echo esc_html( $name ); ?></td>
                             <td class="td_type"><?php echo esc_html($type); ?></td>
-                            <td class="td_label"><?php echo esc_html_e($label, 'woo-checkout-field-editor-pro'); ?></td>
-                            <td class="td_placeholder"><?php echo esc_html_e($placeholder, 'woo-checkout-field-editor-pro'); ?></td>
+                            <?php /*
+                            // The following lines were removed because they violate WordPress i18n rules.
+                            <td class="td_placeholder"><?php echo esc_html_e($placeholder, 'woo-checkout-field-editor-pro'); ?></td> 
+                            <td class="td_placeholder"><?php echo esc_html_e($placeholder, 'woo-checkout-field-editor-pro'); ?></td> 
+                            */ ?>
+                            <td class="td_label"><?php echo esc_html($label); ?></td>
+                            <td class="td_placeholder"><?php echo esc_html($placeholder); ?></td>
                             <td class="td_validate"><?php echo esc_html($validate); ?></td>
                             <td class="td_required status"><?php echo wp_kses($required_status, array('span' => array('class' => true))); ?></td>
@@ -461 +468 @@
                     if(!empty($value)){
                         $value = THWCFD_Utils::get_option_text($field, $value);
-                        $label = isset($field['label']) && $field['label'] ? esc_html($field['label'], 'woo-checkout-field-editor-pro') : $name;
+                        $label = isset($field['label']) && $field['label'] ? esc_html(THWCFD_Utils::translate_dynamic_text($field['label'], 'label')) : $name;
                         $html .= '<p><strong>'. esc_html($label) .':</strong><br/> '. wp_kses_post(wptexturize($value)) .'</p>';
                     }
@@ -513 +520 @@
         $c_url = $this->get_admin_url($this->page_id, 'classic');
         $b_url = $this->get_admin_url($this->page_id, 'block');
-        $tt_content = esc_html("You're on the Classic Checkout Field Editor right now. If your store is not using Classic Checkout, fields you add here won’t appear on the checkout page. Unsure which checkout type your store is using?", 'woocommerce-checkout-field-editor-pro');
-        if ( !empty( $_GET['c_type'] ) && 'block' == $_GET['c_type'] ) {
-            $tt_content = esc_html("You're on the Block Checkout Field Editor right now. If your store is not using Block Checkout, fields you add here won’t appear on the checkout page. Unsure which checkout type your store is using?", 'woocommerce-checkout-field-editor-pro');
+        $tt_content = esc_html("You're on the Classic Checkout Field Editor right now. If your store is not using Classic Checkout, fields you add here won’t appear on the checkout page. Unsure which checkout type your store is using?", 'woo-checkout-field-editor-pro');
+        if ( !empty( $_GET['c_type'] ) && 'block' == sanitize_key($_GET['c_type'] )) {
+            $tt_content = esc_html("You're on the Block Checkout Field Editor right now. If your store is not using Block Checkout, fields you add here won’t appear on the checkout page. Unsure which checkout type your store is using?", 'woo-checkout-field-editor-pro');
         }
         ?>

woo-checkout-field-editor-pro/trunk/admin/class-thwcfd-admin-settings-pro.php

@@ -46 +46 @@
 
         if($now > $render_time){
-            $url = "https://www.themehigh.com/?edd_action=add_to_cart&download_id=12&cp=lyCDSy&utm_source=free&utm_medium=premium_tab&utm_campaign=wcfe_upgrade_link";
+            $url = "https://www.themehigh.com/?edd_action=add_to_cart&download_id=12&cp=lyCDSy&utm_source=wcfe_free&utm_medium=referral&utm_campaign=wcfe_premium_tab_upgrade_link";
         }else{
-            $url = "https://www.themehigh.com/product/woocommerce-checkout-field-editor-pro/?utm_source=free&utm_medium=premium_tab&utm_campaign=wcfe_upgrade_link";
+            $url = "https://www.themehigh.com/product/woocommerce-checkout-field-editor-pro/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=wcfe_premium_tab_upgrade_link";
         }
 
@@ -76 +76 @@
                     <h3 class="trydemo-heading">The Golden Perks that Come with the Checkout Field Editor Pro</h3>
                     <p class="try-demo-desc">The numerous advanced features that accompany the Checkout Field Editor Pro for WooCommerce plugin lets you create an organized and flawless checkout page. Why wait? Go pro and advance your checkout page to the next level now.</p>
-                    <div class="th-pro-btn"><a class="btn-get-pro" onclick="this.classList.add('clicked')" href="<?php echo esc_url($url); ?>" target="_blank" rel="noopener noreferrer" >Get Pro</a><a class="btn-try-demo" href="https://flydemos.com/wcfe/?utm_source=free&utm_medium=banner&utm_campaign=trydemo"
+                    <div class="th-pro-btn"><a class="btn-get-pro" onclick="this.classList.add('clicked')" href="<?php echo esc_url($url); ?>" target="_blank" rel="noopener noreferrer" >Get Pro</a><a class="btn-try-demo" href="https://flydemos.com/wcfe/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=premium_tab_try_demo"
                         target="_blank" rel="noopener noreferrer" onclick="this.classList.add('clicked')" >Try Demo</a></div>
                     <!-- <img class="vedio" src="" alt="no img">  ADD vedio tutorial-->

woo-checkout-field-editor-pro/trunk/admin/class-thwcfd-admin-settings-themehigh-plugins.php

@@ -231 +231 @@
                     // The plugin is already active.
                     $button = array(
-                        'message' => esc_attr__( 'Activated', 'storefront' ),
+                        'message' => esc_attr__( 'Activated', 'woo-checkout-field-editor-pro' ),
                         'url'     => '#',
                         'classes' => array('button', 'disabled' ),
@@ -244 +244 @@
                     // The plugin exists but isn't activated yet.
                     $button = array(
-                        'message' => esc_attr__( 'Activate', 'storefront' ),
+                        'message' => esc_attr__( 'Activate', 'woo-checkout-field-editor-pro' ),
                         'url'     => $url,
                         'classes' => array( 'activate-now', 'button' ),
@@ -265 +265 @@
                     );
                     $button = array(
-                        'message' => esc_attr__( 'Install now', 'storefront' ),
+                        'message' => esc_attr__( 'Install now', 'woo-checkout-field-editor-pro' ),
                         'url'     => $url,
                         'classes' => array('button-primary', 'install-now', 'install-' . $plugin_slug ),

woo-checkout-field-editor-pro/trunk/admin/class-thwcfd-admin-settings.php

@@ -157 +157 @@
         
             $ftype     = isset($field['type']) ? $field['type'] : 'text';
-            $flabel    = isset($field['label']) && !empty($field['label']) ? __($field['label'], 'woo-checkout-field-editor-pro') : '';
-            $sub_label = isset($field['sub_label']) && !empty($field['sub_label']) ? __($field['sub_label'], 'woo-checkout-field-editor-pro') : '';
-            $tooltip   = isset($field['hint_text']) && !empty($field['hint_text']) ? __($field['hint_text'], 'woo-checkout-field-editor-pro') : '';
+            $flabel    = isset($field['label']) && !empty($field['label']) ? $field['label'] : '';
+            $sub_label = isset($field['sub_label']) && !empty($field['sub_label']) ? $field['sub_label'] : '';
+            $tooltip   = isset($field['hint_text']) && !empty($field['hint_text']) ? $field['hint_text'] : '';
             
             $field_html = '';
@@ -258 +258 @@
         
             $fid    = 'a_f'. $field['name'];
-            $flabel = isset($field['label']) && !empty($field['label']) ? __($field['label'], 'woo-checkout-field-editor-pro') : '';
+            $flabel = isset($field['label']) && !empty($field['label']) ? $field['label'] : '';
             
             $field_props  = $this->prepare_form_field_props($field, $atts);

woo-checkout-field-editor-pro/trunk/admin/class-thwcfd-admin.php

@@ -70 +70 @@
         $settings_link = '<a href="'.esc_url(admin_url('admin.php?page=checkout_form_designer')).'">'. __('Settings', 'woo-checkout-field-editor-pro') .'</a>';
         array_unshift($links, $settings_link);
-        $pro_link = '<a style="color:green; font-weight:bold" target="_blank" href="https://www.themehigh.com/product/woocommerce-checkout-field-editor-pro/?utm_source=free&utm_medium=plugin_action_link&utm_campaign=wcfe_upgrade_link">'. __('Get Pro', 'woo-checkout-field-editor-pro') .'</a>';
+        $pro_link = '<a style="color:green; font-weight:bold" target="_blank" href="https://www.themehigh.com/product/woocommerce-checkout-field-editor-pro/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=wcfe_settings_upgrade_link">'. __('Get Pro', 'woo-checkout-field-editor-pro') .'</a>';
         array_push($links,$pro_link);
 
@@ -86 +86 @@
         if ( 'woo-checkout-field-editor-pro/checkout-form-designer.php' === $plugin_file ) {
             $plugin_meta[] = '<a href="https://www.facebook.com/groups/themehigh/" target="_blank">' . esc_html__( 'Join Community', 'woo-checkout-field-editor-pro' ) . '</a>';
-            $plugin_meta[] = '<a href="https://wordpress.org/support/plugin/woo-checkout-field-editor-pro/reviews/?filter=5" target="_blank">' . esc_html__( 'Review us', 'woo-checkout-field-editor-pro' ) . '</a>';
+            $plugin_meta[] = '<a href="https://wordpress.org/support/plugin/woo-checkout-field-editor-pro/reviews/" target="_blank">' . esc_html__( 'Review us', 'woo-checkout-field-editor-pro' ) . '</a>';
         }
         return $plugin_meta;
@@ -96 +96 @@
         echo '<h2>'. esc_html__('Checkout Form', 'woo-checkout-field-editor-pro') .'</h2>';
         $tab = $this->get_current_tab();
-        $c_type = isset( $_GET['c_type'] ) ? esc_attr( $_GET['c_type'] ) : 'classic';
+        $c_type = isset( $_GET['c_type'] ) ? sanitize_key( $_GET['c_type'] ) : 'classic';
 
         echo '<div class="thwcfd-wrap">';
@@ -138 +138 @@
                     <span class="th-warning-message-panel__inner-text">
                     <?php
+                        
                         printf(
+                            /* translators: %s: Support team link */
                             esc_html__("Our Checkout Field Editor now supports WooCommerce Checkout Blocks! Currently, a few field types are available, and more will be added soon. 
                             If you're using Block Checkout, make sure to switch to the Block Checkout Fields tab, otherwise, your changes won’t be reflected. Have questions or need help? 
-                            Reach out to our  %s .", 'woocommerce-checkout-field-editor-pro'),
+                            Reach out to our  %s .", 'woo-checkout-field-editor-pro'),
                             '<a href="https://www.themehigh.com/docs/support/" target="_blank" class="quick-widget-support-link">' . esc_html__(' Support team', 'woo-checkout-field-editor-pro') . '</a>'
                         );
@@ -513 +515 @@
         $dismiss_url = $admin_url . '&thwcfd_discount_popup_dismiss=true&thwcfd_discount_popup_nonce=' . wp_create_nonce( 'thwcfd_discount_popup_security');
 
-        $url = "https://www.themehigh.com/?edd_action=add_to_cart&download_id=12&cp=lyCDSy&utm_source=free&utm_medium=premium_tab&utm_campaign=wcfe_upgrade_link";
+        $url = "https://www.themehigh.com/?edd_action=add_to_cart&download_id=12&cp=lyCDSy&utm_source=wcfe_free&utm_medium=referral&utm_campaign=wcfe_premium_tab_upgrade_link";
 
         $current_page = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash($_GET['page']))  : '';
@@ -615 +617 @@
                                     </svg>
                                 </div>
-                                <a href="https://www.themehigh.com/product/woocommerce-checkout-field-editor-pro/?utm_source=free&utm_medium=quicklinks&utm_campaign=wcfe_upgrade_link" target="_blank" class="quick-widget-doc-link">Upgrade to Premium</a></li>
+                                <a href="https://www.themehigh.com/product/woocommerce-checkout-field-editor-pro/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=wcfe_settings_upgrade_link" target="_blank" class="quick-widget-doc-link">Upgrade to Premium</a></li>
                             <li>
 
@@ -726 +728 @@
         return true;
     }
+
+    public function remove_welcome_page_menu() {
+        remove_submenu_page( 'index.php', 'thwcfd-welcome' );
+    }
 }
 

woo-checkout-field-editor-pro/trunk/admin/thwcfd-landing-page.php

@@ -18 +18 @@
         <meta name="viewport" content="width=device-width" />
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <title><?php esc_html_e( 'Checkout field editor Landing page', 'woocommerce-checkout-field-editor-pro' ); ?></title>
+        <title><?php esc_html_e( 'Checkout field editor Landing page', 'woo-checkout-field-editor-pro' ); ?></title>
     </head>
     <body class="thwcfd-admin-page thwcfd-landing-page wp-core-ui">
@@ -36 +36 @@
                     </div>
                 </div>
-                <h1 style="font-weight: 700;"><?php esc_html_e("Welcome to Checkout Field Editor!", 'woocommerce-checkout-field-editor-pro' ); ?></h1>
+                <h1 style="font-weight: 700;"><?php esc_html_e("Welcome to Checkout Field Editor!", 'woo-checkout-field-editor-pro' ); ?></h1>
                 <p class ="th-desc-head" >
-                <?php esc_html_e( "We’re excited to have you on board! Now, you can easily customize your WooCommerce checkout using both the Block Checkout Editor and the Classic Checkout Field Editor. Enjoy complete flexibility and control! " , 'woocommerce-checkout-field-editor-pro' ); ?>
+                <?php esc_html_e( "We’re excited to have you on board! Now, you can easily customize your WooCommerce checkout using both the Block Checkout Editor and the Classic Checkout Field Editor. Enjoy complete flexibility and control! " , 'woo-checkout-field-editor-pro' ); ?>
                 </p>
                 
                 <a href="<?php echo esc_url(admin_url('admin.php?page=checkout_form_designer&tab=fields&c_type=classic')); ?>" class="th-get-started-btn">
-                    <?php esc_html_e("Get Started" , 'woocommerce-checkout-field-editor-pro' ); ?>
+                    <?php esc_html_e("Get Started" , 'woo-checkout-field-editor-pro' ); ?>
                 </a>
 
                 <div class="th-read-more">
-                    <p> <?php esc_html_e("Learn more about both editors to make the most out of your checkout", 'woocommerce-checkout-field-editor-pro' ); ?>  </p>
+                    <p> <?php esc_html_e("Learn more about both editors to make the most out of your checkout", 'woo-checkout-field-editor-pro' ); ?>  </p>
                     <!-- <button>
-                    <?php //esc_html_e("Read More!", 'woocommerce-checkout-field-editor-pro' ); ?>
+                    <?php //esc_html_e("Read More!", 'woo-checkout-field-editor-pro' ); ?>
                     </button> -->
                     <a href="https://www.themehigh.com/docs/classic-vs-block-checkout/" target="_blank" rel="noopener noreferrer">
                         <button type="button">
-                            <?php esc_html_e("Read More!", 'woocommerce-checkout-field-editor-pro' ); ?>
+                            <?php esc_html_e("Read More!", 'woo-checkout-field-editor-pro' ); ?>
                         </button>
                     </a>
@@ -58 +58 @@
 
                 <div class="th-sub-content" style="">
-                    <p ><?php esc_html_e("We support both Classic and Block Checkout. Choose the one you're using", 'woocommerce-checkout-field-editor-pro' ); ?></p>
-                    <h2><?php esc_html_e("Which Checkout Fields should you use?", 'woocommerce-checkout-field-editor-pro' ); ?> </h2>
+                    <p ><?php esc_html_e("We support both Classic and Block Checkout. Choose the one you're using", 'woo-checkout-field-editor-pro' ); ?></p>
+                    <h2><?php esc_html_e("Which Checkout Fields should you use?", 'woo-checkout-field-editor-pro' ); ?> </h2>
 
                     <div class="th-diff-box-wrap">
@@ -70 +70 @@
                                 </svg>
                                 <div>
-                                    <h3><?php esc_html_e("Classic Checkout", 'woocommerce-checkout-field-editor-pro' ); ?></h3>
+                                    <h3><?php esc_html_e("Classic Checkout", 'woo-checkout-field-editor-pro' ); ?></h3>
                                     <ul>
                                         <li>
@@ -76 +76 @@
                                                 <use xlink:href="#bullet-icon"></use>
                                             </svg>  
-                                            <p><?php esc_html_e("Use this if you’re still using the traditional WooCommerce checkout page.", 'woocommerce-checkout-field-editor-pro' ); ?></p>
+                                            <p><?php esc_html_e("Use this if you’re still using the traditional WooCommerce checkout page.", 'woo-checkout-field-editor-pro' ); ?></p>
                                         </li>
                                         <li>
@@ -82 +82 @@
                                                 <use xlink:href="#bullet-icon"></use>
                                             </svg>
-                                            <p><?php esc_html_e("Compatible with older checkout layouts.", 'woocommerce-checkout-field-editor-pro' ); ?></p>
+                                            <p><?php esc_html_e("Compatible with older checkout layouts.", 'woo-checkout-field-editor-pro' ); ?></p>
                                         </li>
                                         <li>
@@ -88 +88 @@
                                                 <use xlink:href="#bullet-icon"></use>
                                             </svg>
-                                            <p><?php esc_html_e("Best for users who prefer the classic, non-block experience.", 'woocommerce-checkout-field-editor-pro' ); ?> </p>
+                                            <p><?php esc_html_e("Best for users who prefer the classic, non-block experience.", 'woo-checkout-field-editor-pro' ); ?> </p>
                                         </li>
                                     </ul>
@@ -101 +101 @@
                             <div class="th-diff-box-content">
                                 <div>
-                                    <h3 style="font-weight: bold;"><?php esc_html_e("Block Checkout", 'woocommerce-checkout-field-editor-pro' ); ?></h3>
+                                    <h3 style="font-weight: bold;"><?php esc_html_e("Block Checkout", 'woo-checkout-field-editor-pro' ); ?></h3>
                                     <ul>
                                         <li>
@@ -107 +107 @@
                                                 <use xlink:href="#bullet-icon"></use>
                                             </svg> 
-                                            <p> <?php esc_html_e("Use this if you’ve transitioned to WooCommerce’s new Block-based checkout.", 'woocommerce-checkout-field-editor-pro' ); ?></p>
+                                            <p> <?php esc_html_e("Use this if you’ve transitioned to WooCommerce’s new Block-based checkout.", 'woo-checkout-field-editor-pro' ); ?></p>
                                         </li>
                                         <li>
@@ -113 +113 @@
                                                 <use xlink:href="#bullet-icon"></use>
                                             </svg>
-                                            <p> <?php esc_html_e( "Easier to customize with block elements.", 'woocommerce-checkout-field-editor-pro'); ?> </p> 
+                                            <p> <?php esc_html_e( "Easier to customize with block elements.", 'woo-checkout-field-editor-pro'); ?> </p> 
                                         </li>
                                         <li>
@@ -119 +119 @@
                                                 <use xlink:href="#bullet-icon"></use>
                                             </svg>
-                                            <p> <?php esc_html_e("Best for users looking for a more modern, flexible checkout design",'woocommerce-checkout-field-editor-pro'); ?>.</p>
+                                            <p> <?php esc_html_e("Best for users looking for a more modern, flexible checkout design",'woo-checkout-field-editor-pro'); ?>.</p>
                                         </li>
                                     </ul>
@@ -130 +130 @@
                     <div class="th-btn-box">
                         <a href="<?php echo esc_url(admin_url('admin.php?page=checkout_form_designer&tab=fields&c_type=classic')); ?>" class="th-choose-btn">
-                            <?php esc_html_e('Go with Classic Checkout Editor', 'woocommerce-checkout-field-editor-pro') ?>
+                            <?php esc_html_e('Go with Classic Checkout Editor', 'woo-checkout-field-editor-pro') ?>
                         </a>
                         <a href="<?php echo esc_url(admin_url('admin.php?page=checkout_form_designer&tab=fields&c_type=block')); ?>" class="th-choose-btn">
-                            <?php esc_html_e('Go with Block Checkout Editor', 'woocommerce-checkout-field-editor-pro') ?>
+                            <?php esc_html_e('Go with Block Checkout Editor', 'woo-checkout-field-editor-pro') ?>
                         </a>
                     </div>
                 </div>
                 <a href="<?php echo esc_url(admin_url('admin.php?page=checkout_form_designer&tab=fields&c_type=classic')); ?>" class="th-get-started-btn">
-                    <?php esc_html_e("Let's Get started", 'woocommerce-checkout-field-editor-pro' ); ?>
+                    <?php esc_html_e("Let's Get started", 'woo-checkout-field-editor-pro' ); ?>
                 </a>
             </div>

woo-checkout-field-editor-pro/trunk/block/assets/dist/style-additional-sections-frontend-rtl.css

@@ -1 @@
-.wc-block-components-radio-control.thwcfe-radio-control{margin-top:10px}.wc-block-components-radio-control.thwcfe-radio-control label.wc-block-components-radio-control__option--checked-option-highlighted{box-shadow:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked .wc-block-components-radio-control__option:after{background:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked:after{border:none}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__input{right:0}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__option{padding:0 2.5em 0 calc(16px + 1.5em)}.wc-block-components-checkbox .wc-block-components-checkbox__input[type=checkbox]:focus:required{outline:1px solid #cc1818;outline-offset:2px}.wc-block-checkout__additional-fields{margin-bottom:1.5em}.block-editor-inner-blocks .wc-blocks-components-select .wc-blocks-components-select__select{max-width:revert}
+.wc-block-components-radio-control.thwcfe-radio-control{margin-top:10px}.wc-block-components-radio-control.thwcfe-radio-control label.wc-block-components-radio-control__option--checked-option-highlighted{box-shadow:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked .wc-block-components-radio-control__option:after{background:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked:after{border:none}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__input{right:0}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__option{padding:.5em 2.5em 0 calc(16px + 1.5em)}.wc-block-components-checkbox .wc-block-components-checkbox__input[type=checkbox]:focus:required{outline:1px solid #cc1818;outline-offset:2px}.wc-block-checkout__additional-fields{margin-bottom:1.5em}.block-editor-inner-blocks .wc-blocks-components-select .wc-blocks-components-select__select{max-width:revert}.wc-block-checkout__additional-fields__field{margin-top:10px}

woo-checkout-field-editor-pro/trunk/block/assets/dist/style-additional-sections-frontend.css

@@ -1 @@
-.wc-block-components-radio-control.thwcfe-radio-control{margin-top:10px}.wc-block-components-radio-control.thwcfe-radio-control label.wc-block-components-radio-control__option--checked-option-highlighted{box-shadow:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked .wc-block-components-radio-control__option:after{background:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked:after{border:none}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__input{left:0}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__option{padding:0 calc(16px + 1.5em) 0 2.5em}.wc-block-components-checkbox .wc-block-components-checkbox__input[type=checkbox]:focus:required{outline:1px solid #cc1818;outline-offset:2px}.wc-block-checkout__additional-fields{margin-bottom:1.5em}.block-editor-inner-blocks .wc-blocks-components-select .wc-blocks-components-select__select{max-width:revert}
+.wc-block-components-radio-control.thwcfe-radio-control{margin-top:10px}.wc-block-components-radio-control.thwcfe-radio-control label.wc-block-components-radio-control__option--checked-option-highlighted{box-shadow:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked .wc-block-components-radio-control__option:after{background:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked:after{border:none}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__input{left:0}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__option{padding:.5em calc(16px + 1.5em) 0 2.5em}.wc-block-components-checkbox .wc-block-components-checkbox__input[type=checkbox]:focus:required{outline:1px solid #cc1818;outline-offset:2px}.wc-block-checkout__additional-fields{margin-bottom:1.5em}.block-editor-inner-blocks .wc-blocks-components-select .wc-blocks-components-select__select{max-width:revert}.wc-block-checkout__additional-fields__field{margin-top:10px}

woo-checkout-field-editor-pro/trunk/block/assets/dist/style-contact-info-section-frontend-rtl.css

@@ -1 @@
-.wc-block-components-radio-control.thwcfe-radio-control{margin-top:10px}.wc-block-components-radio-control.thwcfe-radio-control label.wc-block-components-radio-control__option--checked-option-highlighted{box-shadow:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked .wc-block-components-radio-control__option:after{background:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked:after{border:none}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__input{right:0}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__option{padding:0 2.5em 0 calc(16px + 1.5em)}.wc-block-components-checkbox .wc-block-components-checkbox__input[type=checkbox]:focus:required{outline:1px solid #cc1818;outline-offset:2px}
+.wc-block-components-radio-control.thwcfe-radio-control{margin-top:10px}.wc-block-components-radio-control.thwcfe-radio-control label.wc-block-components-radio-control__option--checked-option-highlighted{box-shadow:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked .wc-block-components-radio-control__option:after{background:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked:after{border:none}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__input{right:0}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__option{padding:.5em 2.5em 0 calc(16px + 1.5em)}.wc-block-components-checkbox .wc-block-components-checkbox__input[type=checkbox]:focus:required{outline:1px solid #cc1818;outline-offset:2px}

woo-checkout-field-editor-pro/trunk/block/assets/dist/style-contact-info-section-frontend.css

@@ -1 @@
-.wc-block-components-radio-control.thwcfe-radio-control{margin-top:10px}.wc-block-components-radio-control.thwcfe-radio-control label.wc-block-components-radio-control__option--checked-option-highlighted{box-shadow:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked .wc-block-components-radio-control__option:after{background:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked:after{border:none}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__input{left:0}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__option{padding:0 calc(16px + 1.5em) 0 2.5em}.wc-block-components-checkbox .wc-block-components-checkbox__input[type=checkbox]:focus:required{outline:1px solid #cc1818;outline-offset:2px}
+.wc-block-components-radio-control.thwcfe-radio-control{margin-top:10px}.wc-block-components-radio-control.thwcfe-radio-control label.wc-block-components-radio-control__option--checked-option-highlighted{box-shadow:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked .wc-block-components-radio-control__option:after{background:none}.wc-block-components-radio-control.thwcfe-radio-control.wc-block-components-radio-control--highlight-checked:after{border:none}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__input{left:0}.wc-block-components-radio-control.thwcfe-radio-control .wc-block-components-radio-control__option{padding:.5em calc(16px + 1.5em) 0 2.5em}.wc-block-components-checkbox .wc-block-components-checkbox__input[type=checkbox]:focus:required{outline:1px solid #cc1818;outline-offset:2px}

woo-checkout-field-editor-pro/trunk/block/class-thwcfd-block-order-data.php

@@ -259 +259 @@
 
             if($title){
-                $title    = __($title, 'woo-checkout-field-editor-pro');
+                //$title    = __($title, 'woo-checkout-field-editor-pro');
+                $title    = THWCFD_Utils::translate_dynamic_text($title, 'label');
                 $subtitle = $section->get_property('subtitle');
                 $subtitle = apply_filters('thwcfe_section_subtitle', $subtitle, $section->name, $context);
-                $subtitle = $subtitle ? __($subtitle,'woo-checkout-field-editor-pro') : '';
+                //$subtitle = $subtitle ? __($subtitle,'woo-checkout-field-editor-pro') : '';
 
                 if($context === self::VIEW_ADMIN_ORDER){
@@ -396 +397 @@
             if($title || $subtitle){
                 if($esc_attr_label){
-                    $title    = $title ? __($title,'woo-checkout-field-editor-pro') : '';
-                    $subtitle = $subtitle ? __($subtitle,'woo-checkout-field-editor-pro') : '';
+                    $title    = $title ? THWCFD_Utils::translate_dynamic_text($title, 'label') : '';
+                    //$subtitle = $subtitle ? __($subtitle,'woo-checkout-field-editor-pro') : '';
                 }else{
-                    $title    = $title ? __($title,'woo-checkout-field-editor-pro') : '';
-                    $subtitle = $subtitle ? __($subtitle,'woo-checkout-field-editor-pro') : '';
+                    $title    = $title ? THWCFD_Utils::translate_dynamic_text($title, 'label') : '';
+                    //$subtitle = $subtitle ? __($subtitle,'woo-checkout-field-editor-pro') : '';
                 }
 
@@ -417 +418 @@
             if(!empty($value) || (($value === '0') && apply_filters( 'thwcfe_accept_value_zero',false))){
                 $title = $field->get_property('title') ? $field->get_property('title') : $name;
-                $title = $esc_attr_label ? __($title, 'woo-checkout-field-editor-pro') : __($title, 'woo-checkout-field-editor-pro');
+                $title = THWCFD_Utils::translate_dynamic_text( $title, 'label' );
 
                 if($type === 'file'){

woo-checkout-field-editor-pro/trunk/block/class-thwcfd-block.php

@@ -74 +74 @@
             
             if (isset($field_data['label'])) {
-                $field_data['label'] = __($field_data['label'], 'woo-checkout-field-editor-pro');
+                //$field_data['label'] = __($field_data['label'], 'woo-checkout-field-editor-pro');
+                $field_data['label'] = THWCFD_Utils::translate_dynamic_text($field_data['label'], 'label');
             }
             woocommerce_register_additional_checkout_field(
@@ -82 +83 @@
                     'optionalLabel' =>  $remove_optional ? $field_data['label'] : sprintf(
                         /* translators: %s Field label. */
-                        __( '%s (optional)', 'woocommerce' ),
+                        __( '%s (optional)', 'woocommerce' ), // phpcs:ignore WordPress.WP.I18n.TextDomainMismatch
                         $field_data['label']
                     ),
@@ -103 +104 @@
         $field_options = array();
         foreach ($options as $option) {
+            $option['text'] = THWCFD_Utils::translate_dynamic_text($option['text'], 'option');
             $field_options[] = array(
                 'label' => $option['text'],
@@ -171 +173 @@
             }
             if (isset($field_set[$key])) {
-                $field['index'] = $field_set[$key]['priority'] ?? $field['index'];
+                //$field['index'] = $field_set[$key]['priority'] ?? $field['index'];
+                $field['index'] = ! empty( $field_set[$key]['priority'] )? $field_set[$key]['priority'] : $field['index'];
                
                 if(apply_filters('thwcfe_block_address_field_dynamic_label', true)){
@@ -194 +197 @@
 
             if(isset($field['label'])){
-                $field['label'] = __($field['label'], 'woo-checkout-field-editor-pro');
+               // $field['label'] = __($field['label'], 'woo-checkout-field-editor-pro');
+                $field['label'] = THWCFD_Utils::translate_dynamic_text($field['label'], 'label');
             }
         } 
@@ -225 +229 @@
 
             if(isset($field['label'])){
-                $field['label'] = __($field['label'], 'woo-checkout-field-editor-pro');
+                //$field['label'] = __($field['label'], 'woo-checkout-field-editor-pro');
+                $field['label'] = THWCFD_Utils::translate_dynamic_text($field['label'], 'label');
             }
         }
@@ -252 +257 @@
                 case 'email':
                     if (!empty($field_value) && !is_email($field_value)) {
-                        // Translators: %s is the title of the field being validated.
                         $errors->add(
                             'invalid_email_field',
                             sprintf(
+                                /* translators: %s is the title of the field being validated. */
                                 __('The provided %s is not a valid email address.', 'woo-checkout-field-editor-pro'),
                                 esc_html($field_properties['title'] ?? 'value')
@@ -265 +270 @@
                 case 'phone':
                     if (!empty($field_value) && !\WC_Validation::is_phone($field_value)) {
-                        // Translators: %s is the title of the field being validated.
+                        
                         $errors->add(
                             'invalid_phone_field',
                             sprintf(
+                                // translators: %s is the title of the field being validated.
                                 __('The provided %s is not a valid phone number.', 'woo-checkout-field-editor-pro'),
                                 esc_html($field_properties['title'] ?? 'value')
@@ -278 +284 @@
                 case 'postcode':
                     if (!empty($field_value) && !\WC_Validation::is_postcode($field_value)) {
-                        // Translators: %s is the title of the field being validated.
+                        
                         $errors->add(
                             'invalid_postcode',
                             sprintf(
+                                // translators: %s is the title of the field being validated.
                                 __('The provided %s is not a valid postcode.', 'woo-checkout-field-editor-pro'),
                                 esc_html($field_properties['title'] ?? 'value')

woo-checkout-field-editor-pro/trunk/changelog.txt

@@ -1 +1 @@
 == Changelog ==
+= 2.1.6 =
+* Added compatiblity for Archiva for WooCommerce.
+* Improved dynamic string translation for WPML.
+* Added WooCommerce 10.4 compatibility.
+* Added WordPress 6.9 compatibility.
+
 = 2.1.5 =
 * Added required validation for the checkbox field in the block checkout (WC 9.8+).

woo-checkout-field-editor-pro/trunk/checkout-form-designer.php

@@ -4 +4 @@
  * Description: Customize WooCommerce checkout fields(Add, Edit, Delete and re-arrange fields).
  * Author:      ThemeHigh
- * Version:     2.1.5
+ * Version:     2.1.6
  * Author URI:  https://www.themehigh.com
  * Plugin URI:  https://www.themehigh.com
+ * License:     GPLv2 or later
  * Text Domain: woo-checkout-field-editor-pro
  * Domain Path: /languages
  * WC requires at least: 3.0.0
- * WC tested up to: 10.2
+ * WC tested up to: 10.4
  */
  
@@ -26 +27 @@
 
 if(is_woocommerce_active()) {
-    define('THWCFD_VERSION', '2.1.5');
+    define('THWCFD_VERSION', '2.1.6');
     !defined('THWCFD_BASE_NAME') && define('THWCFD_BASE_NAME', plugin_basename( __FILE__ ));
     !defined('THWCFD_PATH') && define('THWCFD_PATH', plugin_dir_path( __FILE__ ));

woo-checkout-field-editor-pro/trunk/includes/class-thwcfd.php

@@ -32 +32 @@
     public function init(){
         $this->define_constants();
-        $this->set_locale();
+        //$this->set_locale();
         $this->define_admin_hooks();
         $this->define_public_hooks();
@@ -53 +53 @@
     }
 
-    private function set_locale() {
-        add_action('plugins_loaded', array($this, 'load_plugin_textdomain'));
-    }
-
-    public function load_plugin_textdomain(){
+    /************ Note: Manual loading of the plugin text domain is intentionally omitted.
+     * Since WordPress 4.6+, translations for plugins hosted on WordPress.org are loaded automatically using Just-In-Time (JIT) loading.
+     * This plugin requires WordPress 4.9 or higher, so no explicit call to load_plugin_textdomain is needed here.
+    */
+
+    /*private function set_locale() {
+        // WordPress 4.6+ JIT loading of textdomains. This for backward compatibility logging purpose only.
+        $domain = self::TEXT_DOMAIN;
+        if ( is_textdomain_loaded( $domain ) ) {
+            return;
+        }
+        // Determine locale safely (WP 5.0+)
+        $locale = function_exists( 'determine_locale' )
+            ? determine_locale()
+            : get_locale();
+
+        $mofile = WP_LANG_DIR . '/plugins/' . $domain . '-' . $locale . '.mo';
+        if ( file_exists( $mofile ) ) {
+            load_textdomain( $domain, $mofile );
+            return;
+        }
+        load_plugin_textdomain(
+            $domain,
+            false,
+            dirname( THWCFD_BASE_NAME ) . '/languages/'
+        );
+        //plugins_loaded hook not required as load_plugin_textdomain called in init method
+        //add_action('plugins_loaded', array($this, 'load_plugin_textdomain'));  
+    }*/
+
+    /* plugins_loaded hook not required as load_plugin_textdomain called in init method
+    public function load_plugin_textdomain(){
         $locale = apply_filters('plugin_locale', get_locale(), self::TEXT_DOMAIN);
     
         load_textdomain(self::TEXT_DOMAIN, WP_LANG_DIR.'/woo-checkout-field-editor-pro/'.self::TEXT_DOMAIN.'-'.$locale.'.mo');
         load_plugin_textdomain(self::TEXT_DOMAIN, false, dirname(THWCFD_BASE_NAME) . '/languages/');
-    }
+    }*/
 
     private function define_admin_hooks() {
@@ -82 +109 @@
         add_action( 'admin_init', array($plugin_admin, 'landing_page' ), 10 );
         add_action( 'admin_init', array($plugin_admin, 'redirect_to_landing_page'), 10 );
+        add_action( 'admin_head', array($plugin_admin, 'remove_welcome_page_menu'));
         
         $themehigh_plugins = new THWCFD_Admin_Settings_Themehigh_Plugins();

woo-checkout-field-editor-pro/trunk/includes/utils/class-thwcfd-utils-block.php

@@ -23 +23 @@
         self::get_default_block_sections();
     }
-
+    // phpcs:disable WordPress.WP.I18n.TextDomainMismatch
     public static function get_default_block_fields(){
 
@@ -186 +186 @@
             // ];
 
-        return $core_fields ;
+        return apply_filters( 'thwcfd_default_block_checkout_fields', $core_fields );
     }
     public static function get_default_block_section_fields($section_name){
@@ -305 +305 @@
         return $field_objects;
     }
-
+    // phpcs:disable WordPress.WP.I18n.TextDomainMismatch
     public static function get_core_fields() {
         

woo-checkout-field-editor-pro/trunk/includes/utils/class-thwcfd-utils.php

@@ -152 +152 @@
                         'type'        => 'textarea',
                         'class'       => array('notes'),
-                        'label'       => __('Order Notes', 'woocommerce'),
-                        'placeholder' => _x('Notes about your order, e.g. special notes for delivery.', 'placeholder', 'woocommerce')
+                        'label'       => __('Order Notes', 'woocommerce'), // phpcs:ignore WordPress.WP.I18n.TextDomainMismatch
+                        'placeholder' => _x('Notes about your order, e.g. special notes for delivery.', 'placeholder', 'woocommerce') // phpcs:ignore WordPress.WP.I18n.TextDomainMismatch
                     )
                 );
@@ -248 +248 @@
             if(isset($options[$value]) && !empty($options[$value])){
                 $value = $options[$value];
+                $value = THWCFD_Utils::translate_dynamic_text($value, 'option');
             }
         }elseif($type === 'checkboxgroup' || $type === 'multiselect'){
@@ -257 +258 @@
                 $new_value = array();
                 foreach($value_arr as $single_value){
+                    
                     if(isset($options[$single_value]) && !empty($options[$single_value])){
-                        $new_value[] = $options[$single_value];
+                        $new_value[] = THWCFD_Utils::translate_dynamic_text($options[$single_value], 'option') ;
                     }else{
-                        $new_value[] = $single_value;
+                        $new_value[] = THWCFD_Utils::translate_dynamic_text($single_value, 'option') ;
                     }
                 }
@@ -269 +271 @@
                 
         }
-
         return $value;
     }
@@ -384 +385 @@
      ----- i18n functions - START ------
      ***********************************/
+
+    /**
+     * Legacy helper function.
+     *
+     * This method is no longer responsible for translation.
+     * It is kept for backward compatibility, as it may still be
+     * referenced by older code or third-party integrations.
+     *
+     * @param string $text Text to be escaped.
+     * @return string Escaped text.
+     */
     public static function t($text){
-        if(!empty($text)){  
+
+        /*if(!empty($text)){    
             $otext = $text;                     
-            $text = __($text, 'woo-checkout-field-editor-pro'); 
+            $text = esc_html($text);    
             if($text === $otext){
                 $text = __($text, 'woocommerce');
             }
         }
-        return $text;
-    }
-
+        return $text;*/
+        return esc_html( $text);
+    }
+
+    /**
+     * Legacy echo helper function.
+     *
+     * This method no longer performs translation.
+     * It is retained for backward compatibility to avoid
+     * breaking existing usages that expect this static method.
+     *
+     * @param string $text Text to be escaped and echoed.
+     * @return void
+     */
     public static function et($text){
-        if(!empty($text)){  
-            $otext = $text;                     
-            $text = __($text, 'woo-checkout-field-editor-pro'); 
-            if($text === $otext){
-                $text = __($text, 'woocommerce');
-            }
-        }
+        // if(!empty($text)){   
+        //  $otext = $text;                     
+        //  $text = __($text, 'woo-checkout-field-editor-pro'); 
+        //  if($text === $otext){
+        //      $text = __($text, 'woocommerce');
+        //  }
+        // }
         echo esc_html($text);
     }
@@ -493 +517 @@
         return $str;
     }
+
+    /**
+     * Translate dynamic/admin-entered strings with proper fallbacks.
+     *
+     * Translation order:
+     * 1. WPML (string translation)
+     * 2. Plugin gettext (backward compatibility)
+     * 3. WooCommerce core gettext
+     *
+     * @param string $text      Original text.
+     * @param string $text_type Type of text: label|placeholder|option.
+     * @return string Translated text.
+     */
+    public static function translate_dynamic_text( $text, $text_type = 'label' ) {
+
+        if ( empty( $text ) ) {
+            return '';
+        }
+
+        // Build WPML string key (kept for backward compatibility)
+        $key = 'Field label - ' . $text;
+        if ( $text_type === 'placeholder' ) {
+            $key = 'Field placeholder - ' . $text;
+        } elseif ( $text_type === 'option' ) {
+            $key = 'Field option text - ' . $text;
+        }
+
+        // WPML – preferred for dynamic/admin strings
+        if ( has_filter( 'wpml_translate_single_string' ) ) {
+            $translated = apply_filters(
+                'wpml_translate_single_string',
+                $text,
+                'woo-checkout-field-editor-pro',
+                $key
+            );
+
+            if ( $translated !== $text ) {
+                return $translated;
+            }
+        }
+
+        // Plugin gettext fallback (backward compatibility)
+        // Supports existing .mo translations before WPML integration.
+        // phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText
+        $plugin_translation = __( $text, 'woo-checkout-field-editor-pro' );
+
+        if ( $plugin_translation !== $text ) {
+            return $plugin_translation;
+        }
+
+        // WooCommerce core fallback
+        // Used only when WooCommerce already provides a translation
+        // in the current locale.
+        // phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText, WordPress.WP.I18n.TextDomainMismatch
+        return __( $text, 'woocommerce' );
+    }
 }
 

woo-checkout-field-editor-pro/trunk/languages/woo-checkout-field-editor-pro.pot

@@ -1 @@
-# Copyright (C) 2025 ThemeHigh
-# This file is distributed under the same license as the Checkout Field Editor for WooCommerce plugin.
+# Copyright (C) 2026 ThemeHigh
+# This file is distributed under the GPLv2 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: Checkout Field Editor for WooCommerce 2.1.5\n"
+"Project-Id-Version: Checkout Field Editor for WooCommerce 2.1.6\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woo-checkout-field-editor-pro\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-09-25T09:17:45+00:00\n"
+"POT-Creation-Date: 2026-01-11T19:23:12+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.8.1\n"
+"X-Generator: WP-CLI 2.9.0\n"
 "X-Domain: woo-checkout-field-editor-pro\n"
 
@@ -30 +30 @@
 #. Author of the plugin
 msgid "ThemeHigh"
+msgstr ""
+
+#: admin/class-thwcfd-admin-form-block-field.php:382
+msgid "Value"
+msgstr ""
+
+#: admin/class-thwcfd-admin-form-block-field.php:471
+#: admin/class-thwcfd-admin-form-field.php:675
+msgid "Options"
 msgstr ""
 
@@ -238 +247 @@
 msgstr ""
 
-#: admin/class-thwcfd-admin-form-field.php:675
-msgid "Options"
-msgstr ""
-
 #: admin/class-thwcfd-admin-form-field.php:683
 #: admin/assets/js/inc/thwcfd-admin-field.js:442
@@ -291 +296 @@
 
 #: admin/class-thwcfd-admin-settings-advanced.php:135
-#: admin/class-thwcfd-admin-settings-general.php:259
-#: admin/class-thwcfd-admin-settings-general.php:321
+#: admin/class-thwcfd-admin-settings-general.php:266
+#: admin/class-thwcfd-admin-settings-general.php:328
 msgid "Your changes were saved."
 msgstr ""
@@ -298 +303 @@
 #: admin/class-thwcfd-admin-settings-advanced.php:137
 #: admin/class-thwcfd-admin-settings-advanced.php:299
-#: admin/class-thwcfd-admin-settings-general.php:261
-#: admin/class-thwcfd-admin-settings-general.php:323
+#: admin/class-thwcfd-admin-settings-general.php:268
+#: admin/class-thwcfd-admin-settings-general.php:330
 msgid "Your changes were not saved due to an error (or you made none!)."
 msgstr ""
@@ -305 +310 @@
 #: admin/class-thwcfd-admin-settings-advanced.php:170
 msgid "Are you sure you want to reset to default settings? all your changes will be deleted."
+msgstr ""
+
+#: admin/class-thwcfd-admin-settings-advanced.php:220
+msgid "Backup and Import Settings"
+msgstr ""
+
+#: admin/class-thwcfd-admin-settings-advanced.php:222
+msgid "Plugin Settings Data"
+msgstr ""
+
+#: admin/class-thwcfd-admin-settings-advanced.php:223
+msgid "You can transfer the saved settings data between different installs by copying the text inside the text box. To import data from another install, replace the data in the text box with the one from another install and click \"Import Settings\"."
+msgstr ""
+
+#: admin/class-thwcfd-admin-settings-advanced.php:240
+msgid "Import Settings"
 msgstr ""
 
@@ -323 +344 @@
 #: admin/class-thwcfd-admin-settings-block-fields.php:65
 #: admin/class-thwcfd-admin-settings-general.php:98
-#: admin/class-thwcfd-admin-settings-general.php:194
+#: admin/class-thwcfd-admin-settings-general.php:201
 msgid "Edit"
 msgstr ""
@@ -363 +384 @@
 #: admin/class-thwcfd-admin-settings-block-fields.php:103
 msgid "Actions"
+msgstr ""
+
+#: admin/class-thwcfd-admin-settings-block-fields.php:186
+#: block/class-thwcfd-block-order-data.php:415
+#: block/class-thwcfd-block-order-data.php:543
+#: admin/assets/js/inc/thwcfd-admin.js:97
+#: admin/assets/js/thwcfd-admin.js:1281
+msgid "Yes"
 msgstr ""
 
@@ -380 +409 @@
 
 #: admin/class-thwcfd-admin-settings-block-fields.php:322
-#: admin/class-thwcfd-admin-settings-general.php:279
+#: admin/class-thwcfd-admin-settings-general.php:286
 msgid "Your changes were not saved due to no fields found."
 msgstr ""
@@ -429 +458 @@
 msgstr ""
 
-#: admin/class-thwcfd-admin-settings-general.php:264
-#: admin/class-thwcfd-admin-settings-general.php:326
+#: admin/class-thwcfd-admin-settings-general.php:271
+#: admin/class-thwcfd-admin-settings-general.php:333
 msgid "Your changes were not saved due to an error."
 msgstr ""
@@ -440 +469 @@
 #: admin/class-thwcfd-admin-settings-themehigh-plugins.php:184
 msgid "Other Plugins"
+msgstr ""
+
+#: admin/class-thwcfd-admin-settings-themehigh-plugins.php:233
+msgid "Activated"
+msgstr ""
+
+#: admin/class-thwcfd-admin-settings-themehigh-plugins.php:246
+msgid "Activate"
+msgstr ""
+
+#: admin/class-thwcfd-admin-settings-themehigh-plugins.php:267
+msgid "Install now"
 msgstr ""
 
@@ -471 +512 @@
 msgstr ""
 
-#: admin/class-thwcfd-admin.php:144
+#. translators: %s: Support team link
+#: admin/class-thwcfd-admin.php:143
+msgid ""
+"Our Checkout Field Editor now supports WooCommerce Checkout Blocks! Currently, a few field types are available, and more will be added soon. \n"
+"\t\t\t\t\t\t\tIf you're using Block Checkout, make sure to switch to the Block Checkout Fields tab, otherwise, your changes won’t be reflected. Have questions or need help? \n"
+"\t\t\t\t\t\t\tReach out to our  %s ."
+msgstr ""
+
+#: admin/class-thwcfd-admin.php:146
 msgid " Support team"
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:20
+msgid "Checkout field editor Landing page"
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:38
+msgid "Welcome to Checkout Field Editor!"
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:40
+msgid "We’re excited to have you on board! Now, you can easily customize your WooCommerce checkout using both the Block Checkout Editor and the Classic Checkout Field Editor. Enjoy complete flexibility and control! "
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:44
+msgid "Get Started"
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:48
+msgid "Learn more about both editors to make the most out of your checkout"
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:54
+msgid "Read More!"
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:60
+msgid "We support both Classic and Block Checkout. Choose the one you're using"
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:61
+msgid "Which Checkout Fields should you use?"
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:72
+msgid "Classic Checkout"
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:78
+msgid "Use this if you’re still using the traditional WooCommerce checkout page."
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:84
+msgid "Compatible with older checkout layouts."
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:90
+msgid "Best for users who prefer the classic, non-block experience."
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:103
+msgid "Block Checkout"
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:109
+msgid "Use this if you’ve transitioned to WooCommerce’s new Block-based checkout."
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:115
+msgid "Easier to customize with block elements."
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:121
+msgid "Best for users looking for a more modern, flexible checkout design"
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:132
+msgid "Go with Classic Checkout Editor"
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:135
+msgid "Go with Block Checkout Editor"
+msgstr ""
+
+#: admin/thwcfd-landing-page.php:140
+msgid "Let's Get started"
 msgstr ""
 
@@ -480 +605 @@
 msgstr ""
 
-#: block/class-thwcfd-block-order-data.php:414
-#: block/class-thwcfd-block-order-data.php:542
-#: admin/assets/js/inc/thwcfd-admin.js:97
-#: admin/assets/js/thwcfd-admin.js:1281
-msgid "Yes"
-msgstr ""
-
-#: block/class-thwcfd-block-order-data.php:414
-#: block/class-thwcfd-block-order-data.php:542
+#: block/class-thwcfd-block-order-data.php:415
+#: block/class-thwcfd-block-order-data.php:543
 msgid "No"
 msgstr ""
 
 #. translators: %s Field label.
-#: block/class-thwcfd-block.php:184
+#: block/class-thwcfd-block.php:186
 msgid "%s (optional)"
 msgstr ""
 
-#: block/class-thwcfd-block.php:258
+#. translators: %s is the title of the field being validated.
+#: block/class-thwcfd-block.php:262
 msgid "The provided %s is not a valid email address."
 msgstr ""
 
-#: block/class-thwcfd-block.php:271
+#. translators: %s is the title of the field being validated.
+#: block/class-thwcfd-block.php:276
 msgid "The provided %s is not a valid phone number."
 msgstr ""
 
-#: block/class-thwcfd-block.php:284
+#. translators: %s is the title of the field being validated.
+#: block/class-thwcfd-block.php:290
 msgid "The provided %s is not a valid postcode."
 msgstr ""
 
-#: includes/class-thwcfd.php:148
+#: includes/class-thwcfd.php:176
 msgid "Quick Feedback"
 msgstr ""
 
-#: includes/class-thwcfd.php:153
-#: includes/class-thwcfd.php:184
+#: includes/class-thwcfd.php:181
+#: includes/class-thwcfd.php:212
 msgid "Get Support"
 msgstr ""
 
-#: includes/class-thwcfd.php:157
+#: includes/class-thwcfd.php:185
 msgid "If you have a moment, please let us know why you want to deactivate this plugin"
 msgstr ""
 
-#: includes/class-thwcfd.php:176
+#: includes/class-thwcfd.php:204
 msgid "This form is only for getting your valuable feedback. We do not collect your personal data. To know more read our "
 msgstr ""
 
-#: includes/class-thwcfd.php:176
+#: includes/class-thwcfd.php:204
 msgid "Privacy Policy"
 msgstr ""
 
-#: includes/class-thwcfd.php:180
+#: includes/class-thwcfd.php:208
 msgid "Skip & Deactivate"
 msgstr ""
 
-#: includes/class-thwcfd.php:186
+#: includes/class-thwcfd.php:214
 msgid "Submit and Deactivate"
 msgstr ""
 
-#: includes/class-thwcfd.php:187
+#: includes/class-thwcfd.php:215
 msgid "Cancel"
 msgstr ""
 
-#: includes/class-thwcfd.php:408
+#: includes/class-thwcfd.php:436
 msgid "Deactivate and "
 msgstr ""
 
-#: includes/class-thwcfd.php:410
+#: includes/class-thwcfd.php:438
 msgid "leave a review"
 msgstr ""
 
-#: includes/class-thwcfd.php:414
+#: includes/class-thwcfd.php:442
 msgid "Upgraded"
 msgstr ""
 
-#: includes/class-thwcfd.php:484
+#: includes/class-thwcfd.php:512
 msgid "Upgraded to premium."
 msgstr ""
 
-#: includes/class-thwcfd.php:491
+#: includes/class-thwcfd.php:519
 msgid "A specific feature is missing"
 msgstr ""
 
-#: includes/class-thwcfd.php:493
+#: includes/class-thwcfd.php:521
 msgid "Type in the feature"
 msgstr ""
 
-#: includes/class-thwcfd.php:498
+#: includes/class-thwcfd.php:526
 msgid "Found an error in the plugin/ Plugin was not working"
 msgstr ""
 
-#: includes/class-thwcfd.php:500
+#: includes/class-thwcfd.php:528
 msgid "Specify the issue"
 msgstr ""
 
-#: includes/class-thwcfd.php:505
+#: includes/class-thwcfd.php:533
 msgid "It was hard to use"
 msgstr ""
 
-#: includes/class-thwcfd.php:507
+#: includes/class-thwcfd.php:535
 msgid "How can we improve your experience?"
 msgstr ""
 
-#: includes/class-thwcfd.php:512
+#: includes/class-thwcfd.php:540
 msgid "I found a better Plugin"
 msgstr ""
 
-#: includes/class-thwcfd.php:514
-#: includes/class-thwcfd.php:528
+#: includes/class-thwcfd.php:542
+#: includes/class-thwcfd.php:556
 msgid "Could you please mention the plugin?"
 msgstr ""
 
-#: includes/class-thwcfd.php:526
+#: includes/class-thwcfd.php:554
 msgid "It’s a temporary deactivation - I’m troubleshooting an issue"
 msgstr ""
 
-#: includes/class-thwcfd.php:533
+#: includes/class-thwcfd.php:561
 msgid "Not mentioned here"
 msgstr ""
 
-#: includes/class-thwcfd.php:535
+#: includes/class-thwcfd.php:563
 msgid "Kindly tell us your reason, so that we can improve"
 msgstr ""
 
-#: public/class-thwcfd-public-checkout.php:543
+#. translators: %s: Field label
+#: public/class-thwcfd-public-checkout.php:548
 msgid "<strong>%s</strong> is not a valid number."
 msgstr ""
 
-#: public/class-thwcfd-public-checkout.php:547
+#. translators: %s: Field label
+#: public/class-thwcfd-public-checkout.php:553
 msgid "<strong>%s</strong> is not a valid url."
 msgstr ""

woo-checkout-field-editor-pro/trunk/public/class-thwcfd-public-checkout.php

@@ -196 +196 @@
     }
 
-    public function get_posted_value($key){
-        $value = isset($_POST[$key]) ? stripslashes($_POST[$key]) : '';
-
-        if(!$value){
-            $post_data = isset($_POST['post_data']) ? $_POST['post_data'] : '';
-
-            if($post_data){
-                parse_str($post_data, $post_data_arr);
-                $value = isset($post_data_arr[$key]) ? stripslashes($post_data_arr[$key]) : '';
-            }
-        }
-
+    public function get_posted_value( $key ) {
+        $value = '';
+        if ( isset( $_POST[ $key ] ) ) {
+            $value = wp_unslash( $_POST[ $key ] );
+        }
+        if ( '' === $value && isset( $_POST['post_data'] ) ) {
+            $post_data = wp_unslash( $_POST['post_data'] );
+
+            if ( is_string( $post_data ) ) {
+                parse_str( $post_data, $post_data_arr );
+
+                if ( isset( $post_data_arr[ $key ] ) ) {
+                    $value = $post_data_arr[ $key ];
+                }
+            }
+        }
         return $value;
     }
@@ -481 +485 @@
                             $options = array();
                             foreach($options_arr as $key => $value) {
-                                $options[$key] = __($value, 'woo-checkout-field-editor-pro');
+                                $value = $this->translate_text($value, 'option');
+                                $options[$key] = $value;
                             }
                             $new_field['options'] = $options;
@@ -492 +497 @@
                     
                     if(isset($new_field['label'])){
-                        $new_field['label'] = __($new_field['label'], 'woo-checkout-field-editor-pro');
+                        //$new_field['label'] = __($new_field['label'], 'woo-checkout-field-editor-pro');
+                        $new_field['label'] = $this->translate_text($new_field['label'], 'label');
                     }
 
                     if(isset($new_field['placeholder'])){
-                        $new_field['placeholder'] = __($new_field['placeholder'], 'woo-checkout-field-editor-pro');
+                        $new_field['placeholder'] = $this->translate_text($new_field['placeholder'], 'placeholder');
+                        // 
+                        //$new_field['placeholder'] = __($new_field['placeholder'], 'woo-checkout-field-editor-pro');
                     }
                     
@@ -541 +549 @@
                 if($vname === 'number'){
                     if(!is_numeric($value)){
+                        /* translators: %s: Field label */
                         $err_msg = sprintf( __( '<strong>%s</strong> is not a valid number.', 'woo-checkout-field-editor-pro' ), $flabel );
                     }
                 }else if($vname === 'url'){
                     if (!filter_var($value, FILTER_VALIDATE_URL)) {
+                        /* translators: %s: Field label */
                         $err_msg = sprintf( __( '<strong>%s</strong> is not a valid url.', 'woo-checkout-field-editor-pro' ), $flabel );
                     }
@@ -670 +680 @@
 
                     $f_type = isset($field['type']) ? $field['type'] : 'text';
-                    $value = esc_html__($value, 'woo-checkout-field-editor-pro');
+                    $value = esc_html($this->translate_text($value, 'option'));
                     if($f_type == 'textarea'){
                         $value =  nl2br($value);
@@ -676 +686 @@
                     
                     $custom_field = array();
-                    $custom_field['label'] = wp_kses_post(__($label, 'woo-checkout-field-editor-pro'));
+                    $custom_field['label'] = wp_kses_post($this->translate_text($label, 'label'));
                     $custom_field['value'] = $value;
                     
@@ -691 +701 @@
      */
     public function order_details_after_customer_details($order){
+
+        if ( ! $order instanceof WC_Order ) {
+            return;
+        }
         $order_id = THWCFD_Utils::get_order_id($order);
         $fields = THWCFD_Utils::get_checkout_fields($order);
@@ -698 +712 @@
             foreach($fields as $key => $field){ 
                 if(THWCFD_Utils::is_active_custom_field($field) && isset($field['show_in_order']) && $field['show_in_order'] && !THWCFD_Utils::is_wc_handle_custom_field($field)){
-                    $order = wc_get_order( $order_id );
-                
+                    // Compatibility for Archiva for WooCommerce.
+                    /*if (wc_get_order( $order_id ) && is_a( wc_get_order( $order_id ), 'WC_Order' )) {
+                        $order = wc_get_order( $order_id ); // Kept old code unchanged.
+                    } else {
+                        // Check if $order is a valid WC_Order object
+                        $order = is_a($order, 'WC_Order') ? $order : false;
+                        if (!$order) {
+                            return;
+                        }
+                    }*/
+
                     // $value = get_post_meta( $order_id, $key, true );
                     $value = $order->get_meta( $key, true );
@@ -706 +729 @@
                         $label = isset($field['label']) && $field['label'] ? $field['label'] : $key;
                         //$label = esc_attr($label);
-                        $label = wp_kses_post(__($label, 'woo-checkout-field-editor-pro'));
+                        $label = $this->translate_text($label, 'label');
+                        $label = wp_kses_post($label);
                         //$value = wptexturize($value);
                         $value = THWCFD_Utils::get_option_text($field, $value);
 
                         $f_type = isset($field['type']) ? $field['type'] : 'text';
-                        $value = esc_html__($value, 'woo-checkout-field-editor-pro');
+                        $value = $this->translate_text($value, 'option');
+                        $value = esc_html($value);
                         if($f_type == 'textarea'){
                             $value =  nl2br($value);
@@ -762 +787 @@
                 $required        ='&nbsp;<span class="required" aria-hidden="true">*</span>';
             }else{
-                $required        = '&nbsp;<abbr class="required" title="' . esc_attr__( 'required', 'woocommerce' ) . '">*</abbr>';
+                // phpcs:ignore WordPress.WP.I18n.TextDomainMismatch
+                $required        = '&nbsp;<abbr class="required" title="' . esc_attr__( 'required', 'woocommerce' ) . '">*</abbr>'; 
             }       
         } else {
+            // phpcs:ignore WordPress.WP.I18n.TextDomainMismatch
             $required = '&nbsp;<span class="optional">(' . esc_html__( 'optional', 'woocommerce' ) . ')</span>';
         }
@@ -822 +849 @@
 
                 if (!empty($args['options'])) {
-                    $field .= '<select name="' . esc_attr($key) . '[]" id="' . esc_attr($key) . '" class="select ' . esc_attr(implode(' ', $args['input_class'])) . '" multiple="multiple" ' . esc_attr(implode(' ', $custom_attributes)) . ' data-placeholder="' . esc_html__($args['placeholder'], 'woo-checkout-field-editor-pro') . '" >';
-                    foreach ($args['options'] as $option_key => $option_text) {
-                        $field .= '<option value="' . esc_attr($option_key) . '" ' . selected(in_array($option_key, $value), 1, false) . '>' . esc_html__($option_text, 'woo-checkout-field-editor-pro') . '</option>';
+                    $placeholder = !empty($args['placeholder']) ? $this->translate_text($args['placeholder'], 'placeholder') : '';
+                    $field .= '<select name="' . esc_attr($key) . '[]" id="' . esc_attr($key) . '" class="select ' . esc_attr(implode(' ', $args['input_class'])) . '" multiple="multiple" ' . esc_attr(implode(' ', $custom_attributes)) . ' data-placeholder="' . esc_attr($placeholder) . '" >';
+                    foreach ($args['options'] as $option_key => $option_text) { 
+                        $option_text = $this->translate_text( $option_text, 'option' );
+                        $field .= '<option value="' . esc_attr($option_key) . '" ' . selected(in_array($option_key, $value), 1, false) . '>' . esc_html($option_text) . '</option>';
                     }
                     $field .= ' </select>';
@@ -854 +883 @@
 
                     foreach ($args['options'] as $option_key => $option_text) {
-                        $field .= '<label><input type="checkbox" name="' . esc_attr($key) . '[]" value="' . esc_attr($option_key) . '"' . checked(in_array($option_key, $value), 1, false) . ' /> ' . esc_html__($option_text, 'woo-checkout-field-editor-pro') . '</label>';
+                        $option_text = $this->translate_text( $option_text, 'option' );
+                        $field .= '<label><input type="checkbox" name="' . esc_attr($key) . '[]" value="' . esc_attr($option_key) . '"' . checked(in_array($option_key, $value), 1, false) . ' /> ' . esc_html($option_text) . '</label>';
                     }
 
@@ -910 +940 @@
 
             if ($args['label'] && 'checkbox' !== $args['type']) {
-                $field_html .= '<label for="' . esc_attr($label_id) . '" class="' . esc_attr(implode(' ', $args['label_class'])) . '">' . esc_html__($args['label'], 'woo-checkout-field-editor-pro') . $required . '</label>';
+                $f_label = $this->translate_text($args['label'], 'label');
+                $field_html .= '<label for="' . esc_attr($label_id) . '" class="' . esc_attr(implode(' ', $args['label_class'])) . '">' . esc_html($f_label) . $required . '</label>';
             }
 
@@ -941 +972 @@
         
         if(isset($args['label']) && !empty($args['label'])){
-            $field  = '<p class="form-row '.esc_attr(implode(' ', $args['class'])).'" id="'.esc_attr($key).'_field" name="'.esc_attr($key).'" >'. esc_html__($args['label'], 'woo-checkout-field-editor-pro') .'</ p >';
+            $f_label = $this->translate_text($args['label'], 'label');
+            $field  = '<p class="form-row '.esc_attr(implode(' ', $args['class'])).'" id="'.esc_attr($key).'_field" name="'.esc_attr($key).'" >'. esc_html_($f_label) .'</ p >';
         }
 
@@ -955 +987 @@
         if(isset($args['label']) && !empty($args['label'])){
             $title_type  = isset($args['title_type']) && !empty($args['title_type']) ? $args['title_type'] : 'label';
-
-            $heading_html .= '<'. esc_attr($title_type) .' class="'. esc_attr(implode(' ', $args['label_class'])) .'" >'. esc_html__($args['label'], 'woo-checkout-field-editor-pro') .'</'. $title_type .'>';
+            $f_label = $this->translate_text($args['label'], 'label');
+            $heading_html .= '<'. esc_attr($title_type) .' class="'. esc_attr(implode(' ', $args['label_class'])) .'" >'. esc_html($f_label) .'</'. $title_type .'>';
         }
 
@@ -972 +1004 @@
 
     }
+
+    /**
+     * Translate dynamic strings with WPML / Polylang,
+     * fallback to WooCommerce core translations when applicable.
+     *
+     * @param string $text Original text.
+     * @param string $key  Stable translation key.
+     * @return string
+     */
+    private function translate_text( $text, $text_type = 'label' ) {
+
+        if ( empty( $text ) ) {
+            return '';
+        }
+        $key = 'Field label - ' . $text;
+        if ( $text_type === 'placeholder' ) {
+            $key = 'Field placeholder - ' . $text;
+        } elseif ( $text_type === 'option' ) {
+            $key = 'Field option text - ' . $text;
+        }
+
+        // WPML (preferred for dynamic/admin strings)
+        if ( has_filter( 'wpml_translate_single_string' ) ) {
+            $translated = apply_filters(
+                'wpml_translate_single_string',
+                $text,
+                'woo-checkout-field-editor-pro',
+                $key
+            );
+
+            if ( $translated !== $text ) {
+                return $translated;
+            }
+        }
+
+        // Polylang, 2nd preference for dynamic/admin strings, consider when add support for Polylang is requested
+        // if ( function_exists( 'pll__' ) ) {
+        //  $translated = pll__( $text );
+        //  if ( $translated !== $text ) {
+        //      return $translated;
+        //  }
+        // }
+
+        // Plugin gettext fallback.
+        // This is kept for backward compatibility to support existing translations
+        // that rely on the plugin text domain (.mo files) before WPML integration.
+        // phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText
+        $plugin_translation = __( $text, 'woo-checkout-field-editor-pro' );
+
+        if ( $plugin_translation !== $text ) {
+            return $plugin_translation;
+        }
+
+        // WooCommerce core fallback, Used only when WooCommerce already provides a translation for this string in the current locale.
+        // phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText, WordPress.WP.I18n.TextDomainMismatch
+        return __( $text, 'woocommerce' );
+    }
     
 }

woo-checkout-field-editor-pro/trunk/readme.txt

@@ -4 +4 @@
 Tags: Checkout  Manager, Checkout Field Editor, WooCommerce Checkout, WooCommerce Checkout Field, Custom fields
 Requires at least: 4.9
-Tested up to: 6.8
+Tested up to: 6.9
 Requires PHP: 5.6
-Stable tag: 2.1.5
+Stable tag: 2.1.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -25 +25 @@
 ==How WooCommerce Checkout Field Editor (Checkout Manager) simplifies customization? ==
 
+[youtube  https://youtu.be/eMGjviRHyfo?si=IC5et0Mqe7Yf1Nk_]
+
 ✳️ **Complete Checkout Field Customization →** Effortlessly add, edit, remove, and rearrange fields.               
 
@@ -37 +39 @@
 **👉Note:** Block Compatibility → Our Checkout Field Editor (Checkout Manager) for WooCommerce now supports WooCommerce Checkout Blocks, allowing customization with Text, Select, Radio, and Checkbox fields, plus validation for Email, Phone, and URL. More field types will be added in upcoming updates.
 
-[Try Demo]((https://flydemos.com/wcfe/?utm_source=wcfe_free&utm_medium=readme&utm_campaign=try_demo)) | [Documentation](https://www.themehigh.com/docs/docs-category/checkout-field-editor-for-woocommerce/?utm_source=wcfe_free&utm_medium=readme&utm_campaign=help_docs) | [Get Pro ](https://www.themehigh.com/product/woocommerce-checkout-field-editor-pro/?utm_source=wcfe_free&utm_medium=readme&utm_campaign=wcfe_upgrade_link) 
+[Try Demo]((https://flydemos.com/wcfe/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=try_demo)) | [Documentation](https://www.themehigh.com/docs/docs-category/checkout-field-editor-for-woocommerce/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=pro_doc) | [Get Pro ](https://www.themehigh.com/product/woocommerce-checkout-field-editor-pro/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=wcfe_upgrade_link) 
 
 ==🔥 EXPLORE WHAT OUR FREE VERSION OFFERS  ==
@@ -74 +76 @@
 Users can **edit, delete and enable/disable these fields**. With the simple drag-and-drop interface, users can also easily **reposition fields** to meet their business needs effortlessly.
 
+[youtube https://youtu.be/6UXexzGIn-8?si=sUiapwT3z6tb5NrY]
+
 = ✅ VALIDATE THE CHECKOUT FIELDS =
 Validate both custom and default checkout fields to prevent incomplete or incorrect submissions, enhancing the user experience and reducing errors during checkout. 
@@ -101 +105 @@
 ==🔥 WHY SWITCH TO PRO?==
 
-While the free version of [Checkout Field Editor for WooCommerce](https://flydemos.com/wcfe/?utm_source=wcfe_free&utm_medium=readme&utm_campaign=try_demo%29) offers essential features to enhance your checkout pages, the premium version offers full control over your checkout process & easily customize WooCommerce Checkout Fields – Works with Both Classic & Block Checkout!—ensuring a better customer experience and higher revenue such as:
+While the free version of [Checkout Field Editor for WooCommerce](https://flydemos.com/wcfe/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=try_demo) offers essential features to enhance your checkout pages, the premium version offers full control over your checkout process & easily customize WooCommerce Checkout Fields – Works with Both Classic & Block Checkout!—ensuring a better customer experience and higher revenue such as:
 
 **👉 4 additional field types for more flexibility**
@@ -111 +115 @@
 **👉 Compatibility with third-party plugins for extended functionality** 
 
-[GET FULL ACCESS WITH PREMIUM NOW !](https://www.themehigh.com/product/woocommerce-checkout-field-editor-pro/)
+[GET FULL ACCESS WITH PREMIUM NOW !](https://www.themehigh.com/product/woocommerce-checkout-field-editor-pro/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=wcfe_upgrade_link)
 
 = 👉 WPML Compatibility =
-The Extra product options plugin is WPML compatible and it lets you create product pages in multiple languages.
+The WooCommerce Checkout Field Editor works smoothly with WPML, allowing you to translate checkout field labels and text into multiple languages for a better multilingual checkout experience.
 
 == 🔥 SEE  OUR  PREMIUM FEATURES ==
-[Try Demo]((https://flydemos.com/wcfe/?utm_source=wcfe_free&utm_medium=readme&utm_campaign=try_demo)) | [Documentation](https://www.themehigh.com/docs/docs-category/checkout-field-editor-for-woocommerce/?utm_source=wcfe_free&utm_medium=readme&utm_campaign=help_docs) | [Get Pro ](https://www.themehigh.com/product/woocommerce-checkout-field-editor-pro/?utm_source=wcfe_free&utm_medium=readme&utm_campaign=wcfe_upgrade_link) 
+[Try Demo]((https://flydemos.com/wcfe/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=try_demo)) | [Documentation](https://www.themehigh.com/docs/docs-category/checkout-field-editor-for-woocommerce/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=pro_doc) | [Get Pro ](https://www.themehigh.com/product/woocommerce-checkout-field-editor-pro/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=wcfe_upgrade_link) 
 
 = ✅  ADD 4 ADDITIONAL FIELDS TYPES TO CHECKOUT PAGE =
@@ -126 +130 @@
     4.  Label
 
-    🆕 **👉 Note:** The Pro version  lets you add an extra checkout field type **Date Picker** when using Block Checkout.
+🆕 **👉 Note:** The Pro version  lets you add an extra checkout field type **Date Picker** when using Block Checkout.
    
 = ✅ POSITION SECTIONS AT 14 POSITIONS  = 
@@ -255 +259 @@
 
 == OTHER USEFUL LINKS==
-👉 [VIEW ALL FEATURES](https://www.themehigh.com/product/woocommerce-checkout-field-editor-pro/)
-👉 [GET DOCUMENTATION](https://www.themehigh.com/docs/category/checkout-field-editor-for-woocommerce/)
-👉 [GET THEMEHIGH SUPPORT](https://www.themehigh.com/docs/support/)
+👉 [VIEW ALL FEATURES](https://www.themehigh.com/product/woocommerce-checkout-field-editor-pro/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=wcfe_upgrade_link)
+👉 [GET DOCUMENTATION](https://www.themehigh.com/docs/category/checkout-field-editor-for-woocommerce/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=pro_doc)
+👉 [GET THEMEHIGH SUPPORT](https://www.themehigh.com/docs/support/?utm_source=wcfe_free&utm_medium=referral&utm_campaign=cfe_support)
 👉 [JOIN COMMUNITY](https://www.facebook.com/groups/themehigh/)
 👉 FOLLOW US ON [Facebook](https://www.facebook.com/ThemeHigh-319611541768603/), [LinkedIn](https://www.linkedin.com/company/themehigh/), [Twitter](https://twitter.com/themehigh/) , [YouTube](https://www.youtube.com/channel/UC-_uMXaC_21j1Y2_nGjTyvg/) & [Reddit](https://www.reddit.com/r/themehigh).
@@ -328 +332 @@
 == Screenshots ==
 1. WooCommerce > Checkout Form
-2. Add new field
+2. Add and edit field
 3. New field popup form
-4. Edit existing field
-5. Edit field popup form
-6. Rearrange fields (change field's display order)
-7. Reset to default settings
-8. Save changes
-9. Locale override settings
+4. Edit field popup form
+5. Rearrange fields (change field's display order)
+6. Reset and save fields
+7. Advance settings
+8. Custom field (Text)
+9. Custom field (Radio)
+10. Custom field (Date)
+11. Block Data fields
+12. Block checkout custom fields( Radio and Text)
 
 == Changelog ==
+= 2.1.6 =
+* Added compatiblity for Archiva for WooCommerce.
+* Improved dynamic string translation for WPML.
+* Added WooCommerce 10.4 compatibility.
+* Added WordPress 6.9 compatibility.
 
 = 2.1.5 =
@@ -344 +356 @@
 * Added WooCommerce 10.2 compatibility.
 
-
 = 2.1.4 =
 * Fixed shipping calculation issue when "Hide shipping costs until an address is entered" is enabled (WooCommerce 9.8+ compatibility).