Resolves merge conflicts

4 files changed, 29 insertions, 15 deletions

diff --git a/devices/devices.go b/devices/devices.go
index 7360578..8873ae5 100644
--- a/devices/devices.go
+++ b/devices/devices.go
@@ -2,6 +2,7 @@ package devices
 
 import (
 	"log"
+	"github.com/jdkeke142/lingo-toml"
 )
 
 const (
@@ -15,6 +16,7 @@ var _shutdownFuncs []func() error
 var _devs map[string][]string
 var _defaults map[string][]string
 var _startup []func(map[string]string) error
+var tr lingo.Translations
 
 // RegisterShutdown stores a function to be called by gotop on exit, allowing
 // extensions to properly release resources.  Extensions should register a
@@ -86,3 +88,7 @@ func Devices(domain string, all bool) []string {
 	}
 	return _defaults[domain]
 }
+
+func SetTr(tra lingo.Translations) {
+	tr = tra
+}
diff --git a/devices/smc.go b/devices/smc.go
index 4701a07..21931c4 100644
--- a/devices/smc.go
+++ b/devices/smc.go
@@ -1,8 +1,7 @@
-// Code generated by go-bindata.
-// sources:
-// data/smc.tsv
-// DO NOT EDIT!
+// Code generated by go-bindata. (@generated) DO NOT EDIT.
 
+ //Package devices generated by go-bindata.// sources:
+// devices/data/smc.tsv
 package devices
 
 import (
@@ -20,7 +19,7 @@ import (
 func bindataRead(data []byte, name string) ([]byte, error) {
 	gz, err := gzip.NewReader(bytes.NewBuffer(data))
 	if err != nil {
-		return nil, fmt.Errorf("Read %q: %v", name, err)
+		return nil, fmt.Errorf("read %q: %v", name, err)
 	}
 
 	var buf bytes.Buffer
@@ -28,7 +27,7 @@ func bindataRead(data []byte, name string) ([]byte, error) {
 	clErr := gz.Close()
 
 	if err != nil {
-		return nil, fmt.Errorf("Read %q: %v", name, err)
+		return nil, fmt.Errorf("read %q: %v", name, err)
 	}
 	if clErr != nil {
 		return nil, err
@@ -49,21 +48,32 @@ type bindataFileInfo struct {
 	modTime time.Time
 }
 
+// Name return file name
 func (fi bindataFileInfo) Name() string {
 	return fi.name
 }
+
+// Size return file size
 func (fi bindataFileInfo) Size() int64 {
 	return fi.size
 }
+
+// Mode return file mode
 func (fi bindataFileInfo) Mode() os.FileMode {
 	return fi.mode
 }
+
+// ModTime return file modify time
 func (fi bindataFileInfo) ModTime() time.Time {
 	return fi.modTime
 }
+
+// IsDir return file whether a directory
 func (fi bindataFileInfo) IsDir() bool {
-	return false
+	return fi.mode&os.ModeDir != 0
 }
+
+// Sys return file is sys mode
 func (fi bindataFileInfo) Sys() interface{} {
 	return nil
 }
@@ -83,7 +93,7 @@ func smcTsv() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "smc.tsv", size: 3398, mode: os.FileMode(420), modTime: time.Unix(1591711965, 0)}
+	info := bindataFileInfo{name: "smc.tsv", size: 3398, mode: os.FileMode(420), modTime: time.Unix(1592515411, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -182,6 +192,7 @@ type bintree struct {
 	Func     func() (*asset, error)
 	Children map[string]*bintree
 }
+
 var _bintree = &bintree{nil, map[string]*bintree{
 	"smc.tsv": &bintree{smcTsv, map[string]*bintree{}},
 }}
@@ -232,4 +243,3 @@ func _filePath(dir, name string) string {
 	cannonicalName := strings.Replace(name, "\\", "/", -1)
 	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
 }
-
diff --git a/devices/temp.go b/devices/temp.go
index 247075a..87f534f 100644
--- a/devices/temp.go
+++ b/devices/temp.go
@@ -1,7 +1,5 @@
 package devices
 
-//go:generate go-bindata -pkg devices -prefix data -o smc.go data
-
 import (
 	"log"
 )
@@ -19,7 +17,7 @@ func UpdateTemps(temps map[string]int) {
 		errs := f(temps)
 		if errs != nil {
 			for k, e := range errs {
-				log.Printf("error updating temp for %s: %s", k, e)
+				log.Printf(tr.Value("error.recovfetch", "temp", k, e.Error()))
 			}
 		}
 	}
diff --git a/devices/temp_freebsd.go b/devices/temp_freebsd.go
index 3e659be..e87dcb3 100644
--- a/devices/temp_freebsd.go
+++ b/devices/temp_freebsd.go
@@ -13,7 +13,7 @@ import (
 
 func init() {
 	if len(devs()) == 0 {
-		log.Println("temp: no thermal sensors found")
+		log.Println(tr.Value("error.nodevfound", "thermal sensors"))
 		return
 	}
 	RegisterTemp(update)
@@ -58,13 +58,13 @@ func devs() []string {
 	// Check that thermal sensors are really available; they aren't in VMs
 	bs, err := exec.Command("sysctl", "-a").Output()
 	if err != nil {
-		log.Printf("temp: failure to get system information %s", err.Error())
+		log.Printf(tr.Value("error.fatalfetch", "temp", err.Error()))
 		return []string{}
 	}
 	for k, _ := range sensorOIDS {
 		idx := strings.Index(string(bs), k)
 		if idx < 0 {
-			log.Printf("temp: no device %s found", k)
+			log.Printf(tr.Value("error.nodevfound", k))
 		} else {
 			rv = append(rv, k)
 		}