Merge branch '4.7' into feature/fix-extra-carts-created

craftcms · Oct 15, 2024 · 58b62a5 · 58b62a5
2 parents 4caaaae + 768a211
commit 58b62a5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Plugin.php b/src/Plugin.php
@@ -120,6 +120,7 @@
 use craft\helpers\Cp;
 use craft\helpers\Db;
 use craft\helpers\FileHelper;
+use craft\helpers\Html;
 use craft\helpers\UrlHelper;
 use craft\models\FieldLayout;
 use craft\redactor\events\RegisterLinkOptionsEvent;
@@ -294,7 +295,13 @@ private function _checkUpgradeCommandHasFinished()
         if ($columnsExist) {
             Event::on(Cp::class, Cp::EVENT_REGISTER_ALERTS, static function($event) {
                 $event->alerts[] = [
-                    'content' => Craft::t('commerce', 'Craft Commerce 4 upgrade incomplete. Please ensure the upgrade command has finished running.'),
+                    'content' =>
+                        Html::tag('strong', Craft::t('commerce', '{name} upgrade incomplete.', [
+                            'name' => '<span lang="en">Craft Commerce 4</span>',
+                        ])) . ' ' .
+                        Craft::t('commerce', 'Please ensure the <a href="{url}">upgrade command</a> has finished running.', [
+                            'url' => 'https://craftcms.com/docs/commerce/4.x/upgrading.html#performing-the-upgrade',
+                        ]),
                 ];
             });
         }

diff --git a/src/translations/en/commerce.php b/src/translations/en/commerce.php
@@ -238,7 +238,6 @@
     'Coupon removed: {explanation}' => 'Coupon removed: {explanation}',
     'Coupons' => 'Coupons',
     'Craft Commerce' => 'Craft Commerce',
-    'Craft Commerce 4 upgrade incomplete. Please ensure the upgrade command has finished running.' => '<strong><span lang="en">Craft Commerce 4</span> upgrade incomplete.</strong> Please ensure the <a href="https://craftcms.com/docs/commerce/4.x/upgrading.html#performing-the-upgrade" target="_blank" rel="noopener noreferrer">upgrade command</a> has finished running.',
     'Create a Discount' => 'Create a Discount',
     'Create a Product Type' => 'Create a Product Type',
     'Create a Subscription Plan' => 'Create a Subscription Plan',
@@ -754,6 +753,7 @@
     'Plan' => 'Plan',
     'Plans reordered.' => 'Plans reordered.',
     'Plans' => 'Plans',
+    'Please ensure the <a href="{url}">upgrade command</a> has finished running.' => 'Please ensure the <a href="{url}">upgrade command</a> has finished running.',
     'Post Date' => 'Post Date',
     'Postal Code Formula' => 'Postal Code Formula',
     'Pounds (lb)' => 'Pounds (lb)',
@@ -1202,6 +1202,7 @@
     '{description} is no longer available.' => '{description} is no longer available.',
     '{description} only has {stock} in stock.' => '{description} only has {stock} in stock.',
     '{name} (Primary)' => '{name} (Primary)',
+    '{name} upgrade incomplete.' => '{name} upgrade incomplete.',
     '{num, plural, =1{Order} other{Orders}} updated.' => '{num, plural, =1{order} other{orders}} updated.',
     '{number} more…' => '{number} more…',
     '{pct} off the discounted item price' => '{pct} off the discounted item price',