From 74149bbdc53098fba5e20862e444da63efe728ba Mon Sep 17 00:00:00 2001
From: fvanroie <15969459+fvanroie@users.noreply.github.com>
Date: Tue, 11 May 2021 18:42:51 +0200
Subject: [PATCH] Strings for file sizes

---
 src/hasp/hasp_parser.cpp | 8 +++++---
 src/lang/en_US.h         | 2 +-
 src/lang/es_ES.h         | 6 +++---
 src/lang/fr_FR.h         | 8 ++++----
 src/lang/hu_HU.h         | 2 +-
 src/lang/nl_NL.h         | 8 ++++----
 src/lang/ro_RO.h         | 2 +-
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/hasp/hasp_parser.cpp b/src/hasp/hasp_parser.cpp
index a1f7057e..036ecc23 100644
--- a/src/hasp/hasp_parser.cpp
+++ b/src/hasp/hasp_parser.cpp
@@ -176,13 +176,15 @@ int Parser::format_bytes(size_t filesize, char* buf, size_t len)
 
     filesize = filesize / D_FILE_SIZE_DIVIDER; // multiply by 10 for 1 decimal place
     if(filesize < D_FILE_SIZE_DIVIDER * 10)
-        return snprintf_P(buf, len, PSTR(D_FILE_SIZE_DECIMAL " " D_FILE_SIZE_KILOBYTES), filesize / 10, filesize % 10);
+        return snprintf_P(buf, len, PSTR("%d" D_DECIMAL_POINT "%d " D_FILE_SIZE_KILOBYTES), filesize / 10,
+                          filesize % 10);
 
     filesize = filesize / D_FILE_SIZE_DIVIDER; // multiply by 10 for 1 decimal place
     if(filesize < D_FILE_SIZE_DIVIDER * 10)
-        return snprintf_P(buf, len, PSTR(D_FILE_SIZE_DECIMAL " " D_FILE_SIZE_MEGABYTES), filesize / 10, filesize % 10);
+        return snprintf_P(buf, len, PSTR("%d" D_DECIMAL_POINT "%d " D_FILE_SIZE_MEGABYTES), filesize / 10,
+                          filesize % 10);
 
-    return snprintf_P(buf, len, PSTR(D_FILE_SIZE_DECIMAL " " D_FILE_SIZE_GIGABYTES), filesize / 10, filesize % 10);
+    return snprintf_P(buf, len, PSTR("%d" D_DECIMAL_POINT "%d " D_FILE_SIZE_GIGABYTES), filesize / 10, filesize % 10);
 }
 
 uint8_t Parser::get_action_id(const char* action)
diff --git a/src/lang/en_US.h b/src/lang/en_US.h
index 6ef6b58a..c132e4d3 100644
--- a/src/lang/en_US.h
+++ b/src/lang/en_US.h
@@ -26,7 +26,7 @@
 #define D_FILE_SIZE_MEGABYTES "MiB"       // new
 #define D_FILE_SIZE_GIGABYTES "GiB"       // new
 #define D_FILE_SIZE_DIVIDER 1024          // new, kibi or kilo bytes
-#define F_FILE_SIZE_DECIMAL "%d.%d"       // new, decimal comma or point
+#define D_DECIMAL_POINT "."               // new, decimal comma or point
 
 #define D_SERVICE_STARTING "Starting..."
 #define D_SERVICE_STARTED "Started"
diff --git a/src/lang/es_ES.h b/src/lang/es_ES.h
index 358dd4bb..448b8cca 100644
--- a/src/lang/es_ES.h
+++ b/src/lang/es_ES.h
@@ -1,5 +1,5 @@
-#ifndef HASP_LANG_EN_US_H
-#define HASP_LANG_EN_US_H
+#ifndef HASP_LANG_ES_ES_H
+#define HASP_LANG_ES_ES_H
 
 #define D_USERNAME "Usuario:"
 #define D_PASSWORD "Contraseña:"
@@ -26,7 +26,7 @@
 #define D_FILE_SIZE_MEGABYTES "MiB" // new
 #define D_FILE_SIZE_GIGABYTES "GiB" // new
 #define D_FILE_SIZE_DIVIDER 1024    // new, kibi or kilo bytes
-#define F_FILE_SIZE_DECIMAL "%d,%d" // new, decimal comma or point
+#define D_DECIMAL_POINT ","         // new, decimal comma or point
 
 #define D_SERVICE_STARTING "Inicializando..."
 #define D_SERVICE_STARTED "Inicializado"
diff --git a/src/lang/fr_FR.h b/src/lang/fr_FR.h
index c00903e1..53f69044 100644
--- a/src/lang/fr_FR.h
+++ b/src/lang/fr_FR.h
@@ -1,5 +1,5 @@
-#ifndef HASP_LANG_EN_US_H
-#define HASP_LANG_EN_US_H
+#ifndef HASP_LANG_FR_FR_H
+#define HASP_LANG_FR_FR_H
 
 #define D_USERNAME "Utilisateur:"
 #define D_PASSWORD "Mot de passe:"
@@ -25,8 +25,8 @@
 #define D_FILE_SIZE_KILOBYTES "Kio"
 #define D_FILE_SIZE_MEGABYTES "Mio"
 #define D_FILE_SIZE_GIGABYTES "Gio"
-#define D_FILE_SIZE_DIVIDER 1024    // new, kibi or kilo bytes
-#define F_FILE_SIZE_DECIMAL "%d,%d" // new, decimal comma or point
+#define D_FILE_SIZE_DIVIDER 1024 // new, kibi or kilo bytes
+#define D_DECIMAL_POINT ","      // new, decimal comma or point
 
 #define D_SERVICE_STARTING "Démarer..."
 #define D_SERVICE_STARTED "Démaré"
diff --git a/src/lang/hu_HU.h b/src/lang/hu_HU.h
index 2c923436..5ef4d125 100644
--- a/src/lang/hu_HU.h
+++ b/src/lang/hu_HU.h
@@ -26,7 +26,7 @@
 #define D_FILE_SIZE_MEGABYTES "MiB" // new
 #define D_FILE_SIZE_GIGABYTES "GiB" // new
 #define D_FILE_SIZE_DIVIDER 1024    // new, kibi or kilo bytes
-#define F_FILE_SIZE_DECIMAL "%d,%d" // new, decimal comma or point
+#define D_DECIMAL_POINT ","         // new, decimal comma or point
 
 #define D_SERVICE_STARTING "Indítás..."
 #define D_SERVICE_STARTED "Elindítva"
diff --git a/src/lang/nl_NL.h b/src/lang/nl_NL.h
index 3e25217f..5d800e6b 100644
--- a/src/lang/nl_NL.h
+++ b/src/lang/nl_NL.h
@@ -1,5 +1,5 @@
-#ifndef HASP_LANG_EN_US_H
-#define HASP_LANG_EN_US_H
+#ifndef HASP_LANG_NL_NL_H
+#define HASP_LANG_NL_NL_H
 
 #define D_USERNAME "Gebruikersnaam:"
 #define D_PASSWORD "Wachtwoord:"
@@ -25,8 +25,8 @@
 #define D_FILE_SIZE_KILOBYTES "KiB"
 #define D_FILE_SIZE_MEGABYTES "MiB"
 #define D_FILE_SIZE_GIGABYTES "GiB"
-#define D_FILE_SIZE_DIVIDER 1024    //  kibi or kilo bytes
-#define F_FILE_SIZE_DECIMAL "%d,%d" //  decimal comma or point
+#define D_FILE_SIZE_DIVIDER 1024 //  kibi or kilo bytes
+#define D_DECIMAL_POINT ","      //  decimal comma or point
 
 #define D_SETTING_ENABLED "Ingeschakeld"
 #define D_SETTING_DISABLED "Uitgeschakeld"
diff --git a/src/lang/ro_RO.h b/src/lang/ro_RO.h
index 122f9028..4da987e7 100644
--- a/src/lang/ro_RO.h
+++ b/src/lang/ro_RO.h
@@ -26,7 +26,7 @@
 #define D_FILE_SIZE_MEGABYTES "MiB"       // new
 #define D_FILE_SIZE_GIGABYTES "GiB"       // new
 #define D_FILE_SIZE_DIVIDER 1024          // new, kibi or kilo bytes
-#define F_FILE_SIZE_DECIMAL "%d,%d"       // new, decimal comma or point
+#define D_DECIMAL_POINT ","               // new, decimal comma or point
 
 #define D_SETTING_ENABLED "Activ"
 #define D_SETTING_DISABLED "Inactiv"