Merge branch 'lyricnz-feature/locale-dates'

Author: miguelmota

cointop/coins_table.go

@@ -291,7 +291,7 @@ func (ct *Cointop) GetCoinsTable() *table.Table {
 					})
 			case "last_updated":
 				unix, _ := strconv.ParseInt(coin.LastUpdated, 10, 64)
-				lastUpdated := time.Unix(unix, 0).Format("15:04:05 Jan 02")
+				lastUpdated := humanize.FormatTime(time.Unix(unix, 0), "15:04:05 Jan 02")
 				ct.SetTableColumnWidthFromString(header, lastUpdated)
 				ct.SetTableColumnAlignLeft(header, false)
 				rowCells = append(rowCells,

cointop/portfolio.go

@@ -290,7 +290,7 @@ func (ct *Cointop) GetPortfolioTable() *table.Table {
 					})
 			case "last_updated":
 				unix, _ := strconv.ParseInt(coin.LastUpdated, 10, 64)
-				lastUpdated := time.Unix(unix, 0).Format("15:04:05 Jan 02")
+				lastUpdated := humanize.FormatTime(time.Unix(unix, 0), "15:04:05 Jan 02")
 				ct.SetTableColumnWidthFromString(header, lastUpdated)
 				ct.SetTableColumnAlignLeft(header, false)
 				rowCells = append(rowCells,

go.mod

@@ -10,6 +10,8 @@ require (
 	github.com/fatih/color v1.13.0
 	github.com/gen2brain/beeep v0.0.0-20210529141713-5586760f0cc1
 	github.com/gliderlabs/ssh v0.3.3
+	github.com/goodsign/monday v1.0.0
+	github.com/jeandeaual/go-locale v0.0.0-20210323163322-5cf4ff553a8d
 	github.com/maruel/panicparse v1.6.1
 	github.com/mattn/go-runewidth v0.0.13
 	github.com/miguelmota/go-coinmarketcap v0.1.8

go.sum

@@ -6,11 +6,16 @@ import (
 	"os"
 	"strconv"
 	"strings"
+	"time"
 
+	"github.com/goodsign/monday"
+	"github.com/jeandeaual/go-locale"
 	"golang.org/x/text/language"
 	"golang.org/x/text/message"
 )
 
+var cachedSystemLocale = ""
+
 // Numericf produces a string from of the given number with give fixed precision
 // in base 10 with thousands separators after every three orders of magnitude
 // using thousands and decimal separator according to LC_NUMERIC; defaulting "en".
@@ -29,6 +34,61 @@ func Monetaryf(value float64, precision int) string {
 	return f(value, precision, "LC_MONETARY", false)
 }
 
+// borrowed from go-locale/util.go
+func splitLocale(locale string) (string, string) {
+	// Remove the encoding, if present
+	formattedLocale := strings.Split(locale, ".")[0]
+	// Normalize by replacing the hyphens with underscores
+	formattedLocale = strings.Replace(formattedLocale, "-", "_", -1)
+
+	// Split at the underscore
+	split := strings.Split(formattedLocale, "_")
+	language := split[0]
+	territory := ""
+	if len(split) > 1 {
+		territory = split[1]
+	}
+
+	return language, territory
+}
+
+// GetLocale returns the current locale as defined in IETF BCP 47 (e.g. "en-US").
+// The envvar provided is checked first (eg LC_TIME), before the platform-specific defaults.
+func getLocale(envvar string) string {
+	userLocale := "en-US" // default language-REGION
+	// First try looking up envar directly
+	envlang, ok := os.LookupEnv(envvar)
+	if ok {
+		language, region := splitLocale(envlang)
+		userLocale = language
+		if len(region) > 0 {
+			userLocale = strings.Join([]string{language, region}, "-")
+		}
+	} else {
+		// Then use (cached) system-specific locale
+		if cachedSystemLocale == "" {
+			if loc, err := locale.GetLocale(); err == nil {
+				userLocale = loc
+				cachedSystemLocale = loc
+			}
+		} else {
+			userLocale = cachedSystemLocale
+		}
+	}
+	return userLocale
+}
+
+// formatTimeExplicit formats the given time using the prescribed layout with the provided userLocale
+func formatTimeExplicit(time time.Time, layout string, userLocale string) string {
+	mondayLocale := monday.Locale(strings.Replace(userLocale, "-", "_", 1))
+	return monday.Format(time, layout, mondayLocale)
+}
+
+// FormatTime is a dropin replacement time.Format(layout) that uses system locale + LC_TIME
+func FormatTime(time time.Time, layout string) string {
+	return formatTimeExplicit(time, layout, getLocale("LC_TIME"))
+}
+
 // f formats given value, with precision decimal places using thousands and decimal
 // separator according to language found in given locale environment variable e.
 // If fixed is true the decimal places are fixed to the given precision otherwise d is the

pkg/humanize/humanize.go

@@ -3,6 +3,7 @@ package humanize
 import (
 	"fmt"
 	"testing"
+	"time"
 )
 
 // TestMonetary tests monetary formatting
@@ -51,3 +52,43 @@ func TestScaleNumeric(t *testing.T) {
 		}
 	}
 }
+
+func TestFormatTime(t *testing.T) {
+	testData := map[string]map[string]string{
+		"en_GB": {
+			"Monday 2 January 2006": "Wednesday 12 March 2014",
+			"Jan 2006":              "Mar 2014",
+			"02 Jan 2006":           "12 Mar 2014",
+			"02/01/2006":            "12/03/2014",
+		},
+		"en_US": {
+			"Monday 2 January 2006": "Wednesday 12 March 2014",
+			"Jan 2006":              "Mar 2014",
+			"02 Jan 2006":           "12 Mar 2014",
+			"02/01/2006":            "12/03/2014", // ??
+		},
+		"fr_FR": {
+			"Monday 2 January 2006": "mercredi 12 mars 2014",
+			"Jan 2006":              "mars 2014",
+			"02 Jan 2006":           "12 mars 2014",
+			"02/01/2006":            "12/03/2014",
+		},
+		"de_DE": {
+			"Monday 2 January 2006": "Mittwoch 12 März 2014",
+			"Jan 2006":              "Mär 2014",
+			"02 Jan 2006":           "12 Mär 2014",
+			"02/01/2006":            "12/03/2014",
+		},
+	}
+
+	testTime := time.Date(2014, 3, 12, 0, 0, 0, 0, time.Local)
+	for locale, tests := range testData {
+		for layout, result := range tests {
+			s := formatTimeExplicit(testTime, layout, locale)
+			if s != result {
+				t.Fatalf("Expected layout '%s' in locale %s to render '%s' but got '%s'", layout, locale, result, s)
+			}
+
+		}
+	}
+}

pkg/humanize/humanize_test.go

@@ -4,6 +4,8 @@ import (
 	"math"
 	"sort"
 	"time"
+
+	"github.com/cointop-sh/cointop/pkg/humanize"
 )
 
 // ResampleTimeSeriesData resamples the given [timestamp,value] data to numsteps between start-end (returns numSteps+1 points).
@@ -59,7 +61,8 @@ func BuildTimeSeriesLabels(data [][]float64) []string {
 	}
 	var labels []string
 	for i := range data {
-		labels = append(labels, time.UnixMilli(int64(data[i][0])).Format(timeFormat))
+		labelTime := time.UnixMilli(int64(data[i][0]))
+		labels = append(labels, humanize.FormatTime(labelTime, timeFormat))
 	}
 	return labels
 }