From 8337c92f45cb8e7b2ccc6089ffe5d4ca2df57511 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 28 Oct 2020 15:43:16 -0700 Subject: [PATCH 1/3] log assetFolder, use sperator rune --- main.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index 5ecf927c..e3cb5a35 100644 --- a/main.go +++ b/main.go @@ -167,8 +167,9 @@ func mainUi(flagLocal bool, flagClientUI bool) { if runtime.GOOS == "windows" { dir = "/" + dir } - gcd.SetAssetPath("file://" + filepath.Join(dir, "assets") + "/") + gcd.SetAssetPath("file://" + filepath.Join(dir, "assets") + string(filepath.Separator)) } + log.Infof("gcd.assetPath = '%v'\n", gcd.AssetPath()) if buildVer != "" { gcd.SetVersion(buildVer) -- 2.25.1 From 27b092683a36b6a22c2d9939d8975f47f66b3e9d Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 28 Oct 2020 15:50:19 -0700 Subject: [PATCH 2/3] fix assetDir path on windows --- main.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index e3cb5a35..2fce7c0c 100644 --- a/main.go +++ b/main.go @@ -24,6 +24,7 @@ import ( mrand "math/rand" "os" "os/user" + "path" "path/filepath" "runtime" "time" @@ -167,7 +168,8 @@ func mainUi(flagLocal bool, flagClientUI bool) { if runtime.GOOS == "windows" { dir = "/" + dir } - gcd.SetAssetPath("file://" + filepath.Join(dir, "assets") + string(filepath.Separator)) + // QML uses '/' refardless of platform (so we use path.Join here not filepath.Join) + gcd.SetAssetPath("file://" + path.Join(dir, "assets") + "/") } log.Infof("gcd.assetPath = '%v'\n", gcd.AssetPath()) -- 2.25.1 From 8b2a3aedfea5c5b6477dd10306088f5832937bef Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 28 Oct 2020 16:47:00 -0700 Subject: [PATCH 3/3] mend --- i18n/translation_de.qm | Bin 3211 -> 3221 bytes i18n/translation_fr.qm | Bin 3125 -> 3135 bytes i18n/translation_pt.qm | Bin 2923 -> 2933 bytes main.go | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/translation_de.qm b/i18n/translation_de.qm index 371e5a8364da467ae9ee9152dca9bdce9795fee1..9ec5da3e8635a0e59f8dcdc2c3921865a0c80bb0 100644 GIT binary patch delta 35 rcmeB{oGK}0vm-^~)cZM8&nn97PguD3?s5hO2G*3+co)}=0@XYK37QSi delta 25 hcmbO#*)1txvm-^~)cZM8&nn97PguD3?nbF<9srHA3v&Pf diff --git a/i18n/translation_fr.qm b/i18n/translation_fr.qm index 42e1df36cf2b6a7e640c4cff2a4dbca8740d16a2..e13d08626af42d5bbe2a2b8850d81a9098ddfa18 100644 GIT binary patch delta 35 rcmdlgv0p;UW=D#|srPfHo>i3DpRjQ6-Q^4n46JEI@oqsI1yp$e6q^m| delta 25 hcmdllu~kCAW=D#|srPfHo>i3DpRjQ6-HlSJJOGrr3vU1b diff --git a/i18n/translation_pt.qm b/i18n/translation_pt.qm index f0ec24706be7a09648130b9059bb25e1e9f6e956..8c6f6d5924f6021ff4ad7f7e12d4cdee240f1822 100644 GIT binary patch delta 35 rcmaDY_Ek*EW=D#|srPfHo>i3DpRjQ6-Q^4n46Fqu@lHV-1){kDBPi3DpRjQ6-HlSw+yI{F3=9AO diff --git a/main.go b/main.go index 2fce7c0c..f5821a26 100644 --- a/main.go +++ b/main.go @@ -168,7 +168,7 @@ func mainUi(flagLocal bool, flagClientUI bool) { if runtime.GOOS == "windows" { dir = "/" + dir } - // QML uses '/' refardless of platform (so we use path.Join here not filepath.Join) + // QML uses '/' regardless of platform (so we use path.Join here not filepath.Join) gcd.SetAssetPath("file://" + path.Join(dir, "assets") + "/") } log.Infof("gcd.assetPath = '%v'\n", gcd.AssetPath()) -- 2.25.1