fix(services/templater): Update kilometer formatting to include dynamic separator based on locale

Dockerfile

@@ -8,8 +8,9 @@ RUN go mod download
 COPY . .
 RUN CGO_ENABLED=0 GOOS=linux go build -o server
 
-FROM scratch
+FROM alpine:3.18
+RUN mkdir -p /tmp && chmod 1777 /tmp
+
 COPY --from=builder /app/server /server
 COPY static /static
-ADD https://curl.haxx.se/ca/cacert.pem /etc/ssl/certs/ca-certificates.crt
 ENTRYPOINT [ "/server" ]

services/templater.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"html/template"
+	"math"
 	"strings"
 
 	"go.uber.org/zap"
@@ -89,9 +90,24 @@ func (t *DefaultTemplater) LoadImage(name string) (string, error) {
 
 func (t *DefaultTemplater) FormatUnit(unit string, locale string, amount int) (string, error) {
 	var formatted string
+	var seperator string
+	switch locale {
+	case "de":
+		seperator = " "
+	default:
+		seperator = ""
+	}
 	switch unit {
 	case "kilometer":
-		formatted = fmt.Sprintf("%.3f", float64(amount)/1000)
+		if amount < 1000 {
+			formatted = fmt.Sprintf("%d%sm", amount, seperator)
+		} else if (amount % 1000) == 0 {
+			formatted = fmt.Sprintf("%d%skm", amount/1000, seperator)
+		} else {
+			kilometers := math.Floor(float64(amount) / 1000)
+			meters := amount - int(kilometers)*1000
+			formatted = fmt.Sprintf("%d%skm %d%sm", int(kilometers), seperator, meters, seperator)
+		}
 	case "euro":
 		formatted = fmt.Sprintf("%.2f", float64(amount)/100)
 	default:

static/templates/card/de.html

@@ -54,7 +54,7 @@
         <p>{{ .Runner.LastName }}, {{ .Runner.FirstName }} {{ .Runner.MiddleName }}</p>
         <p>{{ if ne .Runner.Group.ParentGroup.Name "" -}}{{ .Runner.Group.ParentGroup.Name }}/{{end -}}{{ .Runner.Group.Name }}</p>
         {{ else }}
-        <p>Kein Läufer zugewiesen</p>
+        <p>Läufer:in</p>
         {{ end}}
         {{ end}}
       </div>

static/templates/card/en.html

@@ -53,7 +53,7 @@
         <p>{{ .Runner.LastName }}, {{ .Runner.FirstName }} {{ .Runner.MiddleName }}</p>
         <p>{{ if ne .Runner.Group.ParentGroup.Name "" -}}{{ .Runner.Group.ParentGroup.Name }}/{{end -}}{{ .Runner.Group.Name }}</p>
         {{ else }}
-        <p>Blank card</p>
+        <p>Runner</p>
         {{ end}}
       </div>
       {{ end }}

static/templates/certificate/de.html

@@ -56,7 +56,7 @@
         {{ .MiddleName }} {{ .LastName }}
       </p>
       <p style="font-size: 1cm; margin-bottom: 0;">hat beim {{ $.EventName }}</p>
-      <p style="font-size: 2cm; font-weight: bold; margin-bottom: 0;">{{formatUnit "kilometer" $.Locale .Distance}}km</p>
+      <p style="font-size: 2cm; font-weight: bold; margin-bottom: 0;">{{formatUnit "kilometer" $.Locale .Distance}}</p>
       <p style="font-size: 1cm;">für den guten Zweck zurückgelegt.</p>
     </main>
     <footer class="certificate-footer">

static/templates/certificate/en.html

@@ -56,7 +56,7 @@
         {{ .MiddleName }} {{ .LastName }}
       </p>
       <p style="font-size: 1cm; margin-bottom: 0;">Ran</p>
-      <p style="font-size: 2cm; font-weight: bold; margin-bottom: 0;">{{formatUnit "kilometer" $.Locale .Distance}}km</p>
+      <p style="font-size: 2cm; font-weight: bold; margin-bottom: 0;">{{formatUnit "kilometer" $.Locale .Distance}}</p>
       <p style="font-size: 1cm;">for our good cause at the {{ $.EventName }}.</p>
     </main>
     <footer class="certificate-footer">