From a2c9b63dfd80dc9e0c0e8a76b59da15844ed209a Mon Sep 17 00:00:00 2001
From: shadow2560 <24191064+shadow2560@users.noreply.github.com>
Date: Tue, 24 Dec 2024 23:21:54 +0100
Subject: [PATCH] Some fixes and update french language (#46)

* Fix starred homebrew list logging, fix hbmenu identification when backing up it and logging it correctly, update french language.

Signed-off-by: shadow2560 <24191064+shadow2560@users.noreply.github.com>
---
 assets/romfs/i18n/fr.json            | 42 ++++++++++++++++++++++++++++
 sphaira/source/app.cpp               |  4 +--
 sphaira/source/ui/menus/homebrew.cpp |  2 +-
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/assets/romfs/i18n/fr.json b/assets/romfs/i18n/fr.json
index e5204a4..3af3da1 100644
--- a/assets/romfs/i18n/fr.json
+++ b/assets/romfs/i18n/fr.json
@@ -14,7 +14,11 @@
   "Info": "Info.",
   "Install": "Installer",
   "Delete": "Supprimer",
+<<<<<<< HEAD
+  "Restart": "Redémarrer",
+=======
   "Restart": "",
+>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
   "Changelog": "Changelog",
   "Details": "Détails",
   "Update": "Mise à jour",
@@ -38,6 +42,15 @@
   "Order": "Ordre",
   "Search": "Recherche",
   "Updated": "Mis à jour",
+<<<<<<< HEAD
+  "Updated (Star)": "Mis à jour (Favories)",
+  "Downloads": "Téléchargements",
+  "Size": "Taille",
+  "Size (Star)": "Taille (Favories)",
+  "Alphabetical": "Alphabétique",
+  "Alphabetical (Star)": "Alphabétique (Favories)",
+  "Likes": "Likes",
+=======
   "Updated (Star)": "",
   "Downloads": "Téléchargements",
   "Size": "Taille",
@@ -45,6 +58,7 @@
   "Alphabetical": "Alphabétique",
   "Alphabetical (Star)": "",
   "Likes": "Favoris",
+>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
   "ID": "ID",
   "Decending": "Décroissant",
   "Descending (down)": "Décroissant",
@@ -66,8 +80,13 @@
   "Nxlink Connected": "Nxlink Connecté",
   "Nxlink Upload": "Nxlink téléversement",
   "Nxlink Finished": "Nxlink terminé",
+<<<<<<< HEAD
+  "Switch-Handheld!": "Switch-Portable",
+  "Switch-Docked!": "Switch-Dockée",
+=======
   "Switch-Handheld!": "",
   "Switch-Docked!": "",
+>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
   "Language": "Langue",
   "Auto": "Auto",
   "English": "English",
@@ -114,9 +133,15 @@
   "View as text (unfinished)": "Afficher sous forme de texte (inachevé)",
   "Empty...": "Vide...",
   "Open with DayBreak?": "Ouvrir avec DayBreak?",
+<<<<<<< HEAD
+  "Launch ": "Lancer ",
+  "Launch option for: ": "Option de lancement pour: ",
+  "Select launcher for: ": "Sélectionner le lanceur pour: ",
+=======
   "Launch ": "",
   "Launch option for: ": "Option de lancement pour: ",
   "Select launcher for: ": "",
+>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
 
   "Homebrew": "Homebrew",
   "Homebrew Options": "Options Homebrew",
@@ -157,7 +182,11 @@
   "Controller": "Contrôleur",
   "Pad ": "Manette ",
   " (Available)": " (Disponible)",
+<<<<<<< HEAD
+  " (Unsupported)": "Non supporté",
+=======
   " (Unsupported)": "",
+>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
   " (Unconnected)": " (Non connectée)",
   "HandHeld": "Portable",
   "Rotation": "Rotation",
@@ -209,7 +238,11 @@
   "Scanning ": "Scan ",
   "Creating ": "Création ",
   "Copying ": "Copie ",
+<<<<<<< HEAD
+  "Trying to load ": "Tente de charger ",
+=======
   "Trying to load ": "",
+>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
   "Downloading ": "Téléchargement ",
   "Checking MD5": "Vérification MD5",
   "Loading...": "Chargement...",
@@ -219,12 +252,21 @@
   "Error loading page!": "Erreur du chargement de la page!",
   "Update avaliable: ": "Mise à jour disponible: ",
   "Download update: ": "Télécharger la mise à jour: ",
+<<<<<<< HEAD
+  "Updated to ": "Mis à jour vers ",
+  "Restart Sphaira?": "Redémarrer Sphaira?",
+=======
   "Updated to ": "",
   "Restart Sphaira?": "",
+>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
   "Failed to download update": "Echec du téléchargement de la mise à jour",
   "Delete Selected files?": "Supprimer les fichiers sélectionnés?",
   "Completely remove ": "Supprimer totalement ",
   "Are you sure you want to delete ": "Êtes-vous sûr de vouloir supprimer ",
   "Are you sure you wish to cancel?": "Souhaitez-vous vraiment annuler?",
+<<<<<<< HEAD
+  "If this message appears repeatedly, please open an issue.": "Si ce message apparait en boucle veuillez ouvrir une issue."
+=======
   "If this message appears repeatedly, please open an issue.": ""
+>>>>>>> 3df676df0f432112aa14fbeae26943c91690e829
 }
\ No newline at end of file
diff --git a/sphaira/source/app.cpp b/sphaira/source/app.cpp
index 33d3c9b..5b1ad51 100644
--- a/sphaira/source/app.cpp
+++ b/sphaira/source/app.cpp
@@ -1053,9 +1053,9 @@ App::~App() {
         NacpStruct nacp;
         fs::FsNativeSd fs;
         if (R_SUCCEEDED(nro_get_nacp("/hbmenu.nro", nacp)) && std::strcmp(nacp.lang[0].name, "sphaira")) {
-            log_write("backing up hbmenu\n");
+            log_write("backing up hbmenu.nro\n");
             if (R_FAILED(fs.copy_entire_file("/switch/hbmenu.nro", "/hbmenu.nro", true))) {
-                log_write("failed to copy sphaire.nro to hbmenu.nro\n");
+                log_write("failed to backup  hbmenu.nro\n");
             }
         } else {
             log_write("not backing up\n");
diff --git a/sphaira/source/ui/menus/homebrew.cpp b/sphaira/source/ui/menus/homebrew.cpp
index 7f2a14a..7c1bb64 100644
--- a/sphaira/source/ui/menus/homebrew.cpp
+++ b/sphaira/source/ui/menus/homebrew.cpp
@@ -317,7 +317,7 @@ void Menu::Sort() {
         fs::FsPath star_path;
         for (auto& p : m_entries) {
             p.has_star = fs.FileExists(GenerateStarPath(p.path));
-            if (p.has_star) {
+            if (p.has_star == true) {
                 log_write("found star: %s\n", p.path.s);
             } else {
                 log_write("no star: %s\n", p.path.s);