diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go index 2fdb5b17f..34ee0a43b 100644 --- a/kernel/bazaar/package.go +++ b/kernel/bazaar/package.go @@ -244,6 +244,8 @@ func getPreferredReadme(readme *Readme) string { defaultReadme := strings.TrimSpace(readme.Default) if defaultReadme != "" { ret = defaultReadme + } else if "" != readme.EnUS { + ret = readme.EnUS } else { ret = "README.md" } @@ -323,6 +325,8 @@ func GetPreferredName(pkg *Package) string { defaultName := strings.TrimSpace(pkg.DisplayName.Default) if defaultName != "" { ret = defaultName + } else if "" != pkg.DisplayName.EnUS { + ret = pkg.DisplayName.EnUS } else { ret = pkg.Name } @@ -402,6 +406,8 @@ func getPreferredDesc(desc *Description) string { defaultDesc := strings.TrimSpace(desc.Default) if defaultDesc != "" { ret = defaultDesc + } else if "" != desc.EnUS { + ret = desc.EnUS } } return ret diff --git a/kernel/bazaar/plugin.go b/kernel/bazaar/plugin.go index 7aab7ea89..e3c91a5e1 100644 --- a/kernel/bazaar/plugin.go +++ b/kernel/bazaar/plugin.go @@ -247,9 +247,10 @@ func isIncompatiblePlugin(plugin *Plugin, currentFrontend string) bool { return false } + currentBackend := getCurrentBackend() backendOk := false for _, backend := range plugin.Backends { - if backend == getCurrentBackend() || "all" == backend { + if backend == currentBackend || "all" == backend { backendOk = true break }