From 90f79a18c00d9c06d6ce457a9299580045eba7e4 Mon Sep 17 00:00:00 2001 From: Ferenc- Date: Fri, 20 Jul 2018 13:50:47 +0200 Subject: [PATCH 1/2] Add language option to prettyweather --- _site/content/posts/modules/prettyweather.md | 5 +++++ docs/posts/modules/prettyweather/index.html | 5 +++++ weatherservices/prettyweather/widget.go | 11 +++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/_site/content/posts/modules/prettyweather.md b/_site/content/posts/modules/prettyweather.md index 66a78c1e3..24c0c4cad 100644 --- a/_site/content/posts/modules/prettyweather.md +++ b/_site/content/posts/modules/prettyweather.md @@ -37,6 +37,7 @@ None. refreshInterval: 300 unit: "c" view: 0 + language: "en" ``` ### Attributes @@ -65,3 +66,7 @@ Values: `F` for Fahrenheit, `C` for Celcius. `view`
_Optional_ Wttr.in view configuration.
Values: See `curl wttr.in/:help` for more details. + +`language`
+_Optional_ Wttr.in language configuration.
+Values: See `curl wttr.in/:translation` for more details. diff --git a/docs/posts/modules/prettyweather/index.html b/docs/posts/modules/prettyweather/index.html index fc88defa3..3a1d57f0f 100644 --- a/docs/posts/modules/prettyweather/index.html +++ b/docs/posts/modules/prettyweather/index.html @@ -163,6 +163,7 @@

Configuration

refreshInterval: 300 unit: "c" view: 0 + language: "en"

Attributes

city
@@ -190,6 +191,10 @@

Attributes

Optional Wttr.in view configuration.
Values: See curl wttr.in/:help for more details.

+

language
+Optional Wttr.in language configuration.
+Values: See curl wttr.in/:translation for more details.

+
diff --git a/weatherservices/prettyweather/widget.go b/weatherservices/prettyweather/widget.go index 44f9e3401..9ea54b300 100644 --- a/weatherservices/prettyweather/widget.go +++ b/weatherservices/prettyweather/widget.go @@ -10,10 +10,11 @@ import ( type Widget struct { wtf.TextWidget - result string - unit string - city string - view string + result string + unit string + city string + view string + language string } func NewWidget() *Widget { @@ -37,12 +38,14 @@ func (widget *Widget) prettyWeather() { widget.unit = wtf.Config.UString("wtf.mods.prettyweather.unit", "m") widget.city = wtf.Config.UString("wtf.mods.prettyweather.city", "") widget.view = wtf.Config.UString("wtf.mods.prettyweather.view", "0") + widget.language = wtf.Config.UString("wtf.mods.prettyweather.language", "en") req, err := http.NewRequest("GET", "https://wttr.in/"+widget.city+"?"+widget.view+"?"+widget.unit, nil) if err != nil { widget.result = err.Error() return } + req.Header.Set("Accept-Language", widget.language) req.Header.Set("User-Agent", "curl") response, err := client.Do(req) if err != nil { From 52032f218fbfee4a1e754adf636bdd4c9d3241f9 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Fri, 20 Jul 2018 09:47:27 -0700 Subject: [PATCH 2/2] Update PrettyWeather docs with language option --- docs/index.xml | 2 +- docs/posts/index.xml | 2 +- docs/posts/modules/prettyweather/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/index.xml b/docs/index.xml index 0cee85dc5..3c9c63adf 100644 --- a/docs/index.xml +++ b/docs/index.xml @@ -207,7 +207,7 @@ position Defines where in the grid this module’s widget will be displa Displays weather information as ASCII art from Wttr.in. Source Code wtf/prettyweather/ Required ENV Variables None. Keyboard Commands None. -Configuration prettyweather:enabled:truecity:"tehran"position:top:3left:5height:1width:1refreshInterval:300unit:"c"view:0 Attributes city Optional. It will grab the current location from your IP address if omitted. +Configuration prettyweather:enabled:truecity:"tehran"position:top:3left:5height:1width:1refreshInterval:300unit:"c"view:0language:"en" Attributes city Optional. It will grab the current location from your IP address if omitted. Values: The name of any city supported by Wttr.in. enabled Determines whether or not this module is executed and if its data displayed onscreen. Values: true, false. position Defines where in the grid this module’s widget will be displayed. diff --git a/docs/posts/index.xml b/docs/posts/index.xml index 14be3c50a..4fcdae0b2 100644 --- a/docs/posts/index.xml +++ b/docs/posts/index.xml @@ -207,7 +207,7 @@ position Defines where in the grid this module’s widget will be displa Displays weather information as ASCII art from Wttr.in. Source Code wtf/prettyweather/ Required ENV Variables None. Keyboard Commands None. -Configuration prettyweather:enabled:truecity:"tehran"position:top:3left:5height:1width:1refreshInterval:300unit:"c"view:0 Attributes city Optional. It will grab the current location from your IP address if omitted. +Configuration prettyweather:enabled:truecity:"tehran"position:top:3left:5height:1width:1refreshInterval:300unit:"c"view:0language:"en" Attributes city Optional. It will grab the current location from your IP address if omitted. Values: The name of any city supported by Wttr.in. enabled Determines whether or not this module is executed and if its data displayed onscreen. Values: true, false. position Defines where in the grid this module’s widget will be displayed. diff --git a/docs/posts/modules/prettyweather/index.html b/docs/posts/modules/prettyweather/index.html index 3a1d57f0f..18fade257 100644 --- a/docs/posts/modules/prettyweather/index.html +++ b/docs/posts/modules/prettyweather/index.html @@ -162,7 +162,7 @@

Configuration

width: 1 refreshInterval: 300 unit: "c" - view: 0
+ view: 0 language: "en"

Attributes