taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

enable user to disable emoji for weather module.

Browse Source
This commit is contained in:
Jon Hadfield 2020-06-22 18:47:28 +01:00
parent 715ec4f952
commit 0b63a56e40
No known key found for this signature in database
GPG Key ID: 2E2498DC47D1874C
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/weatherservices/weather/display.go
View File

@ -81,5 +81,9 @@ func (widget *Widget) temperatures(cityData *owm.CurrentWeatherData) string {
} }
func (widget *Widget) buildTitle(cityData *owm.CurrentWeatherData) string { func (widget *Widget) buildTitle(cityData *owm.CurrentWeatherData) string {
if widget.settings.useEmoji {
return fmt.Sprintf("%s %s", widget.emojiFor(cityData), cityData.Name) return fmt.Sprintf("%s %s", widget.emojiFor(cityData), cityData.Name)
} }
return fmt.Sprintf("%s", cityData.Name)
}

2
modules/weatherservices/weather/settings.go
View File

@ -24,6 +24,7 @@ type Settings struct {
cityIDs []interface{} cityIDs []interface{}
language string language string
tempUnit string tempUnit string
useEmoji bool
} }
func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
@ -34,6 +35,7 @@ func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *co
cityIDs: ymlConfig.UList("cityids"), cityIDs: ymlConfig.UList("cityids"),
language: ymlConfig.UString("language", "EN"), language: ymlConfig.UString("language", "EN"),
tempUnit: ymlConfig.UString("tempUnit", "C"), tempUnit: ymlConfig.UString("tempUnit", "C"),
useEmoji: ymlConfig.UBool("useEmoji", true),
} }
settings.colors.current = ymlConfig.UString("colors.current", "green") settings.colors.current = ymlConfig.UString("colors.current", "green")