Merge branch 'english-translation'

MarioTurco · Sep 9, 2020 · 9f23c6c · 9f23c6c
2 parents 13a5aa3 + 55a8de2
commit 9f23c6c
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 52 deletions.
diff --git a/locales/default.json b/locales/default.json
@@ -0,0 +1,21 @@
+{
+    "Aggiungi" : "Aggiungi",
+    "Visualizza" : "Visualizza",
+    "Modifica" : "Modifica",
+    "Elimina" : "Elimina",
+    "Impostazioni" : "Impostazioni",
+    "Peso" : "Peso",
+    "Kcal" : "Kcal",
+    "Data" : "Data",
+    "Statistiche" : "Statistiche",
+    "Peso Massimo" : "Peso Massimo",
+    "Peso Medio" : "Peso Medio",
+    "Peso Minimo" : "Peso Minimo",
+    "Kcal Massime" : "Kcal Massime",
+    "Kcal Medie" : "Kcal Medie",
+    "Kcal Minime" : "Kcal Minime",
+    "Conferma" : "Conferma",
+    "Seleziona una riga e compila i campi per modificarlo" : "Seleziona una riga e compila i campi per modificarlo",
+    "Seleziona un campo e poi clicca elimina": "Seleziona un campo e poi clicca elimina",
+    "Elimina tutti i dati salvati" : "Elimina tutti i dati salvati"
+}
diff --git a/locales/en.json b/locales/en.json
@@ -0,0 +1,21 @@
+{
+    "Aggiungi" : "Add",
+    "Visualizza" : "View",
+    "Modifica" : "Edit",
+    "Elimina" : "Delete",
+    "Impostazioni" : "Settings",
+    "Peso" : "Weight",
+    "Kcal" : "Kcal",
+    "Data" : "Day",
+    "Statistiche" : "Stats",
+    "Peso Massimo" : "Max Weight",
+    "Peso Medio" : "Average Weight",
+    "Peso Minimo" : "Min Weight",
+    "Kcal Massime" : "Max Kcal",
+    "Kcal Medie" : "Average Kcal ",
+    "Kcal Minime" : "Min Kcal",
+    "Conferma" : "Confirm",
+    "Seleziona una riga e compila i campi per modificarlo" : "Select a row, compile the fields and hit Confirm ",
+    "Seleziona un campo e poi clicca elimina": "Select a row and hit Delete",
+    "Elimina tutti i dati salvati" : "Delete all the saved data"
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,6 +48,7 @@
   "dependencies": {
     "bulma-calendar": "^6.0.9",
     "electron-db": "^0.15.7",
+    "electron-localizer": "^0.1.1",
     "electron-simple-updater": "^2.0.9",
     "electron-squirrel-startup": "^1.0.0",
     "electron-updater": "^4.3.4",

diff --git a/src/delete.html b/src/delete.html
@@ -14,21 +14,21 @@
       <div class="container is-fluid">
         <div class="tabs is-centered">
           <ul>
-            <li id="addTab"><a>Aggiungi</a></li>
-            <li id="visualizeTab" ><a>Visualizza</a></li>
-            <li id="editTab" ><a>Modifica</a></li>
-            <li id="deleteTab" class="is-active"><a>Elimina</a></li>
-            <li id="settingsTab"><a>Impostazioni</a></li>
+            <li id="addTab"><a>Add</a></li>
+            <li id="visualizeTab" ><a>View</a></li>
+            <li id="editTab" ><a>Edit</a></li>
+            <li id="deleteTab" class="is-active"><a>Delete</a></li>
+            <li id="settingsTab"><a>Settings</a></li>
           </ul>
         </div>
         <div class="has-text-centered">
-          <p>Seleziona un campo e poi clicca elimina</p>
+          <p>Select a Row and click Delete</p>
         </div>
         <div class="table-container " >
           <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth" id="visualizeTable">
             <thread >
-              <th>Data</th>
-              <th>Peso</th>
+              <th>Date</th>
+              <th>Weight</th>
               <th>Kcal</th>
             </thread>
             <tbody>
@@ -37,7 +37,7 @@
         </div>
           <div class="has-text-centered">
             <button class="button is-danger is-outlined" id="deleteRowBtn">
-              <span>Elimina</span>
+              <span>Delete</span>
               <span class="icon is-small">
               <i class="fas fa-times"></i>
               </span>

diff --git a/src/edit.html b/src/edit.html
@@ -14,22 +14,22 @@
       <div class="container is-fluid">
         <div class="tabs is-centered">
           <ul>
-            <li id="addTab"><a>Aggiungi</a></li>
-            <li id="visualizeTab" ><a>Visualizza</a></li>
-            <li id="editTab" class="is-active"><a>Modifica</a></li>
-            <li id="deleteTab"><a>Elimina</a></li>
-            <li id="settingsTab"><a>Impostazioni</a></li>
+            <li id="addTab"><a>Add</a></li>
+            <li id="visualizeTab" ><a>View</a></li>
+            <li id="editTab" class="is-active"><a>Edit</a></li>
+            <li id="deleteTab"><a>Delete</a></li>
+            <li id="settingsTab"><a>Settings</a></li>
           </ul>
         </div>
 
         <div class="has-text-centered">
-          <p>Seleziona una riga e compila i campi per modificarlo</p>
+          <p>Select a row, change the fields you want to change and click Edit</p>
         </div>
         <div class="table-container " >
           <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth" id="visualizeTable">
             <thread >
-              <th>Data</th>
-              <th>Peso</th>
+              <th>Date</th>
+              <th>Weight</th>
               <th>Kcal</th>
             </thread>
             <tbody >
@@ -39,7 +39,7 @@
 
         <div class="field is-horizontal">
           <div class="field-label is-normal">
-            <label class="label">Peso</label>
+            <label class="label">Weight</label>
           </div>
           <div class="field-body">
             <div class="field">
@@ -63,7 +63,7 @@
         </div>
         <div class="field is-horizontal">
           <div class="field-label is-normal ">
-            <label class="label">Data</label>
+            <label class="label">Date</label>
           </div>
           <div class="field-body">
             <div class="field">
@@ -75,7 +75,7 @@
         </div>
         <div class="has-text-centered">
           <button class="button is-warning is-outlined shadow" id="editRowBtn">
-            <span>Conferma</span>
+            <span>Edit</span>
             <span class="icon is-small">
             <i class="fas fa-times"></i>
             </span>

diff --git a/src/index.html b/src/index.html
@@ -4,24 +4,28 @@
     <meta charset="UTF-8">
     <title>Gym Utils</title>
     <script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>
+
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/bulma.min.css">
     <link rel="stylesheet" href="index.css">
+
+
+
   </head>
   <body>
     <section class="section">
       <div class="container is-fluid">
         <div class="tabs is-centered">
           <ul>
-            <li id="addTab" class="is-active"><a>Aggiungi</a></li>
-            <li id="visualizeTab"><a>Visualizza</a></li>
-            <li id="editTab"><a>Modifica</a></li>
-            <li id="deleteTab"><a>Elimina</a></li>
-            <li id="settingsTab"><a>Impostazioni</a></li>
+            <li id="addTab" class="is-active"><a><localized-text>Add</localized-text></a></li>
+            <li id="visualizeTab"><a>View</a></li>
+            <li id="editTab"><a>Edit</a></li>
+            <li id="deleteTab"><a>Delete</a></li>
+            <li id="settingsTab"><a>Settings</a></li>
           </ul>
         </div>
         <div class="field is-horizontal">
           <div class="field-label is-normal">
-            <label class="label">Peso</label>
+            <label class="label">Weight</label>
           </div>
           <input class="input" id="pesoText" type="number" placeholder="75">
         </div>
@@ -33,14 +37,14 @@
         </div>
         <div class="field is-horizontal">
           <div class="field-label is-normal">
-            <label class="label ">Data</label>
+            <label class="label ">Date</label>
           </div>
           <input class="input" id="dataText" type="date" placeholder="gg/mm/aaaa">
         </div>
         <div class="field is-centered has-text-centered">
           <p class="control">
             <button id="addBtn" class="button is-success has-text-dark shadow">
-            Aggiungi
+            Add
             </button>
           </p>
         </div>

diff --git a/src/index.js b/src/index.js
@@ -30,7 +30,7 @@ const createWindow = () => {
   mainWindow.loadFile(path.join(__dirname, 'index.html'));
 
   // Open the DevTools.
-  //mainWindow.webContents.openDevTools();
+  mainWindow.webContents.openDevTools();
 };
 
 // This method will be called when Electron has finished

diff --git a/src/settings.html b/src/settings.html
@@ -13,25 +13,25 @@
       <div class="container is-fluid has-text-centered">
         <div class="tabs is-centered ">
           <ul>
-            <li id="addTab"><a>Aggiungi</a></li>
-            <li id="visualizeTab" ><a>Visualizza</a></li>
-            <li id="editTab"><a>Modifica</a></li>
-            <li id="deleteTab"><a>Elimina</a></li>
-            <li id="settingsTab" class="is-active"><a>Impostazioni</a></li>
+            <li id="addTab"><a>Add</a></li>
+            <li id="visualizeTab" ><a>View</a></li>
+            <li id="editTab"><a>Edit</a></li>
+            <li id="deleteTab"><a>Delete</a></li>
+            <li id="settingsTab" class="is-active"><a>Settings</a></li>
           </ul>
         </div>
         <nav class="level">
               <div class="level-left">
                   <div class="level-item">
                       <p >
-                          Elimina tutti i dati salvati
+                          Permanently delete all the data
                       </p>
                   </div>
               </div>
               <div class="level-rigt">
                   <div class="level-item">
                       <button class="button is-danger is-outlined" id="resetBtn">
-                          <span>Elimina</span>
+                          <span>Delete</span>
                           <span class="icon is-small">
                             <i class="fas fa-times"></i>
                           </span>

diff --git a/src/visualize.html b/src/visualize.html
@@ -13,11 +13,11 @@
     <section class="section">
       <div class="tabs is-centered">
         <ul>
-          <li id="addTab"><a>Aggiungi</a></li>
-          <li id="visualizeTab" class="is-active"><a>Visualizza</a></li>
-          <li id="editTab"><a>Modifica</a></li>
-          <li id="deleteTab"><a>Elimina</a></li>
-          <li id="settingsTab"><a>Impostazioni</a></li>
+          <li id="addTab"><a>Add</a></li>
+          <li id="visualizeTab" class="is-active"><a>View</a></li>
+          <li id="editTab"><a>Edit</a></li>
+          <li id="deleteTab"><a>Delete</a></li>
+          <li id="settingsTab"><a>Settings</a></li>
         </ul>
       </div>
 
@@ -28,23 +28,23 @@
               <div class="table-container">
                 <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth" id="visualizeTable">
                   <thread>
-                    <th>Data</th>
-                    <th>Peso</th>
+                    <th>Date</th>
+                    <th>Weight</th>
                     <th>Kcal</th>
                   </thread>
                   <tbody>
                   </tbody>
                 </table>
               </div>
               <canvas id="chart" ></canvas>
-              <p class="title has-text-centered">Statistiche</p>
+              <p class="title has-text-centered">Stats:</p>
               <div class="has-text-centered">
-                <p id="pesoMassimo">Peso Massimo: </p>
-                <p id="pesoMedio">Peso Medio: </p>
-                <p id="pesoMinimo">Peso Minimo: </p>
-                <p id="kcalMassime">Kcal Massime: </p>
-                <p id="kcalMedie">Kcal Medie: </p>
-                <p id="kcalMinime">Kcal Minime: </p>
+                <p id="pesoMassimo">Max weight: </p>
+                <p id="pesoMedio">Average weight: </p>
+                <p id="pesoMinimo">Min weight: </p>
+                <p id="kcalMassime">Max Kcal: </p>
+                <p id="kcalMedie">Average Kcal: </p>
+                <p id="kcalMinime">Min Kcal: </p>
             </div>
 
 

diff --git a/src/visualizeLogic.js b/src/visualizeLogic.js
@@ -145,8 +145,8 @@ function fillStats(data){
                 kcalMinime = kcalCorrenti;
             index+=1;
         }
-        pesoMedio = parseFloat(pesoMedio) / numPesi;
-        kcalMedie = parseFloat(kcalMedie) / numKcal;
+        pesoMedio = (parseFloat(pesoMedio) / numPesi).toFixed(2);
+        kcalMedie = (parseFloat(kcalMedie) / numKcal).toFixed(2);
         console.log(pesoMassimo, pesoMedio, pesoMinimo);
         console.log(kcalMassime, kcalMedie, kcalMinime);
     let pMax = document.getElementById('pesoMassimo');