Update, v0.7.5

3 files changed, 12 insertions, 12 deletions

diff --git a/commands/info.js b/commands/info.js
index d8335e4..21a1803 100644
--- a/commands/info.js
+++ b/commands/info.js
@@ -11,31 +11,31 @@ const getPixel = require("../modules/pixel");
 const official = fs.readFileSync("./config/official.txt").toString().replace(/\r\n/g, "\n").split("\n");
 const fpserver = fs.readFileSync("./config/fpserver.txt").toString().trim();
 
-function bytesToPretty(bytes) {
+function bytesToPretty(bytes, uid, gid) {
     if (bytes > 1000) {
         if (bytes > 1000000) {
-            return (bytes / 1000000).toFixed(2) + " MB";
+            return (bytes / 1000000).toFixed(2) + " " + l("MB", "Mo", uid, gid);
         } else {
-            return (bytes / 1000).toFixed(2) + " KB";
+            return (bytes / 1000).toFixed(2) + " " + l("KB", "Ko", uid, gid);
         }
     } else {
-        return bytes + " B";
+        return bytes + " " + l("B", "o", uid, gid);
     }
 }
 
-function secondsToPretty(seconds) {
+function secondsToPretty(seconds, uid, gid) {
     if (seconds > 60) {
         if (seconds > 3600) {
             if (seconds > 86400) {
-                return Math.floor(seconds / 86400) + " day" + (Math.floor(seconds / 216000) > 1 ? "s" : "");
+                return Math.floor(seconds / 86400) + " " + l("day", "jour", uid, gid) + (Math.floor(seconds / 86400) > 1 ? "s" : "");
             } else {
-                return Math.floor(seconds / 3600) + " hour" + (Math.floor(seconds / 3600) > 1 ? "s" : "");
+                return Math.floor(seconds / 3600) + " " + l("hour", "heure", uid, gid) + (Math.floor(seconds / 3600) > 1 ? "s" : "");
             }
         } else {
             return Math.floor(seconds / 60) + " minute" + (Math.floor(seconds / 60) > 1 ? "s" : "");
         }
     } else {
-        return Math.floor(seconds) + " second" + (Math.floor(seconds) > 1 ? "s" : "");
+        return Math.floor(seconds) + " " + l("second", "seconde", uid, gid) + (Math.floor(seconds) > 1 ? "s" : "");
     }
 }
 
@@ -60,8 +60,8 @@ module.exports = async (interaction) => {
         { name: l("Known ponies", "Poneys connus", interaction.user.id, interaction.guild ? interaction.guild.id : 0), value: Object.keys(JSON.parse(fs.readFileSync("./data/data.json").toString())).length.toString(), inline: true },
         { name: l("Awaiting issue reports", "Rapports de problèmes en attente", interaction.user.id, interaction.guild ? interaction.guild.id : 0), value: fs.readdirSync("./reports").length.toString(), inline: true },
         { name: l("Database size", "Taille de la base de données", interaction.user.id, interaction.guild ? interaction.guild.id : 0), value: sizep, inline: true },
-        { name: l("Memory usage", "Utilisation de la mémoire", interaction.user.id, interaction.guild ? interaction.guild.id : 0), value: bytesToPretty(process.memoryUsage().rss + process.memoryUsage().heapTotal + process.memoryUsage().external + process.memoryUsage().arrayBuffers), inline: true },
-        { name: l("Uptime", "Durée de fonctionnement", interaction.user.id, interaction.guild ? interaction.guild.id : 0), value: secondsToPretty(process.uptime()), inline: true },
+        { name: l("Memory usage", "Utilisation de la mémoire", interaction.user.id, interaction.guild ? interaction.guild.id : 0), value: bytesToPretty(process.memoryUsage().rss + process.memoryUsage().heapTotal + process.memoryUsage().external + process.memoryUsage().arrayBuffers, interaction.user.id, interaction.guild ? interaction.guild.id : 0), inline: true },
+        { name: l("Uptime", "Durée de fonctionnement", interaction.user.id, interaction.guild ? interaction.guild.id : 0), value: secondsToPretty(process.uptime(), interaction.user.id, interaction.guild ? interaction.guild.id : 0), inline: true },
     ];
 
     await interaction.reply({
diff --git a/config/version.txt b/config/version.txt
index 7deb86f..da2ac9c 100644
--- a/config/version.txt
+++ b/config/version.txt
@@ -1 +1 @@
-0.7.1
\ No newline at end of file
+0.7.5
\ No newline at end of file
diff --git a/update/parse.js b/update/parse.js
index 217cfd8..088e8d2 100644
--- a/update/parse.js
+++ b/update/parse.js
@@ -74,7 +74,7 @@ let ponies = {};
             data.residence = residences;
         }
 
-        if (typeof box.name2 !== "undefined" || typeof box.name3 !== "undefined" || typeof box.name4 !== "undefined" || typeof box.name5 !== "undefined" || typeof box.coat !== "undefined" || typeof box.occupation !== "undefined" || typeof box.residence !== "undefined") ponies[title] = data;
+        if ((typeof box.name2 !== "undefined" || typeof box.name3 !== "undefined" || typeof box.name4 !== "undefined" || typeof box.name5 !== "undefined" || typeof box.coat !== "undefined" || typeof box.occupation !== "undefined" || typeof box.residence !== "undefined") && typeof box.sex !== "undefined") ponies[title] = data;
     }
 })()