Various QoL improvments

core/config.go

@@ -3,7 +3,11 @@ package core
 import (
 	"flag"
 
+	locale "github.com/Xuanwo/go-locale"
+	"golang.org/x/exp/slices"
+
 	"github.com/safing/portbase/config"
+	"github.com/safing/portbase/log"
 )
 
 // Configuration Keys.
@@ -13,6 +17,8 @@ var (
 
 	CfgNetworkServiceKey      = "core/networkService"
 	defaultNetworkServiceMode bool
+
+	CfgLocaleKey = "core/locale"
 )
 
 func init() {
@@ -41,5 +47,66 @@ func registerConfig() error {
 		return err
 	}
 
+	if err := config.Register(&config.Option{
+		Name:           "Time and Date Format",
+		Key:            CfgLocaleKey,
+		Description:    "Configures the time and date format for the user interface. Selection is an example and correct formatting in the UI is a continual work in progress.",
+		OptType:        config.OptTypeString,
+		ExpertiseLevel: config.ExpertiseLevelUser,
+		ReleaseLevel:   config.ReleaseLevelStable,
+		DefaultValue:   getDefaultLocale(),
+		PossibleValues: []config.PossibleValue{
+			{
+				Name:  "24h DD-MM-YYYY",
+				Value: enGBLocale,
+			},
+			{
+				Name:  "12h MM/DD/YYYY",
+				Value: enUSLocale,
+			},
+		},
+		Annotations: config.Annotations{
+			config.CategoryAnnotation:         "User Interface",
+			config.DisplayHintAnnotation:      config.DisplayHintOneOf,
+			config.RequiresUIReloadAnnotation: true,
+		},
+	}); err != nil {
+		return err
+	}
+
 	return nil
 }
+
+func getDefaultLocale() string {
+	// Get locales from system.
+	detectedLocales, err := locale.DetectAll()
+	if err != nil {
+		log.Warningf("core: failed to detect locale: %s", err)
+		return enGBLocale
+	}
+
+	// log.Debugf("core: detected locales: %s", detectedLocales)
+
+	// Check if there is a locale that corresponds to the en-US locale.
+	for _, detectedLocale := range detectedLocales {
+		if slices.Contains[[]string, string](defaultEnUSLocales, detectedLocale.String()) {
+			return enUSLocale
+		}
+	}
+
+	// Otherwise, return the en-GB locale as default.
+	return enGBLocale
+}
+
+var (
+	enGBLocale = "en-GB"
+	enUSLocale = "en-US"
+
+	defaultEnUSLocales = []string{
+		"en-AS", // English (American Samoa)
+		"en-GU", // English (Guam)
+		"en-UM", // English (U.S. Minor Outlying Islands)
+		"en-US", // English (United States)
+		"en-VI", // English (U.S. Virgin Islands)
+	}
+)

go.mod

@@ -3,6 +3,7 @@ module github.com/safing/portmaster
 go 1.20
 
 require (
+	github.com/Xuanwo/go-locale v1.1.0
 	github.com/agext/levenshtein v1.2.3
 	github.com/cilium/ebpf v0.11.0
 	github.com/coreos/go-iptables v0.7.0
@@ -15,23 +16,24 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/go-version v1.6.0
 	github.com/jackc/puddle/v2 v2.2.1
-	github.com/miekg/dns v1.1.55
+	github.com/miekg/dns v1.1.56
+	github.com/mitchellh/go-server-timing v1.0.1
 	github.com/oschwald/maxminddb-golang v1.12.0
 	github.com/safing/jess v0.3.1
-	github.com/safing/portbase v0.17.3
-	github.com/safing/portmaster-android/go v0.0.0-20230605085256-6abf4c495626
-	github.com/safing/spn v0.6.18-prep
+	github.com/safing/portbase v0.17.4
+	github.com/safing/portmaster-android/go v0.0.0-20230830120134-3226ceac3bec
+	github.com/safing/spn v0.6.19
 	github.com/shirou/gopsutil v3.21.11+incompatible
 	github.com/spf13/cobra v1.7.0
 	github.com/spkg/zipfs v0.7.1
 	github.com/stretchr/testify v1.8.4
 	github.com/tannerryan/ring v1.1.2
 	github.com/tevino/abool v1.2.0
 	github.com/umahmood/haversine v0.0.0-20151105152445-808ab04add26
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
-	golang.org/x/net v0.14.0
+	golang.org/x/exp v0.0.0-20230905200255-921286631fa9
+	golang.org/x/net v0.15.0
 	golang.org/x/sync v0.3.0
-	golang.org/x/sys v0.11.0
+	golang.org/x/sys v0.12.0
 	zombiezen.com/go/sqlite v0.13.1
 )
 
@@ -46,10 +48,12 @@ require (
 	github.com/danieljoos/wincred v1.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/fxamacker/cbor v1.5.1 // indirect
 	github.com/fxamacker/cbor/v2 v2.5.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/gofrs/uuid v4.4.0+incompatible // indirect
+	github.com/golang/gddo v0.0.0-20210115222349-20d68f94ee1f // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/uuid v1.3.1 // indirect
@@ -60,7 +64,7 @@ require (
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mdlayher/netlink v1.7.2 // indirect
-	github.com/mdlayher/socket v0.4.1 // indirect
+	github.com/mdlayher/socket v0.5.0 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
@@ -86,10 +90,11 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	github.com/zalando/go-keyring v0.2.3 // indirect
 	go.etcd.io/bbolt v1.3.7 // indirect
-	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/crypto v0.13.0 // indirect
 	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
+	golang.org/x/tools v0.13.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gvisor.dev/gvisor v0.0.0-20220817001344-846276b3dbc5 // indirect