Changeset 3742586 for langforge/trunk/admin/class-admin.php

Timestamp:

10/12/2026 10:54:31 PM (2 weeks ago)

Author:

avakodeforge

Message:

Release 1.2.9 (trunk + tag; see readme changelog)

File:

• langforge/trunk/admin/class-admin.php (modified) (12 diffs)

langforge/trunk/admin/class-admin.php

@@ -1647 +1647 @@
         }
 
+        // Languages that just went away and still have posts. Counted here, stored
+        // at the very end of the method (see "Orphaned translations" below).
+        $pending = [];
         if ($save_languages) {
             // Tester feedback 2026-04-18: removing a language from the active
@@ -1658 +1661 @@
             $new_codes = array_keys($active);
             $removed   = array_diff($old_codes, $new_codes);
-            $pending   = [];
             foreach ($removed as $code) {
                 if ($code === $default) continue;
@@ -1675 +1677 @@
                 }
             }
-            if (!empty($pending)) {
-                set_transient('langforge_removed_lang_pending_' . get_current_user_id(), $pending, HOUR_IN_SECONDS);
-            }
         }
 
@@ -1700 +1699 @@
         // Flush rewrite rules
         flush_rewrite_rules();
+
+        // Orphaned translations: hand the list to the next admin screen LAST,
+        // after every purge above. With a persistent object cache (Redis,
+        // Memcached) a transient lives in that cache only, and wp_cache_flush
+        // (and the cache plugins' "purge all") empties it: written before the
+        // purge, the list was gone in the same request and the owner who removed
+        // a language was never told about its posts. Without a persistent cache
+        // the transient is an options row and nothing changes.
+        if (!empty($pending)) {
+            set_transient('langforge_removed_lang_pending_' . get_current_user_id(), $pending, HOUR_IN_SECONDS);
+        }
         // phpcs:enable WordPress.Security.NonceVerification.Missing
     }
@@ -1739 +1749 @@
         }
         
-        // Build unique strings. For source_lang, use the record with the lowest id
-        // (= the first language registered for this string name).
-        $unique = [];
-        foreach ($all_strings as $string) {
-            $name = $string->string_name;
-            if (!isset($unique[$name])) {
-                $unique[$name] = [
-                    'source_lang' => $string->string_language,
-                    'source_id' => (int) $string->id,
-                    'domain' => $string->string_domain,
-                    'translations' => []
-                ];
-            } elseif ((int) $string->id < $unique[$name]['source_id']) {
-                // Earlier record = real source
-                $unique[$name]['source_lang'] = $string->string_language;
-                $unique[$name]['source_id'] = (int) $string->id;
-            }
-            $unique[$name]['translations'][$string->string_language] = $string->string_value;
-        }
-        
-        return $unique;
+        // One entry per name (source language = the earliest record; two domains with one name are not mixed).
+        return LANGFORGE_Strings_Screen::group_rows((array) $all_strings);
     }
     
@@ -1819 +1810 @@
         $strings = LANGFORGE_String_Translation::instance()->get_strings($current_domain ?: null, $default_lang);
         $domain_counts = $this->get_domain_counts();
+        $woo_active = class_exists('WooCommerce');
         ?>
         <div class="wrap">
             <?php LANGFORGE_Admin_Tabs::render('langforge-strings'); ?>
             <?php do_action('langforge/admin_screen_top', 'langforge-strings'); ?>
-            <h1><?php esc_html_e('String Translation', 'langforge'); ?><?php Forge_Docs_Link::render('langforge', 'translating-theme-text-string-translation', __('String translation', 'langforge'), __('Translate theme & plugin text strings scanned from your code.', 'langforge')); ?></h1>
-            
+            <h1><?php esc_html_e('String Translation', 'langforge'); ?><?php Forge_Docs_Link::render('langforge', 'translating-theme-text-string-translation', __('String translation', 'langforge'), LANGFORGE_Strings_Screen::help_text()); ?></h1>
+
+            <?php
+            // How a string gets into the list, and (for a shop) the button that lists the WooCommerce ones without a page being shown.
+            LANGFORGE_Strings_Screen::render_intro($woo_active);
+            if ($woo_active) {
+                LANGFORGE_Strings_Screen::render_find_box();
+                wp_add_inline_script('lf-admin', LANGFORGE_Strings_Screen::find_script());
+            }
+            ?>
+
             <div class="lf-string-filters">
                 <form method="get" action="">
@@ -1905 +1906 @@
                     </div>
                 <?php else: ?>
-                    <p><?php esc_html_e('No strings found. Add strings using the form above or register them in your theme/plugin code.', 'langforge'); ?></p>
+                    <p><?php echo esc_html(LANGFORGE_Strings_Screen::empty_text($woo_active)); ?></p>
                 <?php endif; ?>
             <?php else:
@@ -2024 +2025 @@
                                         <span class="dashicons dashicons-clipboard"></span>
                                     </button>
+                                    <?php
+                                    // The texts of the emails are listed under keys: show the text behind the key.
+                                    $name_excerpt = LANGFORGE_Strings_Screen::source_excerpt(
+                                        $string_data['domain'],
+                                        isset($string_data['translations'][$string_data['source_lang']]) ? $string_data['translations'][$string_data['source_lang']] : ''
+                                    );
+                                    if ($name_excerpt !== '') {
+                                        echo '<br><small class="lf-name-excerpt" style="color:#64748b;">' . esc_html($name_excerpt) . '</small>';
+                                    }
+                                    LANGFORGE_Strings_Screen::render_other_domains_note(isset($string_data['also_in']) ? $string_data['also_in'] : []);
+                                    ?>
                                 </td>
                                 <?php if (!$current_domain): ?>
@@ -2052 +2064 @@
                                     ?>
                                     <td>
-                                        <textarea name="strings[<?php echo esc_attr($string_name); ?>][<?php echo esc_attr($code); ?>]"
-                                                  class="widefat" rows="2" <?php echo $is_source ? 'style="background:#f0f0f0;"' : ''; ?>><?php echo esc_textarea($trans_value); ?></textarea>
-                                        <?php if ($is_source): ?>
-                                            <small style="color:#666;"><?php esc_html_e('(source)', 'langforge'); ?></small>
-                                        <?php endif; ?>
+                                        <?php LANGFORGE_Strings_Screen::render_translation_cell($string_name, $code, $string_data['domain'], $is_source, $trans_value); ?>
                                     </td>
                                 <?php endforeach; ?>
@@ -2477 +2485 @@
             .lf-domain-badge { background: #f0f0f0; color: #555; padding: 2px 8px; border-radius: 4px; font-size: 14px; }
             .lf-add-string-form { background: #f9f9f9; padding: 15px; margin: 20px 0; }
+            .lf-find-woo { margin: 12px 0; }
+            .lf-find-woo .lf-find-woo-status { margin-left: 10px; font-size: 14px; color: #475569; }
+            .lf-find-woo .description { margin-top: 6px; max-width: 820px; }
         <?php } finally { $lf_inline_css = (string) ob_get_clean(); } wp_add_inline_style('lf-admin', $lf_inline_css); ?>
         <?php
@@ -2510 +2521 @@
             foreach ($translations as $lang => $value) {
                 $lang = sanitize_text_field($lang);
-                $value = sanitize_textarea_field($value);
+                $value = LANGFORGE_Strings_Screen::sanitize_translation($domain, $value);
 
                 if (!empty($value)) {
@@ -3992 +4003 @@
             });
         });
-        <?php } finally { $lf_inline_js = (string) ob_get_clean(); } wp_add_inline_script('lf-admin', $lf_inline_js); ?>
+        <?php } finally { $lf_inline_js = (string) ob_get_clean(); }
+        // This notice is printed on every admin screen (admin_notices), but lf-admin.js is queued only on the Lang Forge
+        // pages, the post lists/editors and the taxonomy screens (its click handlers are global; see
+        // enqueue_admin_scripts). An inline script handed to a handle that is not queued is dropped, so on the
+        // Dashboard, Plugins or Media the buttons were drawn and did nothing. Own handle, jQuery only, and only here:
+        // the method has returned already when no list is waiting.
+        wp_register_script('lf-removed-lang-notice', false, ['jquery'], LANGFORGE_VERSION, true);
+        wp_enqueue_script('lf-removed-lang-notice');
+        wp_add_inline_script('lf-removed-lang-notice', $lf_inline_js); ?>
         <?php
     }