Merge pull request #169 from safing/feature/update-notif-wording

Reword the update notification and endpoint rule reason
This commit is contained in:
Patrick Pacher 2020-10-08 14:09:25 +02:00 committed by GitHub
commit 5d901f5f88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View file

@ -21,9 +21,9 @@ type reason struct {
}
func (r *reason) String() string {
prefix := "endpoint in blocklist: "
prefix := "denied by rule: "
if r.Permitted {
prefix = "endpoint in allowlist: "
prefix = "permitted by rule: "
}
return prefix + r.description + " " + r.Value

View file

@ -101,14 +101,14 @@ func upgradeCoreNotify() error {
if info.GetInfo().Version != pmCoreUpdate.Version() {
n := notifications.NotifyInfo(
"updates:core-update-available",
fmt.Sprintf("There is an update available for the Portmaster core (v%s), please restart the Portmaster to apply the update.", pmCoreUpdate.Version()),
notifications.Action{
ID: "later",
Text: "Later",
},
fmt.Sprintf(":tada: Update to **Portmaster v%s** is available! Please restart the Portmaster to apply the update.", pmCoreUpdate.Version()),
notifications.Action{
ID: "restart",
Text: "Restart Portmaster Now",
Text: "Restart",
},
notifications.Action{
ID: "later",
Text: "Not now",
},
)
n.SetActionFunction(upgradeCoreNotifyActionHandler)