diff --git a/.all-contributorsrc b/.all-contributorsrc index e9f769c0..fdb1675f 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -245,6 +245,13 @@ "name": "bertl4398", "avatar_url": "https://avatars2.githubusercontent.com/u/1226441?v=4", "profile": "https://github.com/bertl4398", + "contributions": [] + }, + { + "login": "Ferenc-", + "name": "Ferenc-", + "avatar_url": "https://avatars2.githubusercontent.com/u/6553695?v=4", + "profile": "https://github.com/Ferenc-", "contributions": [ ] } diff --git a/README.md b/README.md index 3415e3ae..bd5082a0 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Thanks goes to these wonderful people: | [
baustinanki](https://github.com/baustinanki)
| [
lucus lee](https://github.com/lixin9311)
| [
Mike Lloyd](https://github.com/mxplusb)
| [
Sergio Rubio](http://rubiojr.rbel.co)
| [
Farhad Farahi](https://github.com/FarhadF)
| [
Lasantha Kularatne](http://lasantha.blogspot.com/)
| [
Mark Old](https://github.com/dlom)
| | [
flw](http://flw.tools/)
| [
David Barda](https://github.com/davebarda)
| [
Geoff Lee](https://github.com/matrinox)
| [
George Opritescu](http://international.github.io)
| [
Grazfather](https://twitter.com/Grazfather)
| [
Michael Cordell](http://www.mikecordell.com/)
| [
Patrick José Pereira](http://patrick.ibexcps.com)
| | [
sherod taylor](https://github.com/sherodtaylor)
| [
Andrew Scott](http://cogentia.io)
| [
Anand Sudhir Prayaga](https://github.com/anandsudhir)
| [
Lassi Piironen](https://github.com/lsipii)
| [
BlackWebWolf](https://github.com/BlackWebWolf)
| [
andrewzolotukhin](https://github.com/andrewzolotukhin)
| [
Leon Stigter](https://retgits.github.io)
| -| [
Amr Tamimi](https://tamimi.se)
| [
Jagdeep Singh](https://jagdeep.me)
| [
Lineu Felipe](https://github.com/darkSasori)
| [
Konstantin](https://github.com/kvj)
| [
Brendan O'Leary](http://www.brendanoleary.com)
| [
bertl4398](https://github.com/bertl4398)
| +| [
Amr Tamimi](https://tamimi.se)
| [
Jagdeep Singh](https://jagdeep.me)
| [
Lineu Felipe](https://github.com/darkSasori)
| [
Konstantin](https://github.com/kvj)
| [
Brendan O'Leary](http://www.brendanoleary.com)
| [
bertl4398](https://github.com/bertl4398)
| [
Ferenc-](https://github.com/Ferenc-)
| This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome! diff --git a/_site/content/posts/modules/prettyweather.md b/_site/content/posts/modules/prettyweather.md index 66a78c1e..24c0c4ca 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/index.xml b/docs/index.xml index 0cee85dc..3c9c63ad 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 14be3c50..4fcdae0b 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 fc88defa..18fade25 100644 --- a/docs/posts/modules/prettyweather/index.html +++ b/docs/posts/modules/prettyweather/index.html @@ -162,7 +162,8 @@ height="0" width="0" style="display:none;visibility:hidden"> width: 1 refreshInterval: 300 unit: "c" - view: 0 + view: 0 + language: "en"

Attributes

city
@@ -190,6 +191,10 @@ Values: F for Fahrenheit, C for Celcius.

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 44f9e340..9ea54b30 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 {