From c608a15a9c53a19654f5a36ba2056a7a1eb561da Mon Sep 17 00:00:00 2001 From: Daniel Nilsson Date: Wed, 28 Feb 2024 23:12:55 +0100 Subject: luci-app-attendedsysupgrade: don't reassign data and firmware info The reassignment of the variable that holds the package information once you get a response from the sysupgrade server caused the package list (which is only loaded once when entering the app) to become an array instead of an object (since that's how the response is structured), which gave the result of once cancelling the firmware upgrade, the package list is now an array, making the package list unusable. This commit updates the variables that shouldn't be changed (data and firmware) to constants and all handle methods to take these values as parameters instead, allowing us to avoid the possible reassignment which will otherwise result in unexpected control flows. Ref: #6284 Signed-off-by: Daniel Nilsson --- .../po/nl/attendedsysupgrade.po | 104 ++++++++++----------- 1 file changed, 52 insertions(+), 52 deletions(-) (limited to 'applications/luci-app-attendedsysupgrade/po/nl/attendedsysupgrade.po') diff --git a/applications/luci-app-attendedsysupgrade/po/nl/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/nl/attendedsysupgrade.po index f7952fc1ac..613ff655dd 100644 --- a/applications/luci-app-attendedsysupgrade/po/nl/attendedsysupgrade.po +++ b/applications/luci-app-attendedsysupgrade/po/nl/attendedsysupgrade.po @@ -23,7 +23,7 @@ msgid "Advanced Mode" msgstr "Geavanceerde modus" #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11 -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:600 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3 msgid "Attended Sysupgrade" msgstr "Bijgewoond Sysupgrade" @@ -32,20 +32,20 @@ msgstr "Bijgewoond Sysupgrade" msgid "Attendedsysupgrade Configuration." msgstr "Attendedsysupgrade-configuratie." -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:521 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511 msgid "Board Name / Profile" msgstr "Bestuursnaam / Profiel" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:132 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116 msgid "Build Date" msgstr "Bouwdatum" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:209 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193 msgid "Building Firmware..." msgstr "Firmware bouwen..." -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:172 -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:536 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526 msgid "Cancel" msgstr "Annuleren" @@ -53,10 +53,10 @@ msgstr "Annuleren" msgid "Client" msgstr "Cliënt" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:247 -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381 -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:436 -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:570 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563 msgid "Close" msgstr "Sluiten" @@ -64,20 +64,20 @@ msgstr "Sluiten" msgid "Configuration" msgstr "Configuratie" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:430 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423 msgid "Could not reach API at \"%s\". Please try again later." msgstr "Kan API niet bereiken op \"%s\". Probeer het later opnieuw." -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:529 -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:615 msgid "Currently running: %s - %s" msgstr "Momenteel actief: %s - %s" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:299 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289 msgid "Download" msgstr "Download" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:143 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127 msgid "Download firmware image" msgstr "Firmware-image downloaden" @@ -85,31 +85,31 @@ msgstr "Firmware-image downloaden" msgid "Downloading ImageBuilder archive" msgstr "ImageBuilder-archief downloaden" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:342 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335 msgid "Downloading firmware from server to browser" msgstr "Firmware downloaden van server naar browser" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:338 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331 msgid "Downloading..." msgstr "Downloaden..." -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:251 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241 msgid "Error building the firmware image" msgstr "Fout bij het maken van de firmware-image" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:426 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419 msgid "Error connecting to upgrade server" msgstr "Fout bij het verbinden met de upgradeserver" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:379 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372 msgid "Error during download of firmware. Please try again" msgstr "Fout tijdens downloaden van firmware. Probeer het opnieuw" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:134 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118 msgid "Filename" msgstr "Bestandsnaam" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:136 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120 msgid "Filesystem" msgstr "Bestandssysteem" @@ -121,27 +121,27 @@ msgstr "Genereren firmware image" msgid "Grant UCI access to LuCI app attendedsysupgrade" msgstr "Verleen UCI toegang tot LuCI app bijgewoondsysupgrade" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:182 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166 msgid "Install firmware image" msgstr "Firmware-image installeren" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:388 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381 msgid "Installing the sysupgrade. Do not unpower device!" msgstr "De sysupgrade installeren. Schakel het apparaat niet uit!" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:384 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377 msgid "Installing..." msgstr "Installeren..." -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:168 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152 msgid "Keep settings and retain the current configuration" msgstr "Instellingen behouden en de huidige configuratie behouden" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516 msgid "New firmware upgrade available" msgstr "Nieuwe firmware-upgrade beschikbaar" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:561 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554 msgid "No upgrade available" msgstr "Geen upgrade beschikbaar" @@ -158,23 +158,23 @@ msgstr "" msgid "Overview" msgstr "Overzicht" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:522 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512 msgid "Packages" msgstr "Pakketten" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219 msgid "Please report the error message and request" msgstr "Meld de foutmelding en vraag" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112 msgid "Profile" msgstr "Profiel" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:213 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197 msgid "Progress: %s%% %s" msgstr "Vooruitgang: %s%% %s" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:199 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183 msgid "Queued..." msgstr "Wachtrij..." @@ -182,7 +182,7 @@ msgstr "Wachtrij..." msgid "Rebuilders" msgstr "Herbouwers" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:146 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130 msgid "Rebuilds" msgstr "Herbouwt" @@ -190,23 +190,23 @@ msgstr "Herbouwt" msgid "Received build request" msgstr "Verzoek 'build' ontvangen" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:231 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221 msgid "Request Data:" msgstr "Gegevens opvragen:" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:555 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548 msgid "Request firmware image" msgstr "Firmware-image aanvragen" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:203 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187 msgid "Request in build queue position %s" msgstr "Verzoek in bouwwachtrij positie %s" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106 msgid "SHA256" msgstr "SHA256" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:626 msgid "Search for firmware upgrade" msgstr "Zoeken naar firmware-upgrade" @@ -218,11 +218,11 @@ msgstr "Zoek naar nieuwe sysupgrades bij het openen van het tabblad" msgid "Search on opening" msgstr "Zoeken bij opening" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:417 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410 msgid "Searching for an available sysupgrade of %s - %s" msgstr "Zoeken naar een beschikbare sysupgrade van %s - %s" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:413 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406 msgid "Searching..." msgstr "Zoeken..." @@ -230,7 +230,7 @@ msgstr "Zoeken..." msgid "Server" msgstr "Server" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:225 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215 msgid "Server response: %s" msgstr "Server antwoord: %s" @@ -242,15 +242,15 @@ msgstr "Instellen ImageBuilder" msgid "Show advanced options like package list modification" msgstr "Toon geavanceerde opties zoals wijziging van de pakketlijst" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171 msgid "Successfully created firmware image" msgstr "Firmware-image met succes gemaakt" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114 msgid "Target" msgstr "Doel" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:604 msgid "" "The attended sysupgrade service allows to easily upgrade vanilla and custom " "firmware images." @@ -258,22 +258,22 @@ msgstr "" "De bijgewoonde sysupgrade-service maakt het mogelijk om eenvoudig vanille- " "en aangepaste firmware-images te upgraden." -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:564 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557 msgid "The device runs the latest firmware version %s - %s" msgstr "Het apparaat voert de nieuwste firmwareversie %s - %s uit" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610 msgid "" "This is done by building a new firmware on demand via an online service." msgstr "" "Dit gebeurt door op aanvraag een nieuwe firmware te bouwen via een online " "dienst." -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:364 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357 msgid "Uploading firmware from browser to device" msgstr "Firmware uploaden van browser naar apparaat" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:360 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353 msgid "Uploading..." msgstr "Uploaden..." @@ -281,15 +281,15 @@ msgstr "Uploaden..." msgid "Validate package selection" msgstr "Pakketselectie valideren" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104 msgid "Version" msgstr "Versie" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:376 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369 msgid "Wrong checksum" msgstr "Verkeerde controlesom" -#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:506 +#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496 msgid "[installed] %s" msgstr "[geïnstalleerd] %s" -- cgit v1.2.3