Changeset 3792925

Timestamp:

11/09/2026 05:11:47 PM (2 hours ago)

Author:

lionrapid

Message:

Deploying version 1.4.2

Location:

lionrapid-translation

Files:

• assets/banner-1544x500.png (modified) ( previous)
• assets/banner-772x250.png (modified) ( previous)
• trunk/languages/lionrapid-translation.pot (modified) (4 diffs)
• trunk/lionrapid.php (modified) (4 diffs)
• trunk/readme.txt (modified) (4 diffs)
• trunk/src/Config/Version.php (modified) (1 diff)
• trunk/src/Core/OtherCopies.php (added)
• trunk/src/Core/Plugin.php (modified) (3 diffs)

lionrapid-translation/trunk/languages/lionrapid-translation.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Lionrapid Translation 1.4.1\n"
+"Project-Id-Version: Lionrapid Translation 1.4.2\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/lionrapid-translation\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: 2026-11-09T11:17:26+00:00\n"
+"POT-Creation-Date: 2026-11-09T17:11:36+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
@@ -42 +42 @@
 msgstr ""
 
-#: lionrapid.php:45
+#: lionrapid.php:63
 msgid "Lionrapid Translation needs PHP 8.1 or newer and is not running. Ask your host to update PHP."
 msgstr ""
@@ -603 +603 @@
 #: src/Config/LanguageConfig.php:49
 msgid "French"
+msgstr ""
+
+#. translators: 1: the old copy's version, 2: its folder, 3: the version in use.
+#: src/Core/OtherCopies.php:164
+#, php-format
+msgid "This is an older copy of Lionrapid Translation (version %1$s, in plugins/%2$s/). It does not run while this site uses Lionrapid Translation %3$s, and it gets no updates. You can delete it; your settings stay."
+msgstr ""
+
+#. translators: 1: the old copy's version, 2: its folder.
+#: src/Core/OtherCopies.php:186
+#, php-format
+msgid "An older copy of Lionrapid Translation (version %1$s, in plugins/%2$s/) is still installed. It does not run and gets no updates. You can delete it on the Plugins screen; your settings stay."
+msgstr ""
+
+#: src/Core/OtherCopies.php:190
+msgid "Go to Plugins"
 msgstr ""
 

lionrapid-translation/trunk/lionrapid.php

@@ -5 +5 @@
  * Plugin URI: https://www.lionrapid.com/integrations/wordpress
  * Description: Translates your site on the server, before the page reaches the browser. Languages and settings come from your Lionrapid dashboard.
- * Version: 1.4.1
+ * Version: 1.4.2
  * Requires at least: 6.0
  * Requires PHP: 8.1
@@ -29 +29 @@
 if (!defined('ABSPATH')) {
     exit;
+}
+
+// Another copy of this plugin has loaded already in this request: an old ZIP
+// install in plugins/lionrapid/ (up to 1.3.0) is active, and this copy is being
+// activated on top of it — installing from the plugin directory without
+// deactivating the old copy first. Loading on would declare the same functions
+// twice; until 1.4.2 that activation died with "Cannot redeclare lionrapid()".
+// Load nothing here and take over on activation: deactivate the other copy. The
+// two share their settings (lionrapid_*), so the next request runs this copy with
+// the same key and languages. Core\OtherCopies handles deleting the old copy.
+if (defined('LIONRAPID_PLUGIN_FILE') && LIONRAPID_PLUGIN_FILE !== __FILE__) {
+    register_activation_hook(
+        __FILE__,
+        static function (): void {
+            deactivate_plugins(plugin_basename(LIONRAPID_PLUGIN_FILE), true);
+        }
+    );
+    return;
 }
 
@@ -138 +156 @@
     // Core
     require_once LIONRAPID_PLUGIN_DIR . 'src/Core/HookRegistrar.php';
+    require_once LIONRAPID_PLUGIN_DIR . 'src/Core/OtherCopies.php';
     require_once LIONRAPID_PLUGIN_DIR . 'src/Core/Plugin.php';
 }
@@ -147 +166 @@
  * Initialize plugin
  */
-function lionrapid(): Plugin
-{
-    return Plugin::boot();
+// Declared conditionally on purpose: PHP binds an unconditional top-level
+// function when it compiles the file, before the other-copy check above runs.
+if (!function_exists(__NAMESPACE__ . '\\lionrapid')) {
+    function lionrapid(): Plugin
+    {
+        return Plugin::boot();
+    }
 }
 

lionrapid-translation/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 7.1
 Requires PHP: 8.1
-Stable tag: 1.4.1
+Stable tag: 1.4.2
 License: MIT
 License URI: https://opensource.org/licenses/MIT
@@ -104 +104 @@
 ZIP files before 1.3.1 installed into the folder `lionrapid`; the directory version installs into `lionrapid-translation`. WordPress treats them as two plugins, but they share one set of settings.
 
-Deactivate and delete the old one first, then install Lionrapid Translation from the directory and enter your site key again. Do not delete the old one after installing the new one: deleting the old copy removes the shared settings, so the new install loses its site key too.
-
-To keep your settings instead: deactivate the old one, install and activate Lionrapid Translation, then remove the folder `wp-content/plugins/lionrapid` with your host's file manager or FTP rather than from the Plugins screen.
+Install Lionrapid Translation from the directory and activate it. If the old copy is still active, the new one deactivates it and takes over with your site key and settings. Then delete the old copy from **Plugins**; your settings stay. The Plugins screen and Settings → Lionrapid point out the old copy while it is still installed.
+
+Before 1.4.2, deleting the old copy removed the shared settings. If you installed an earlier version from the directory and still have the old copy, update to 1.4.2 first, then delete it.
+
+ZIP files from 1.3.1 on install into `lionrapid-translation`, the directory's own folder, so WordPress treats a ZIP install and a directory install as the same plugin: updates from the directory arrive in **Dashboard → Updates** either way, and your settings are kept.
 
 = Where is the source code of the bundled JavaScript? =
@@ -125 +127 @@
 
 == Changelog ==
+
+= 1.4.2 =
+
+* Fixed: activating Lionrapid Translation while an older copy installed from a ZIP
+  (in plugins/lionrapid/) is still active no longer fails with a fatal error. The new
+  copy takes over and deactivates the old one; your connection and settings carry over.
+* Fixed: deleting that older copy no longer deletes your settings. Its uninstall used to
+  remove the settings the two copies share, which disconnected the site.
+* New: the Plugins screen and Settings → Lionrapid say when an older copy is still
+  installed, and that it can be deleted.
 
 = 1.4.1 =
@@ -369 +381 @@
 == Upgrade Notice ==
 
+= 1.4.2 =
+
+Moving from an older copy installed from a ZIP now keeps your settings, and the old
+copy can be deleted safely. Your connection and settings are kept.
+
 = 1.4.1 =
 

lionrapid-translation/trunk/src/Config/Version.php

@@ -21 +21 @@
      * Current plugin version
      */
-    public const NUMBER = '1.4.1';
+    public const NUMBER = '1.4.2';
 
     /**

lionrapid-translation/trunk/src/Core/Plugin.php

@@ -21 +21 @@
 use Hatamoto\LionRapid\WordPress\Assets\ClientLocaleRedirect;
 use Hatamoto\LionRapid\WordPress\Config\PluginConfig;
+use Hatamoto\LionRapid\WordPress\Config\Version;
 use Hatamoto\LionRapid\WordPress\Contracts\HookRegistrarInterface;
 use Hatamoto\LionRapid\WordPress\Integrations\IntegrationFactory;
@@ -47 +48 @@
 final class Plugin
 {
+    /** The plugin version that last ran on this site (see boot()). */
+    public const VERSION_OPTION = 'lionrapid_plugin_version';
+
     private static ?self $instance = null;
 
@@ -70 +74 @@
         $settingsRepository = new SettingsRepository();
         $config = $settingsRepository->get();
+
+        // The version that last ran on this site. WordPress runs no activation
+        // hook on an update (directory or ZIP alike), so anything an update needs
+        // happens here, on load, compared against this stamp — and settings
+        // change additively (new keys with defaults), never renamed or
+        // repurposed, so an older copy can still read them after a downgrade.
+        if (get_option(self::VERSION_OPTION) !== Version::NUMBER) {
+            update_option(self::VERSION_OPTION, Version::NUMBER, true);
+        }
+
+        // An old copy of the plugin (plugins/lionrapid/, the GitHub ZIP up to
+        // 1.3.0) shares these settings: deleting it must not delete them, and the
+        // admin screens say it can go.
+        (new OtherCopies(LIONRAPID_PLUGIN_BASENAME))->register();
 
         // === Assets ===