summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorSean E. Russell <ser@ser1.net>2020-05-01 20:25:29 -0500
committerSean E. Russell <ser@ser1.net>2020-05-01 20:25:29 -0500
commit82f308de933cf537a0ae20def1c909ca49f803ff (patch)
tree4f9d1333d940a4d5e80944dfb477206be8fddab3 /cmd
parent1419dbd75c584ca6765b44e81be5b19bf13394b1 (diff)
Translations for main.go, so mainly help
Diffstat (limited to 'cmd')
-rw-r--r--cmd/gotop/main.go88
1 files changed, 50 insertions, 38 deletions
diff --git a/cmd/gotop/main.go b/cmd/gotop/main.go
index bd00b66..7459a97 100644
--- a/cmd/gotop/main.go
+++ b/cmd/gotop/main.go
@@ -5,6 +5,7 @@ import (
"flag"
"fmt"
"io"
+ "io/ioutil"
"log"
"net/http"
"os"
@@ -17,9 +18,11 @@ import (
//_ "net/http/pprof"
+ jj "github.com/cloudfoundry-attic/jibber_jabber"
ui "github.com/gizak/termui/v3"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/shibukawa/configdir"
+ "github.com/xxxserxxx/lingo"
"github.com/xxxserxxx/opflag"
"github.com/xxxserxxx/gotop/v4"
@@ -50,6 +53,7 @@ var (
bar *w.StatusBar
statusbar bool
stderrLogger = log.New(os.Stderr, "", 0)
+ tr lingo.Translations
)
func parseArgs() error {
@@ -58,35 +62,27 @@ func parseArgs() error {
for i, p := range cds {
cpaths[i] = p.Path
}
- help := opflag.BoolP("help", "h", false, "Show this screen.")
- color := opflag.StringP("color", "c", conf.Colorscheme.Name, "Set a colorscheme.")
- opflag.IntVarP(&conf.GraphHorizontalScale, "graphscale", "S", conf.GraphHorizontalScale, "Graph scale factor, >0")
- version := opflag.BoolP("version", "v", false, "Print version and exit.")
- versioN := opflag.BoolP("", "V", false, "Print version and exit.")
- opflag.BoolVarP(&conf.PercpuLoad, "percpu", "p", conf.PercpuLoad, "Show each CPU in the CPU widget.")
- opflag.BoolVarP(&conf.AverageLoad, "averagecpu", "a", conf.AverageLoad, "Show average CPU in the CPU widget.")
- fahrenheit := opflag.BoolP("fahrenheit", "f", conf.TempScale == 'F', "Show temperatures in fahrenheit.Show temperatures in fahrenheit.")
- opflag.BoolVarP(&conf.Statusbar, "statusbar", "s", conf.Statusbar, "Show a statusbar with the time.")
- opflag.DurationVarP(&conf.UpdateInterval, "rate", "r", conf.UpdateInterval, "Refresh frequency. Most time units accepted. `1m` = refresh every minute. `100ms` = refresh every 100ms.")
- opflag.StringVarP(&conf.Layout, "layout", "l", conf.Layout, `Name of layout spec file for the UI. Use "-" to pipe.`)
- opflag.StringVarP(&conf.NetInterface, "interface", "i", "all", "Select network interface. Several interfaces can be defined using comma separated values. Interfaces can also be ignored using `!`")
- opflag.StringVarP(&conf.ExportPort, "export", "x", conf.ExportPort, "Enable metrics for export on the specified port.")
- opflag.BoolVarP(&conf.Mbps, "mbps", "", conf.Mbps, "Show network rate as mbps.")
- // FIXME Where did this go??
- //conf.Band = opflag.IntP("bandwidth", "B", 100, "Specify the number of bits per seconds.")
- opflag.BoolVar(&conf.Test, "test", conf.Test, "Runs tests and exits with success/failure code.")
- opflag.StringP("", "C", "", "Config file to use instead of default (MUST BE FIRST ARGUMENT)")
- list := opflag.String("list", "", `List <devices|layouts|colorschemes|paths|keys>
- devices: Prints out device names for filterable widgets
- layouts: Lists build-in layouts
- colorschemes: Lists built-in colorschemes
- paths: List out configuration file search paths
- widgets: Widgets that can be used in a layout
- keys: Show the keyboard bindings.`)
- wc := opflag.Bool("write-config", false, "Write out a default config file.")
+ help := opflag.BoolP("help", "h", false, tr.Value("args.help"))
+ color := opflag.StringP("color", "c", conf.Colorscheme.Name, tr.Value("args.color"))
+ opflag.IntVarP(&conf.GraphHorizontalScale, "graphscale", "S", conf.GraphHorizontalScale, tr.Value("args.scale"))
+ version := opflag.BoolP("version", "v", false, tr.Value("args.version"))
+ versioN := opflag.BoolP("", "V", false, tr.Value("args.version"))
+ opflag.BoolVarP(&conf.PercpuLoad, "percpu", "p", conf.PercpuLoad, tr.Value("args.percpu"))
+ opflag.BoolVarP(&conf.AverageLoad, "averagecpu", "a", conf.AverageLoad, tr.Value("args.cpuavg"))
+ fahrenheit := opflag.BoolP("fahrenheit", "f", conf.TempScale == 'F', tr.Value("args.temp"))
+ opflag.BoolVarP(&conf.Statusbar, "statusbar", "s", conf.Statusbar, tr.Value("args.statusbar"))
+ opflag.DurationVarP(&conf.UpdateInterval, "rate", "r", conf.UpdateInterval, tr.Value("args.rate"))
+ opflag.StringVarP(&conf.Layout, "layout", "l", conf.Layout, tr.Value("args.layout"))
+ opflag.StringVarP(&conf.NetInterface, "interface", "i", "all", tr.Value("args.net"))
+ opflag.StringVarP(&conf.ExportPort, "export", "x", conf.ExportPort, tr.Value("args.export"))
+ opflag.BoolVarP(&conf.Mbps, "mbps", "", conf.Mbps, tr.Value("args.mbps"))
+ opflag.BoolVar(&conf.Test, "test", conf.Test, tr.Value("args.test"))
+ opflag.StringP("", "C", "", tr.Value("args.conffile"))
+ list := opflag.String("list", "", tr.Value("args.list"))
+ wc := opflag.Bool("write-config", false, tr.Value("args.write"))
opflag.SortFlags = false
opflag.Usage = func() {
- fmt.Fprintf(os.Stderr, "Usage: %s [options]\n\nOptions:\n", os.Args[0])
+ fmt.Fprintf(os.Stderr, tr.Value("usage", os.Args[0]))
opflag.PrintDefaults()
}
opflag.Parse()
@@ -115,13 +111,14 @@ func parseArgs() error {
case "colorschemes":
fmt.Println(_colorschemes)
case "paths":
- fmt.Println("Loadable colorschemes & layouts, and the config file, are searched for, in order:")
+ fmt.Println(tr.Value("help.paths"))
paths := make([]string, 0)
for _, d := range conf.ConfigDir.QueryFolders(configdir.All) {
paths = append(paths, d.Path)
}
fmt.Println(strings.Join(paths, "\n"))
- fmt.Printf("\nThe log file is in %s\n", filepath.Join(conf.ConfigDir.QueryCacheFolder().Path, logging.LOGFILE))
+ fmt.Println()
+ fmt.Println(tr.Value("help.log", filepath.Join(conf.ConfigDir.QueryCacheFolder().Path, logging.LOGFILE)))
case "devices":
listDevices()
case "keys":
@@ -129,7 +126,7 @@ func parseArgs() error {
case "widgets":
fmt.Println(_widgets)
default:
- fmt.Printf("Unknown option \"%s\"; try layouts, colorschemes, keys, paths, or devices\n", *list)
+ fmt.Printf(tr.Value("errors.unknownopt", *list))
os.Exit(1)
}
os.Exit(0)
@@ -137,10 +134,10 @@ func parseArgs() error {
if *wc {
path, err := conf.Write()
if err != nil {
- fmt.Printf("Failed to write configuration file: %s\n", err)
+ fmt.Println(tr.Value("errors.writefail", err.Error()))
os.Exit(1)
}
- fmt.Printf("Config written to %s\n", path)
+ fmt.Println(tr.Value("help.written", path))
os.Exit(0)
}
return nil
@@ -348,38 +345,53 @@ func main() {
ec := run()
if ec > 0 {
if ec < 2 {
- fmt.Printf("errors encountered; check the log file %s\n", filepath.Join(conf.ConfigDir.QueryCacheFolder().Path, logging.LOGFILE))
+ logpath := filepath.Join(conf.ConfigDir.QueryCacheFolder().Path, logging.LOGFILE)
+ fmt.Println(tr.Value("errors.checklog", logpath))
+ fmt.Println(ioutil.ReadFile(logpath))
}
}
os.Exit(ec)
}
func run() int {
+ ling, err := lingo.New("en_US", "translations", nil)
+ if err != nil {
+ fmt.Printf("failed to load language files: %s\n", err)
+ return 2
+ }
+ lang, err := jj.DetectIETF()
+ if err != nil {
+ fmt.Printf("failed to get language setting from environment: %s\n", err)
+ return 2
+ }
+ lang = strings.Replace(lang, "-", "_", -1)
+ // Get the locale from the os
+ tr = ling.TranslationsForLocale(lang)
conf = gotop.NewConfig()
// Find the config file; look in (1) local, (2) user, (3) global
// Check the last argument first
fs := flag.NewFlagSet("config", flag.ContinueOnError)
- cfg := fs.String("C", "", "Config file")
+ cfg := fs.String("C", "", tr.Value("configfile"))
fs.SetOutput(bufio.NewWriter(nil))
fs.Parse(os.Args[1:])
if *cfg != "" {
conf.ConfigFile = *cfg
}
- err := conf.Load()
+ err = conf.Load()
if err != nil {
- fmt.Printf("failed to parse config file: %s\n", err)
+ fmt.Println(tr.Value("errors.configparse", err.Error()))
return 2
}
// Override with command line arguments
err = parseArgs()
if err != nil {
- fmt.Printf("parsing CLI args: %s\n", err)
+ fmt.Println(tr.Value("errors.cliparse", err.Error()))
return 2
}
logfile, err := logging.New(conf)
if err != nil {
- fmt.Printf("failed to setup log file: %v\n", err)
+ fmt.Println(tr.Value("logsetup", err.Error()))
return 2
}
defer logfile.Close()