cleanup

diff --git a/curweather/curweather.php b/curweather/curweather.php
index 93e9af9e2ae663a36e17d0ac13383ad1be55933b..58daab0b86354e1c7682f5e0d50b1d3063629e48 100644 (file)
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -37,6 +37,11 @@ function getWeather( $loc, $units='metric', $lang='en', $appid='', $cachetime=0)
        $tunit = '°F';
        $wunit = 'mph';
     }
+    if ( trim((string)$res->weather['value']) == trim((string)$res->clouds['name']) ) {
+       $desc = (string)$res->clouds['name'];
+    } else {
+       $desc = (string)$res->weather['value'].', '.(string)$res->clouds['name'];
+    }
     $r = array(
        'city'=> (string) $res->city['name'][0],
        'country' => (string) $res->city->country[0],
@@ -45,7 +50,7 @@ function getWeather( $loc, $units='metric', $lang='en', $appid='', $cachetime=0)
        'temperature' => (string) $res->temperature['value'][0].$tunit,
        'pressure' => (string) $res->pressure['value'].(string)$res->pressure['unit'],
        'humidity' => (string) $res->humidity['value'].(string)$res->humidity['unit'],
-       'descripion' => (string)$res->weather['value'].', '.(string)$res->clouds['name'],
+       'descripion' => $desc,
        'wind' => (string)$res->wind->speed['name'].' ('.(string)$res->wind->speed['value'].$wunit.')',
        'update' => (string)$res->lastupdate['value']
     );
@@ -73,9 +78,10 @@ function curweather_network_mod_init(&$fk_app,&$b) {
 
     $fk_app->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $fk_app->get_baseurl() . '/addon/curweather/curweather.css' . '" media="all" />' . "\r\n";
 
-    // the OpenWeatherMap-PHP-APIlib does all the work here
-    // the $rpt value is needed for location
+    // $rpt value is needed for location
     // $lang will be taken from the browser session to honour user settings
+    // TODO $lang does not work if the default settings are used
+    //      and not all response strings are translated
     // $units can be set in the settings by the user
     // $appid is configured by the admin in the admin panel
     // those parameters will be used to get: cloud status, temperature, preassure

diff --git a/curweather/templates/settings.tpl b/curweather/templates/settings.tpl
index 1453b210124d681ceb99b17470284d9d62cb5f1b..09f6f506d0c2b14204d81876ad8a473c1fa6c31f 100644 (file)
--- a/curweather/templates/settings.tpl
+++ b/curweather/templates/settings.tpl
@@ -1,6 +1,4 @@
-<span id="settings_curweather_inflated" class="settings-block fakelink"
-style="display: block;" onclick="openClose('settings_curweather_expanded');
-openClose('settings_curweather_inflated');">
+<span id="settings_curweather_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_curweather_expanded'); openClose('settings_curweather_inflated');">
        <h3>{{$header}}</h3>
 </span>
 <div id="settings_curweather_expanded" class="settings-block" style="display: none;">