mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OPENWEATHER: language

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@6974 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tpoitzsch
2014-11-14 23:10:41 +00:00
parent ef2871e257
commit 20fe8a5fef
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/59_OPENWEATHER.pm
View File

@@ -55,6 +55,7 @@ our $time = "";
, message => "errorMsg" , message => "errorMsg"
, name => "city" , name => "city"
, post_code => "postcode" , post_code => "postcode"
, url => "url"
); );
sub sub
@@ -191,7 +192,7 @@ OPENWEATHER_Define($$)
my ($hash, $def) = @_; my ($hash, $def) = @_;
my @args = split("[ \t][ \t]*", $def); my @args = split("[ \t][ \t]*", $def);
return "Usage: define <name> OPENWEATHER <project> <cityCode> <apiKey>" if(@args <5 || @args >5); return "Usage: define <name> OPENWEATHER <project> <cityCode> <apiKey> [language]" if(@args <5 || @args >6);
my $name = $args[0]; my $name = $args[0];
my $interval = 3600; my $interval = 3600;
@@ -204,6 +205,7 @@ OPENWEATHER_Define($$)
$hash->{PROJECT} = $args[2]; $hash->{PROJECT} = $args[2];
$hash->{CITYCODE} = $args[3]; $hash->{CITYCODE} = $args[3];
$hash->{APIKEY} = $args[4]; $hash->{APIKEY} = $args[4];
$hash->{LANGUAGE} = $args[5] if defined $args[5];
$hash->{CREDIT} = "Powered by wetter.com"; $hash->{CREDIT} = "Powered by wetter.com";
my $checkSum = md5_hex( $args[2] . $args[4] . $args[3] ); my $checkSum = md5_hex( $args[2] . $args[4] . $args[3] );
@@ -212,6 +214,7 @@ OPENWEATHER_Define($$)
$URL .= '/city/' . $args[3]; $URL .= '/city/' . $args[3];
$URL .= '/project/' . $args[2]; $URL .= '/project/' . $args[2];
$URL .= '/cs/' . $checkSum; $URL .= '/cs/' . $checkSum;
$URL .= '/language/'. $args[5] if defined $args[5];
$hash->{URL} = $URL; $hash->{URL} = $URL;
@@ -305,7 +308,7 @@ OPENWEATHER_Get($@)
if ($time > AttrVal($name, "timeOut", 10)) { if ($time > AttrVal($name, "timeOut", 10)) {
$message = sprintf( "Runtime: %.2f s (!!! Increase attribute 'timeOut' !!!)\n_________________\n\n", $time) . $message; $message = sprintf( "Runtime: %.2f s (!!! Increase attribute 'timeOut' !!!)\n_________________\n\n", $time) . $message;
} else { } else {
$message = sprintf( "Runtime: %.2f s\n_________________\n\n", $time) . $message; $message = sprintf( "Response of %s\nRuntime: %.2f s\n_________________\n\n %s", $hash->{URL}, $time, $message);
} }
return $message; return $message;
@@ -500,7 +503,7 @@ OPENWEATHER_Html($)
<b>Define</b> <b>Define</b>
<ul> <ul>
<br> <br>
<code>define &lt;name&gt; OPENWEATHER &lt;project&gt; &lt;cityCode&gt; &lt;apiKey&gt; </code> <code>define &lt;name&gt; OPENWEATHER &lt;project&gt; &lt;cityCode&gt; &lt;apiKey&gt; [language]</code>
<br> <br>
Example: Example:
<br> <br>
@@ -523,7 +526,11 @@ OPENWEATHER_Html($)
<br> <br>
Secret key that is provided when the user creates a 'openweather' project on wetter.com. Secret key that is provided when the user creates a 'openweather' project on wetter.com.
</li><br> </li><br>
The function OPENWEATHER_Html creates a HTML code for a vertically arranged weather forecast (in German). <li><code>[language]</code>
<br>
Optional. Default language of weather description is German. Change with <i>en</i> to English or <i>es</i> to Spanish.
</li><br>
The function OPENWEATHER_Html creates a HTML code for a vertically arranged weather forecast.
<br> <br>
Example: <code>define MyWeatherWeblink weblink htmlCode { OPENWEATHER_Html("MyWeather") }</code> Example: <code>define MyWeatherWeblink weblink htmlCode { OPENWEATHER_Html("MyWeather") }</code>
<br/><br/> <br/><br/>
@@ -598,7 +605,7 @@ OPENWEATHER_Html($)
<b>Define</b> <b>Define</b>
<ul> <ul>
<br> <br>
<code>define &lt;name&gt; OPENWEATHER &lt;Projekt&gt; &lt;Ortscode&gt; &lt;apiSchl&uuml;ssel&gt;</code> <code>define &lt;name&gt; OPENWEATHER &lt;Projekt&gt; &lt;Ortscode&gt; &lt;apiSchl&uuml;ssel&gt; [Sprache]</code>
<br> <br>
Beispiel: Beispiel:
<br> <br>
@@ -620,6 +627,10 @@ OPENWEATHER_Html($)
<br> <br>
Geheimer Schl&uuml;ssel, den man erh&auml;lt, nachdem man ein neues 'Openweather'-Projekt auf der Website registriert hat. Geheimer Schl&uuml;ssel, den man erh&auml;lt, nachdem man ein neues 'Openweather'-Projekt auf der Website registriert hat.
</li><br> </li><br>
<li><code>[Sprache]</code>
<br>
Optional. Standardsprache f&uuml;r die Wettersituation ist Deutsch. Mit <i>en</i> kann man zu Englisch und mit <i>es</i> zu Spanisch wechseln.
</li><br>
&Uuml;ber die Funktion OPENWEATHER_Html wird ein HTML-Code f&uuml;r ein vertikal arrangierte Wettervorhersage erzeugt. &Uuml;ber die Funktion OPENWEATHER_Html wird ein HTML-Code f&uuml;r ein vertikal arrangierte Wettervorhersage erzeugt.
<br> <br>
Beispiel: <code>define MyWeatherWeblink weblink htmlCode { OPENWEATHER_Html("MyWeather") }</code> Beispiel: <code>define MyWeatherWeblink weblink htmlCode { OPENWEATHER_Html("MyWeather") }</code>