Ortograph! Renamed annoucement to announcement

This commit is contained in:
Quentin McGaw (desktop)
2020-03-04 23:47:21 +00:00
parent fa0272d5ad
commit 939b58c457
5 changed files with 13 additions and 14 deletions

View File

@@ -1,10 +1,10 @@
package constants
const (
// Annoucement is a message annoucement
Annoucement = "Support for Mullvad"
// AnnoucementExpiration is the expiration date of the annoucement in format yyyy-mm-dd
AnnoucementExpiration = "2020-03-15"
// Announcement is a message announcement
Announcement = "Support for Mullvad (a bit unstable)"
// AnnouncementExpiration is the expiration date of the announcement in format yyyy-mm-dd
AnnouncementExpiration = "2020-03-15"
)
const (

View File

@@ -7,11 +7,11 @@ import (
"github.com/stretchr/testify/assert"
)
func Test_AnnoucementExpiration(t *testing.T) {
func Test_AnnouncementExpiration(t *testing.T) {
t.Parallel()
if len(AnnoucementExpiration) == 0 {
if len(AnnouncementExpiration) == 0 {
return
}
_, err := time.Parse("2006-01-02", AnnoucementExpiration)
_, err := time.Parse("2006-01-02", AnnouncementExpiration)
assert.NoError(t, err)
}

View File

@@ -44,7 +44,6 @@ func (c *configurator) BuildConf(connections []models.OpenVPNConnection, verbosi
// "rcvbuf 524288"
"cipher AES-256-CBC",
"tls-cipher TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-256-CBC-SHA",
"tun-ipv6",
// Added constant values
"mute-replay-warnings",

View File

@@ -19,7 +19,7 @@ func Splash(paramsReader params.ParamsReader) string {
lines = append(lines, "")
lines = append(lines, fmt.Sprintf("Running version %s built on %s (commit %s)", version, buildDate, vcsRef))
lines = append(lines, "")
lines = append(lines, annoucement()...)
lines = append(lines, announcement()...)
lines = append(lines, "")
lines = append(lines, links()...)
return strings.Join(lines, "\n")
@@ -38,15 +38,15 @@ func title() []string {
}
}
func annoucement() []string {
if len(constants.Annoucement) == 0 {
func announcement() []string {
if len(constants.Announcement) == 0 {
return nil
}
expirationDate, _ := time.Parse("2006-01-02", constants.AnnoucementExpiration) // error covered by a unit test
expirationDate, _ := time.Parse("2006-01-02", constants.AnnouncementExpiration) // error covered by a unit test
if time.Now().After(expirationDate) {
return nil
}
return []string{emoji.Sprint(":mega: ") + constants.Annoucement}
return []string{emoji.Sprint(":mega: ") + constants.Announcement}
}
func links() []string {