Refactored api/ and web/ to web/api and web/ui. Added web/i18n.

.idea/bashsupport_project.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="BashSupportProjectSettings">
+    <option name="autocompleteBuiltinVars" value="true" />
+    <option name="projectInterpreter" value="/bin/bash" />
+  </component>
+</project>

.idea/runConfigurations/Generate.xml

@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Generate" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile">
+    <makefile filename="$PROJECT_DIR$/Makefile" target="generate -v cmd" workingDirectory="$PROJECT_DIR$" arguments="">
+      <envs />
+    </makefile>
+    <method v="2" />
+  </configuration>
+</component>

.idea/runConfigurations/Go_generate.xml

@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Go generate" type="BashConfigurationType" factoryName="Bash">
+    <module name="kurz" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="INTERPRETER_PATH" value="" />
+    <option name="PROJECT_INTERPRETER" value="true" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="PARENT_ENVS" value="true" />
+    <option name="SCRIPT_NAME" value="go" />
+    <option name="PARAMETERS" value="generate -v" />
+    <method v="2" />
+  </configuration>
+</component>

Makefile

@@ -12,3 +12,6 @@ cmd/kurz/kurz: $(wildcard cmd/kurz/*.go)
 
 cmd/kurzd/kurzd: $(wildcard api/*.go) $(wildcard cmd/kurzd/*.go) $(wildcard domain/*.go) $(wildcard infrastructure/*.go) $(wildcard migrations/*.go) $(wildcard web/*.go)
 	cd cmd/kurzd && go build
+
+generate:
+	go generate -v

cmd/kurzd/dist.config.yml

@@ -5,7 +5,7 @@ database:
   test_dsn: <user>:<pass>@[<server>]/<database>
 web:
   # May be absolute or relative to the current directory.
-  assetsPath: web/public
+  assetsPath: web/ui/public
   # The initial version cache buster on Kurz start. Will probably not remain in config.
   assetsVersion: 1
   listenAddress: ":3000"

cmd/kurzd/kurzd.go

@@ -1,6 +1,8 @@
 // Package kurzd contains the Kurz daemon command.
 package main
 
+//go:generate gotext -srclang=en update -out=catalog.go -lang=fr,de,en
+
 import (
 	"fmt"
 	"os"

cmd/kurzd/serve.go

@@ -9,10 +9,10 @@ import (
 	"os/signal"
 	"time"
 
-	"code.osinet.fr/fgm/kurz/web"
+	"code.osinet.fr/fgm/kurz/web/ui"
 	"github.com/spf13/viper"
 
-	"code.osinet.fr/fgm/kurz/api"
+	"code.osinet.fr/fgm/kurz/web/api"
 	"code.osinet.fr/fgm/kurz/domain"
 	"code.osinet.fr/fgm/kurz/infrastructure"
 	"github.com/gorilla/mux"
@@ -76,12 +76,12 @@ func serveHandler(_ *cobra.Command, args []string) {
 	viper.SetDefault("web.assetsPath", "web/public")
 	assetsPath := viper.Get("web.assetsPath").(string)
 	webConfig := viper.Get("web").(map[string]interface{})
-	web.SetupGlobals(webConfig)
+	ui.SetupGlobals(webConfig)
 
 	// Set up Web API and UI routes.
 	router := mux.NewRouter()
 	api.SetupRoutes(router)
-	web.SetupUI(router, assetsPath)
+	ui.SetupUI(router, assetsPath)
 	http.Handle("/", router)
 
 	// Start a server that can handle a SIGINT to shutdown.

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/spf13/cobra v0.0.3
 	github.com/spf13/pflag v1.0.3 // indirect
 	github.com/spf13/viper v1.2.1
+	golang.org/x/text v0.3.0
 	google.golang.org/appengine v1.3.0 // indirect
 	gopkg.in/yaml.v2 v2.2.1
 )

web/i18n/i18n_test.go

@@ -0,0 +1,25 @@
+package i18n
+
+import (
+	"net/http"
+)
+
+func HelloHandlerFunc(w http.ResponseWriter, r *http.Request) {
+	p := Printer(r)
+
+	p.Fprintf(w, "Hello, world")
+}
+
+// helloHandler implements http.Handler.
+type helloHandler struct {}
+
+func (h helloHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	p := Printer(r)
+
+	p.Fprintf(w, "Hello, world")
+}
+
+func ExampleWithPrinter() {
+	http.Handle("/h", WithPrinter(helloHandler{}))
+	http.Handle("/hf", WithPrinter(http.HandlerFunc(HelloHandlerFunc)))
+}

web/i18n/i18ner.go

@@ -0,0 +1,40 @@
+package i18n
+
+import (
+	"context"
+	"errors"
+	"net/http"
+
+	"golang.org/x/text/message"
+)
+
+/*
+WithPrinter() is a higher-order function injecting into the request context a
+printer for the language best matching the Accept-Language header in the incoming
+request.
+
+The wrapped handler can use Printer() to get a message printer instance
+configured for the best available language for the request.
+*/
+func WithPrinter(h http.Handler) http.Handler {
+	h2 := func(w http.ResponseWriter, r *http.Request) {
+		// Utilise le matcher de message.DefaultCatalog.
+		tag := message.MatchLanguage(r.Header.Get("Accept-Language"))
+		c := context.WithValue(r.Context(), "printer", message.NewPrinter(tag))
+		h.ServeHTTP(w, r.WithContext(c))
+	}
+	return http.HandlerFunc(h2)
+}
+
+/*
+Printer() returns a message printer configured for the language best matching the
+Accept-Language in the request, or panic if the handler invoking it was not
+wrapped by a WithPrinter() call.
+ */
+func Printer(r *http.Request) *message.Printer {
+	p, ok := r.Context().Value("printer").(*message.Printer)
+	if !ok {
+		panic(errors.New("trying to use i18n.Printer in a handler not wrapped with i18.WithPrinter"))
+	}
+	return p
+}

web/get_root.go → web/ui/get_root.go

@@ -1,4 +1,4 @@
-package web
+package ui
 
 import (
 	"io"

web/get_short.go → web/ui/get_short.go

@@ -1,4 +1,4 @@
-package web
+package ui
 
 import (
 	"fmt"

web/gorilla_imported.go → web/ui/gorilla_imported.go

@@ -1,4 +1,4 @@
-package web
+package ui
 
 // mapToPairs converts a string map to a slice of string pairs
 // Part of the mux_test.go file in Gorilla Mux, used under its BSD-like license.

web/post_target.go → web/ui/post_target.go

@@ -1,4 +1,4 @@
-package web
+package ui
 
 import (
 	"fmt"

web/web.go → web/ui/web.go

@@ -5,7 +5,7 @@ These routes are exposed by running SetupUI(listenAddress), which is enough to
 configure the Kurz domain API. Be sure to also configure the domain SPI to have
 a complete application.
 */
-package web
+package ui
 
 import (
 	"errors"

web/web_test.go → web/ui/web_test.go

@@ -1,4 +1,4 @@
-package web
+package ui
 
 import (
 	"fmt"