From 197a12d35e50f5ac6c2507e0372263d3eabdaef3 Mon Sep 17 00:00:00 2001
From: Michael Telgmann <mt@shopware.com>
Date: Mon, 25 Sep 2023 14:09:46 +0200
Subject: [PATCH] fix: Improve wording, styling and error handling of the auto
 updater

---
 .../Default/Backend/SwagUpdate/Components/Download.php    | 8 ++------
 .../SwagUpdate/Snippets/backend/swag_update/main.ini      | 4 ++--
 .../SwagUpdate/Views/backend/swag_update/view/window.js   | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
index 0b0f4f9480b..23597ee8ed7 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Components/Download.php
@@ -169,12 +169,8 @@ public function downloadFile($sourceUri, $destinationUri, $totalSize, $hash)
         $error = curl_error($ch);
         curl_close($ch);
 
-        if ($isError && !$isHalted) {
-            throw new Exception('Wrong http code');
-        }
-
-        if ($result === false && !$isHalted) {
-            throw new Exception($error);
+        if (($result === false || $isError) && !$isHalted) {
+            throw new Exception($error ?: 'Unknown error');
         }
 
         clearstatcache(false, $partFile->getPathname());
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Snippets/backend/swag_update/main.ini b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Snippets/backend/swag_update/main.ini
index 5bb7872a896..44a2ef4d754 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Snippets/backend/swag_update/main.ini
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Snippets/backend/swag_update/main.ini
@@ -79,7 +79,7 @@ security_update_window/text = "<h2>Warning!</h2>A new security update is availab
 security_update_window/cancel = "Close"
 security_update_window/update = "Open software update"
 ftp/invalid_permissions = "Invalid file permissions"
-release_information = "You can access the release information of [1] here."
+release_information = "You can see the current release information for [1] here."
 
 [de_DE]
 cancel = "Abbrechen"
@@ -162,4 +162,4 @@ security_update_window/text = "<h2>Achtung!</h2>Ein neues Sicherheitsupdate ist
 security_update_window/cancel = "Schließen"
 security_update_window/update = "Softwareaktualisierung öffnen"
 ftp/invalid_permissions = "Invalide Datei Rechte"
-release_information = "Du kannst die aktuellen release Information von [1] hier beziehen."
\ No newline at end of file
+release_information = "Du kannst die aktuellen Release-Informationen zu [1] hier einsehen."
\ No newline at end of file
diff --git a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js
index 725075852fb..1a198fff25e 100644
--- a/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js
+++ b/engine/Shopware/Plugins/Default/Backend/SwagUpdate/Views/backend/swag_update/view/window.js
@@ -180,7 +180,7 @@ Ext.define('Shopware.apps.SwagUpdate.view.Window', {
         var me = this;
 
         var text = Ext.String.format(
-            '<div class="swag-update-changelog"><a href="[0]">{s name="release_information"}You can access the release information of [1] here.{/s}</a></div>',
+            '<div class="swag-update-changelog"><br><a href="[0]">{s name="release_information"}{/s}</a></div>',
             me.changelog.get('changelog'),
             me.changelog.get('version')
         );