vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-03 19:19:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
profile/endpoints/reason.go
View file

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

12
updates/upgrader.go
View file

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