Changeset 65441 in spip-zone
- Timestamp:
- Sep 1, 2012, 1:52:05 PM (8 years ago)
- Location:
- _plugins_/rainette/trunk
- Files:
-
- 5 edited
-
modeles/conditions_tempsreel.html (modified) (1 diff)
-
rainette_fonctions.php (modified) (1 diff)
-
services/weather.php (modified) (1 diff)
-
services/wunderground.php (modified) (4 diffs)
-
services/wwo.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
_plugins_/rainette/trunk/modeles/conditions_tempsreel.html
r65120 r65441 11 11 <div class="t_ressentie"><:rainette:temperature_ressentie:> :[ (#ENV{temperature_ressentie}|rainette_afficher_unite{temperature, #ENV{service}})]<br/></div> 12 12 <br clear="all"/> 13 <div class="resume">[(#ENV{resume} )]</div>13 <div class="resume">[(#ENV{resume}|rainette_resume_meteo)]</div> 14 14 </div> 15 15 <div class="maj"> -
_plugins_/rainette/trunk/rainette_fonctions.php
r65120 r65441 63 63 } 64 64 65 function rainette_resume_meteo($meteo){ 66 include_spip('inc/rainette_utils'); 67 68 return meteo2resume($meteo); 69 } 70 71 function rainette_afficher_direction($direction){ 65 function rainette_resume_meteo($meteo) { 66 include_spip('inc/rainette_utils'); 67 68 if (is_numeric($meteo)) 69 $resume = meteo2resume($meteo); 70 else 71 $resume = $meteo; 72 return $resume; 73 } 74 75 function rainette_afficher_direction($direction) { 72 76 static $liste_direction = 'N:NNE:NE:ENE:E:ESE:SE:SSE:S:SSW:SW:WSW:W:WNW:NW:NNW:V'; 73 77 -
_plugins_/rainette/trunk/services/weather.php
r65127 r65441 145 145 146 146 $tableau['icone'] = $tableau['code_meteo']; 147 $tableau['resume'] = meteo2resume($tableau['code_meteo']);147 $tableau['resume'] = $tableau['code_meteo']; 148 148 } 149 149 } -
_plugins_/rainette/trunk/services/wunderground.php
r65127 r65441 9 9 function wunderground_service2cache($lieu, $mode) { 10 10 11 include_spip('inc/config'); 12 $condition = lire_config('rainette/wunderground/condition'); 13 $langue = $GLOBALS['spip_lang']; 14 11 15 $dir = sous_repertoire(_DIR_CACHE, 'rainette'); 12 16 $dir = sous_repertoire($dir, 'wunderground'); 13 $fichier_cache = $dir . str_replace(array(',', '+', '.', '/'), '-', $lieu) . "_" . $mode . ".txt"; 17 $fichier_cache = $dir . str_replace(array(',', '+', '.', '/'), '-', $lieu) 18 . "_" . $mode 19 . ($condition == 'wunderground' ? '-' . $langue : '') 20 . ".txt"; 14 21 15 22 return $fichier_cache; … … 66 73 function wunderground_meteo2weather($meteo, $periode=0) { 67 74 static $wunderground2weather = array( 68 'chanceflurries'=> array( '41','46'),69 'chancerain'=> array( '39','45'),70 'chancesleet'=> array( '39','45'),71 'chancesleet'=> array( '41','46'),72 'chancesnow'=> array( '41','46'),73 'chancetstorms'=> array( '38','47'),74 'chancetstorms'=> array( '38','47'),75 'clear'=> array( '32','31'),76 'cloudy'=> array( '26','26'),77 'flurries'=> array( '15','15'),78 'fog'=> array( '20','20'),79 'hazy'=> array( '21','21'),80 'mostlycloudy'=> array( '28','27'),81 'mostlysunny'=> array( '34','33'),82 'partlycloudy'=> array( '30','29'),83 'partlysunny'=> array( '28','27'),84 'sleet'=> array( '5','5'),85 'rain'=> array( '11','11'),86 'sleet'=> array( '5','5'),87 'snow'=> array( '16','16'),88 'sunny'=> array( '32','31'),89 'tstorms'=> array( '4','4'),90 'thunderstorms'=> array( '4','4'),91 'thunderstorm'=> array( '4','4'),92 'unknown'=> array( '4','4'),93 'cloudy'=> array( '26','26'),94 'scatteredclouds'=> array( '30','29'),95 'overcast'=> array( '26','26'));75 'chanceflurries'=> array(41,46), 76 'chancerain'=> array(39,45), 77 'chancesleet'=> array(39,45), 78 'chancesleet'=> array(41,46), 79 'chancesnow'=> array(41,46), 80 'chancetstorms'=> array(38,47), 81 'chancetstorms'=> array(38,47), 82 'clear'=> array(32,31), 83 'cloudy'=> array(26,26), 84 'flurries'=> array(15,15), 85 'fog'=> array(20,20), 86 'hazy'=> array(21,21), 87 'mostlycloudy'=> array(28,27), 88 'mostlysunny'=> array(34,33), 89 'partlycloudy'=> array(30,29), 90 'partlysunny'=> array(28,27), 91 'sleet'=> array(5,5), 92 'rain'=> array(11,11), 93 'sleet'=> array(5,5), 94 'snow'=> array(16,16), 95 'sunny'=> array(32,31), 96 'tstorms'=> array(4,4), 97 'thunderstorms'=> array(4,4), 98 'thunderstorm'=> array(4,4), 99 'unknown'=> array(4,4), 100 'cloudy'=> array(26,26), 101 'scatteredclouds'=> array(30,29), 102 'overcast'=> array(26,26)); 96 103 97 104 $icone = 'na'; … … 230 237 // On affiche les conditions natives fournies par le service 231 238 $tableau['icone']['code'] = $tableau['code_meteo']; 232 233 239 $theme = lire_config('rainette/wunderground/theme', 'a'); 234 $url = _RAINETTE_WUNDERGROUND_URL_BASE_ICONE . '/' . $theme . '/' . $tableau['code_meteo'] . '.gif'; 240 $url = _RAINETTE_WUNDERGROUND_URL_BASE_ICONE . '/' . $theme 241 . '/' . ($tableau['periode'] == 1 ? 'nt_' : '') . $tableau['code_meteo'] . '.gif'; 235 242 $tableau['icone']['url'] = copie_locale($url); 236 243 $tableau['resume'] = ucfirst($tableau['desc_meteo']); … … 238 245 else { 239 246 // On affiche les conditions traduites dans le systeme weather.com 247 // Pour le resume on stocke le code et non la traduction pour eviter de generer 248 // un cache par langue comme pour le mode natif 240 249 $meteo = wunderground_meteo2weather($tableau['code_meteo'], $tableau['periode']); 241 250 $tableau['icone'] = $meteo; 242 $tableau['resume'] = meteo2resume($meteo);251 $tableau['resume'] = $meteo; 243 252 } 244 253 } -
_plugins_/rainette/trunk/services/wwo.php
r65127 r65441 46 46 function wwo_meteo2weather($meteo, $periode=0) { 47 47 static $wwo2weather = array( 48 '395'=> array( '41','46'),49 '392'=> array( '41','46'),50 '389'=> array( '38','47'),51 '386'=> array( '37','47'),52 '377'=> array( '6','6'),53 '374'=> array( '6','6'),54 '371'=> array( '14','14'),55 '368'=> array( '13','13'),56 '365'=> array( '6','6'),57 '362'=> array( '6','6'),58 '359'=> array( '11','11'),59 '356'=> array( '11','11'),60 '353'=> array( '9','9'),61 '350'=> array( '18','18'),62 '338'=> array( '16','16'),63 '335'=> array( '16','16'),64 '332'=> array( '14','14'),65 '329'=> array( '14','14'),66 '326'=> array( '13','13'),67 '323'=> array( '13','13'),68 '320'=> array( '18','18'),69 '317'=> array( '18','18'),70 '314'=> array( '8','8'),71 '311'=> array( '8','8'),72 '308'=> array( '40','40'),73 '305'=> array( '39','45'),74 '302'=> array( '11','11'),75 '299'=> array( '39','45'),76 '296'=> array( '9','9'),77 '293'=> array( '9','9'),78 '284'=> array( '10','10'),79 '281'=> array( '9','9'),80 '266'=> array( '9','9'),81 '263'=> array( '9','9'),82 '260'=> array( '20','20'),83 '248'=> array( '20','20'),84 '230'=> array( '16','16'),85 '227'=> array( '15','15'),86 '200'=> array( '38','47'),87 '185'=> array( '10','10'),88 '182'=> array( '18','18'),89 '179'=> array( '16','16'),90 '176'=> array( '40','49'),91 '143'=> array( '20','20'),92 '122'=> array( '26','26'),93 '119'=> array( '28','27'),94 '116'=> array( '30','29'),95 '113'=> array( '32','31'));48 '395'=> array(41,46), 49 '392'=> array(41,46), 50 '389'=> array(38,47), 51 '386'=> array(37,47), 52 '377'=> array(6,6), 53 '374'=> array(6,6), 54 '371'=> array(14,14), 55 '368'=> array(13,13), 56 '365'=> array(6,6), 57 '362'=> array(6,6), 58 '359'=> array(11,11), 59 '356'=> array(11,11), 60 '353'=> array(9,9), 61 '350'=> array(18,18), 62 '338'=> array(16,16), 63 '335'=> array(16,16), 64 '332'=> array(14,14), 65 '329'=> array(14,14), 66 '326'=> array(13,13), 67 '323'=> array(13,13), 68 '320'=> array(18,18), 69 '317'=> array(18,18), 70 '314'=> array(8,8), 71 '311'=> array(8,8), 72 '308'=> array(40,40), 73 '305'=> array(39,45), 74 '302'=> array(11,11), 75 '299'=> array(39,45), 76 '296'=> array(9,9), 77 '293'=> array(9,9), 78 '284'=> array(10,10), 79 '281'=> array(9,9), 80 '266'=> array(9,9), 81 '263'=> array(9,9), 82 '260'=> array(20,20), 83 '248'=> array(20,20), 84 '230'=> array(16,16), 85 '227'=> array(15,15), 86 '200'=> array(38,47), 87 '185'=> array(10,10), 88 '182'=> array(18,18), 89 '179'=> array(16,16), 90 '176'=> array(40,49), 91 '143'=> array(20,20), 92 '122'=> array(26,26), 93 '119'=> array(28,27), 94 '116'=> array(30,29), 95 '113'=> array(32,31)); 96 96 97 97 $icone = 'na'; … … 235 235 $meteo = wwo_meteo2weather($tableau['code_meteo'], $tableau['periode']); 236 236 $tableau['icone'] = $meteo; 237 $tableau['resume'] = meteo2resume($meteo);237 $tableau['resume'] = $meteo; 238 238 } 239 239 }
Note: See TracChangeset
for help on using the changeset viewer.
