Changeset 3749545

Timestamp:

10/16/2026 01:58:54 AM (10 days ago)

Author:

domclic

Message:

3.3.27: glossary import reads columns by name, refuses one-column pastes

Location:

effortless-multisite-auto-translate/trunk

Files:

• effortless-multisite-auto-translate.php (modified) (1 diff)
• includes/class-elmat-admin.php (modified) (7 diffs)
• includes/class-elmat-translator.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)

effortless-multisite-auto-translate/trunk/effortless-multisite-auto-translate.php

@@ -3 +3 @@
  * Plugin Name: EffortLess Multisite Auto Translate
  * Description: Translate Gutenberg posts and titles across a WordPress multisite using GPT. Includes retries, error logging, live log highlighting, and automatic sync of trash/delete operations.
- * Version: 3.3.26
+ * Version: 3.3.27
  * Requires at least: 5.4
  * Requires PHP: 7.4

effortless-multisite-auto-translate/trunk/includes/class-elmat-admin.php

@@ -1316 +1316 @@
          * Import a glossary from an uploaded CSV/TSV file or text pasted from a spreadsheet.
          *
-         * The first row names the columns: source, default, then one column per
-         * destination site, named by its language (e.g. ko_KR, or ko), its address
-         * (e.g. /ko/) or "site_ID", as the export writes them. Comma, semicolon and
+         * The first row names the columns: the source term first, then "default" (the
+         * value for every language, optional) and one column per destination site, named
+         * by its language (e.g. ko_KR, or ko), its address (e.g. /ko/) or "site_ID", as the
+         * export writes them, in any order. Comma, semicolon and
          * tab separators are recognised. "Add and update" replaces the entries whose
          * source term is in the file and keeps the others; "Replace" keeps only the
@@ -1345 +1346 @@
                 if ( count( $rows ) < 2 ) {
                         $this->redirect_after_glossary_import( array( 'glossary-import-error' => 'empty' ) );
+                }
+                // A header with one column means the separators were lost (tabs copied as spaces
+                // from a chat or a web page): importing would turn whole lines into source terms.
+                if ( count( $rows[0] ) < 2 ) {
+                        $this->redirect_after_glossary_import( array( 'glossary-import-error' => 'columns' ) );
                 }
 
@@ -1370 +1376 @@
                         }
                 }
-                $site_map = array();
-                $ignored  = array();
+                // Columns are read by name: the first is the source term, "default" (or "all") the
+                // value for every language, any other a destination site.
+                $site_map    = array();
+                $ignored     = array();
+                $default_col = -1;
                 foreach ( $header as $index => $name ) {
-                        if ( $index < 2 ) {
+                        if ( 0 === $index ) {
                                 continue;
                         }
                         $key = strtolower( trim( str_replace( '-', '_', $name ), " /\t" ) );
+                        if ( in_array( $key, array( 'default', 'all', 'all_languages' ), true ) ) {
+                                $default_col = $index;
+                                continue;
+                        }
                         if ( isset( $lookup[ $key ] ) ) {
                                 $site_map[ $index ] = $lookup[ $key ];
@@ -1403 +1416 @@
                         $imported[ $source ] = array(
                                 'source'   => $source,
-                                'global'   => $clean( $row[1] ?? '' ),
+                                'global'   => $default_col > 0 ? $clean( $row[ $default_col ] ?? '' ) : '',
                                 'per_site' => $per_site,
                         );
@@ -1508 +1521 @@
                 // phpcs:disable WordPress.Security.NonceVerification.Recommended -- Read-only result flags of the redirect after a nonce-checked import.
                 if ( isset( $_GET['glossary-import-error'] ) ) {
-                        $error = sanitize_key( wp_unslash( $_GET['glossary-import-error'] ) );
-                        $text  = 'file' === $error
-                                ? 'The file could not be read. Use a .csv, .tsv or .txt file of at most 1 MB.'
-                                : 'Nothing to import: the table needs a header row (source, default, then one column per language) and at least one term.';
+                        $error    = sanitize_key( wp_unslash( $_GET['glossary-import-error'] ) );
+                        $messages = array(
+                                'file'    => 'The file could not be read. Use a .csv, .tsv or .txt file of at most 1 MB.',
+                                'columns' => 'Only one column was found: separate the columns with commas, semicolons or tabs (tabs copied from a chat or a web page often become spaces — use commas then). Nothing was imported.',
+                                'empty'   => 'Nothing to import: the table needs a header row (source, default, then one column per language) and at least one term.',
+                        );
+                        $text     = $messages[ $error ] ?? $messages['empty'];
                         echo '<div class="notice notice-error is-dismissible"><p><strong>📖 Glossary not imported.</strong> ' . esc_html( $text ) . '</p></div>';
                 } elseif ( isset( $_GET['glossary-imported'] ) ) {
@@ -2350 +2366 @@
                                                 <summary style="cursor:pointer; font-weight:600;">⇅ Import / export</summary>
                                                 <p style="color:#6b7280;">
-                                                        The file has one row per term: <code>source</code>, <code>default</code>, then one column per destination site, named by its language
-                                                        (<?php echo esc_html( implode( ', ', $this->glossary_site_columns() ) ); ?>). An empty cell means no value for that site.
-                                                        Export first to get the right columns, edit the file in a spreadsheet, then import it, or copy the cells from the spreadsheet and paste them below.
+                                                        One row per term. The first row names the columns: <code>source</code> first, then, in any order, <code>default</code> (the value for every language, optional) and one column per language
+                                                        (<?php echo esc_html( implode( ', ', $this->glossary_site_columns() ) ); ?>, or just the language code: en, fr, ko…). An empty cell means no value for that language.
+                                                        Separate the columns with commas, semicolons or tabs. Export first to get the right columns, edit the file in a spreadsheet, then import it, or copy the cells from the spreadsheet and paste them below.
                                                 </p>
                                                 <p>
@@ -2365 +2381 @@
                                                         <p>
                                                                 <label for="elmat_gloss_paste"><strong>…or paste the cells</strong> (header row included)</label><br>
-                                                                <textarea id="elmat_gloss_paste" name="elmat_gloss_paste" rows="6" class="elmat-input" style="width:100%; font-family:monospace;" placeholder="source&#9;default&#9;ko_KR&#10;平溪&#9;&#9;핑시"></textarea>
+                                                                <textarea id="elmat_gloss_paste" name="elmat_gloss_paste" rows="6" class="elmat-input" style="width:100%; font-family:monospace;" placeholder="source,default,ko&#10;平溪,Pingxi,핑시"></textarea>
                                                         </p>
                                                         <p>

effortless-multisite-auto-translate/trunk/includes/class-elmat-translator.php

@@ -50 +50 @@
         // -------------------------------------------------------------------------
 
-        const PLUGIN_VERSION = '3.3.26';
+        const PLUGIN_VERSION = '3.3.27';
 
         const MAX_RETRIES        = 2;

effortless-multisite-auto-translate/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 7.1
 Requires PHP: 7.4
-Stable tag: 3.3.26
+Stable tag: 3.3.27
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -186 +186 @@
 Only the most recent versions are listed here to stay within WordPress.org's changelog length limit; see the plugin's own repository for the full history.
 
+= 3.3.27 =
+* Fix: glossary import read the second column as the default value whatever its name, so a table like "source,fr,ko" put the French values into the default for every language. Columns are now read by name, in any order: "default" (or "all") is the default, any other name a language (ko_KR, ko, /ko/ or site_ID).
+* Fix: a pasted table with a single column (tabs turned into spaces when copied from a chat or a web page) was imported as whole lines of source terms; it is now refused with an explanation, and nothing is imported.
+
 = 3.3.26 =
 * Fix: translated SEO descriptions and other multi-sentence texts could start with or contain "__ELMAT_SEG_1__": the rule about these internal markers (used only for Custom HTML blocks) was sent with every text, and the model sometimes added markers of its own. The rule is now sent only with texts that contain markers, and markers in a translation whose source has none are removed.
@@ -353 +357 @@
 * Fix: a background image or other `url(...)` reference inside the source site's Additional CSS was copied to destination sites unchanged, so it kept loading from the source site's own address. It now goes through the same media-URL rewrite already used for images inside pages and templates.
 
-= 3.2.55 =
-* Fix: a reusable/synced pattern embedded in a header, footer, template, or another pattern could render blank or show the wrong content on destination sites. That kind of pattern is referenced by a raw post ID with no slug involved, and the ID was being copied unchanged across sites, pointing at an unrelated (or missing) post on the destination. Every pattern reference is now remapped to the correct destination post, the same way navigation menu references already were.
-
 == Upgrade Notice ==