Segelzwerg · Segelzwerg · Dec 9, 2019 · Dec 9, 2019 · Dec 9, 2019 · Dec 9, 2019
diff --git a/src/main/resources/templates/af/PaceForm.html b/src/main/resources/templates/af/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>

diff --git a/src/main/resources/templates/af/start.html b/src/main/resources/templates/af/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
diff --git a/src/main/resources/templates/ar/PaceForm.html b/src/main/resources/templates/ar/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>

diff --git a/src/main/resources/templates/ar/start.html b/src/main/resources/templates/ar/start.html
@@ -8,6 +8,6 @@
 </head>
 <body>
 <div th:insert="navbar :: navbar(start)">  </div>
-<H1>Welcome to Sport Tool Box</H1>
+<H1>Willkommen in der Sport Tool Box</H1>
 </body>
 </html>
diff --git a/src/main/resources/templates/ca/PaceForm.html b/src/main/resources/templates/ca/PaceForm.html
@@ -4,48 +4,63 @@
     <meta charset="UTF-8">
     <link href="../static/bootstrap.min.css" rel="stylesheet"
           th:href="bootstrap.min.css" type="text/css">
-    <title>Speed Calculator</title>
+    <title>Pace Calculator</title>
 </head>
 <body>
 <div th:insert="navbar :: navbar(pace)"></div>
 <div class="container">
     <div class="row">
-        <h1>Pace Rechner</h1>
+        <h1>Pace Calculator</h1>
     </div>
     <div class="row">
         <div class="col-sm">
             <div class="card">
                 <div class="card-body">
 
-
                     <form method="post" th:object="${form}">
                         <div class="form-group">
                             <label>
-                                Kilometer<input autocomplete="off" class="form-control" th:field="*{kilometer}"
-                                                type="text" value="30">
+                                Kilometer
+                                <input autocomplete="off" class="form-control" th:field="*{major}"
+                                       type="text" value="30">
                             </label>
+                            <select class="form-control w-auto" th:field="*{distanceMajorUnit}">
+                                <option th:text="Kilometer" th:value="kilometer">Kilometer</option>
+                                <option th:text="miles" th:value="miles">miles</option>
+                                <option th:text="nautical" th:value="nautical">nautical miles</option>
+                            </select>
                         </div>
+
                         <div class="form-group"><label>
-                            Meter<input autocomplete="off" class="form-control" th:field="*{meter}"
-                                        type="text" value="0">
+                            Meter
+                            <input autocomplete="off" class="form-control" th:field="*{minor}"
+                                   type="text" value="0">
                         </label>
+                            <select class="form-control w-auto" th:field="*{distanceMinorUnit}">
+                                <option th:text="Meter" th:value="meter">Meter</option>
+                                <option th:text="yards" th:value="yards">yards</option>
+                                <option th:text="fathoms" th:value="fathoms">fathoms</option>
+                            </select>
                         </div>
                         <div class="form-group"><label>
-                            Stunde(n)<input autocomplete="off" class="form-control" th:field="*{hour}"
-                                            type="text" value="1">
+                            Hour
+                            <input autocomplete="off" class="form-control" th:field="*{hour}"
+                                   type="text" value="1">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Minute(n)<input autocomplete="off" class="form-control" th:field="*{minute}"
-                                            type="text" value="0">
+                            Minute
+                            <input autocomplete="off" class="form-control" th:field="*{minute}"
+                                   type="text" value="0">
                         </label>
                         </div>
                         <div class="form-group"><label>
-                            Sekunde(n)<input autocomplete="off" class="form-control" th:field="*{second}"
-                                             type="text" value="0">
+                            Second
+                            <input autocomplete="off" class="form-control" th:field="*{second}"
+                                   type="text" value="0">
                         </label>
                         </div>
-                        <button class="btn btn-primary" type="submit">Berechne</button>
+                        <button class="btn btn-primary" type="submit">Calculate</button>
                     </form>
                 </div>
             </div>
@@ -57,14 +72,14 @@ <h1>Pace Rechner</h1>
                 <div class="card-body">
                     <h5 class="card-title">Pace</h5>
                     <p class="card-text">
-                        Die durchschnittliche ist <span th:text="${pace?.minutesPerKilometer.pace}">30</span> Minuten
-                        pro
-                        Kilometer, wenn man
-                        <span th:text="${form.kilometer}">30</span> Kilometer und
-                        <span th:text="${form.meter}">0</span> Meter in
-                        <span th:text="${form.hour}">1</span> Stunde(n), <span th:text="${form.minute}">0</span>
-                        Minute(n) und
-                        <span th:text="${form.second}">0</span> Sekunde(n) zurück legt.
+                        The average pace is <span th:text="${pace?.minutesPerKilometer.toString()}">30</span> Minutes
+                        per
+                        Kilometer
+                        for travelling <span th:text="${form.major}">30</span> <span
+                            th:text="${form.distanceMajorUnit}">kilometer</span> and
+                        <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
+                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
+                        <span th:text="${form.second}">0</span> seconds.
                     </p>
                 </div>
             </div>