CVS: phpweather-1.x locale_cz.inc,1.1.1.1,1.2 locale_da.inc,1.1.1.1,1...
Brought to you by:
iridium
Menu
▾
▴
CVS: phpweather-1.x locale_cz.inc,1.1.1.1,1.2 locale_da.inc,1.1.1.1,1...
|
From: Martin G. <gim...@us...> - 2002-03-24 19:52:37
|
Update of /cvsroot/phpweather/phpweather-1.x
In directory usw-pr-cvs1:/tmp/cvs-serv3761
Modified Files:
locale_cz.inc locale_da.inc locale_de.inc locale_en.inc
locale_es.inc locale_fr.inc locale_hu.inc locale_it.inc
locale_mt.inc locale_nl.inc locale_no.inc locale_po_br.inc
phpweather.inc
Log Message:
Thanks to David Kjellquist <da...@kj...> PHP Weather now has
support for windchill.
Index: locale_cz.inc
===================================================================
RCS file: /cvsroot/phpweather/phpweather-1.x/locale_cz.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- locale_cz.inc 7 Mar 2002 09:49:11 -0000 1.1.1.1
+++ locale_cz.inc 24 Mar 2002 19:52:32 -0000 1.2
@@ -42,6 +42,7 @@
'wind_str_calm' => '<b>bezvìtøí</b>',
'wind_vrb_long' => 'variable directions',
'wind_vrb_short' => 'VAR',
+ 'windchill' => ' the windchill was <b>%s</b> °C (<b>%s</b> °F) ',
'precip_last_hour' => 'za poslední hodinu. ',
'precip_last_6_hours' => 'za posledních 3 a¾ 6 hodin. ',
'precip_last_24_hours' => 'za posledních 24 hodin. ',
@@ -57,7 +58,7 @@
'Heavy' => 'tì¾ký ',
'nearby' => 'blízký ',
'current_weather' => 'Aktuální poèasí je <b>%s</b>. ',
- 'pretty_print_metar' => '<blockquote><p>Pøed <b>%s</b> minutami, v <b>%s</b> UTC, byl vítr %s v %s. Teplota byla <b>%s</b> °C (<b>%s</b> F), tlak byl <b>%s</b> hPa (<b>%s</b> palcù Hg). Relativní vlhkost byla <b>%s%%</b>. %s %s %s %s %s</p></blockquote>'
+ 'pretty_print_metar' => '<blockquote><p>Pøed <b>%s</b> minutami, v <b>%s</b> UTC, byl vítr %s v %s. Teplota byla <b>%s</b> °C (<b>%s</b> °F), %s tlak byl <b>%s</b> hPa (<b>%s</b> palcù Hg). Relativní vlhkost byla <b>%s%%</b>. %s %s %s %s %s</p></blockquote>'
);
$wind_dir_text_short_array = array(
Index: locale_da.inc
===================================================================
RCS file: /cvsroot/phpweather/phpweather-1.x/locale_da.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- locale_da.inc 7 Mar 2002 09:49:11 -0000 1.1.1.1
+++ locale_da.inc 24 Mar 2002 19:52:32 -0000 1.2
@@ -37,14 +37,15 @@
'wind_str_calm' => '<b>stille</b>',
'wind_vrb_long' => 'forskellige retninger',
'wind_vrb_short' => 'VAR',
+ 'windchill' => ' afkølingsfaktoren var <b>%s</b> °C (<b>%s</b> °F)',
'precip_last_hour' => 'i den sidste time. ',
'precip_last_6_hours' => 'i de sidste 3 til 6 timer. ',
'precip_last_24_hours' => 'i de sidste 24 timer. ',
'precip_snow' => 'Der er <b>%s</b> mm (<b>%s</b> tommer) sne på jorden. ',
- 'temp_min_max_6_hours' => 'Maksimum og minimums temperaturene i de sidste 6 timer var <b>%s</b> og <b>%s</b> grader Celsius (<b>%s</b> og <b>%s</b> grader Fahrenheit).',
- 'temp_max_6_hours' => 'Maksimums temperaturen i de sidste 6 timer var <b>%s</b> grader Celsius (<b>%s</b> grader Fahrenheit). ',
- 'temp_min_6_hours' => 'Minimums temperaturen i de sidste 6 var <b>%s</b> grader Celsius (<b>%s</b> grader Fahrenheit). ',
- 'temp_min_max_24_hours' => 'Maksimums og minimumstemperaturene i de sidste 24 timer var <b>%s</b> og <b>%s</b> grader Celsius (<b>%s</b> og <b>%s</b> grader Fahrenheit). ',
+ 'temp_min_max_6_hours' => 'Maksimum og minimums temperaturene i de sidste 6 timer var <b>%s</b> og <b>%s</b> °C (<b>%s</b> og <b>%s</b> °F).',
+ 'temp_max_6_hours' => 'Maksimums temperaturen i de sidste 6 timer var <b>%s</b> °C (<b>%s</b> °F). ',
+ 'temp_min_6_hours' => 'Minimums temperaturen i de sidste 6 var <b>%s</b> °C (<b>%s</b> °F). ',
+ 'temp_min_max_24_hours' => 'Maksimums og minimumstemperaturene i de sidste 24 timer var <b>%s</b> og <b>%s</b> °C (<b>%s</b> og <b>%s</b> °F). ',
'runway_vis' => 'Sigtbarheden for bane <b>%s</b> er <b>%s</b> meter (<b>%s</b> fod).',
'runway_vis_min_max' => 'Sigtbarheden for bane <b>%s</b> varierer imellem <b>%s</b> meter (<b>%s</b> fod) og <b>%s</b> meter (<b>%s</b> fod).',
'light' => 'Let ',
@@ -52,7 +53,7 @@
'Heavy' => 'Kraftig ',
'nearby' => 'Tætliggende ',
'current_weather' => 'De aktuelle vejrforhold er: <b>%s</b>. ',
- 'pretty_print_metar' => '<blockquote><p>For <b>%s</b> minutter siden, kl. <b>%s</b> UTC, blæste vinden %s i %s. Temperaturen var <b>%s</b> grader Celsius (<b>%s</b> grader Fahrenheit), og lufttrykket var <b>%s</b> hPa (<b>%s</b> inHg). Den relative luftfugtighed var <b>%s%%</b>. %s %s %s %s %s</p></blockquote>'
+ 'pretty_print_metar' => '<blockquote><p>For <b>%s</b> minutter siden, kl. <b>%s</b> UTC, blæste vinden %s i %s. Temperaturen var <b>%s</b> °C (<b>%s</b> °F), %s og lufttrykket var <b>%s</b> hPa (<b>%s</b> inHg). Den relative luftfugtighed var <b>%s%%</b>. %s %s %s %s %s</p></blockquote>'
);
$wind_dir_text_short_array = array(
Index: locale_de.inc
===================================================================
RCS file: /cvsroot/phpweather/phpweather-1.x/locale_de.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- locale_de.inc 7 Mar 2002 09:49:11 -0000 1.1.1.1
+++ locale_de.inc 24 Mar 2002 19:52:32 -0000 1.2
@@ -38,6 +38,7 @@
'wind_str_calm' => '<b>Ruhe</b>',
'wind_vrb_long' => 'verschiedene Richtungen',
'wind_vrb_short' => 'VAR',
+ 'windchill' => ' the windchill was <b>%s</b> °C (<b>%s</b> °F) ',
'precip_last_hour' => 'in der letzten Stunde. ',
'precip_last_6_hours' => 'in den letzten 3 bis 6 Stunden. ',
'precip_last_24_hours' => 'in den letzten 24 Stunden. ',
@@ -53,7 +54,7 @@
'Heavy' => 'schwerer ',
'nearby' => 'nahezu ',
'current_weather' => 'Das aktuelle Wetter ist <b>%s</b>. ',
- 'pretty_print_metar' => '<blockquote><p>Vor <b>%s</b> minuten, um <b>%s</b> UTC, der Wind %s in %s. Die Temperatur war <b>%s</b> Grad Celsius (<b>%s</b> degrees Fahrenheit), und der Luftdruck war <b>%s</b> hPa (<b>%s</b> inHg). Die relative Luftfeuchtigkeit war <b>%s%%</b>. %s %s %s %s %s %s</p></blockquote>'
+ 'pretty_print_metar' => '<blockquote><p>Vor <b>%s</b> minuten, um <b>%s</b> UTC, der Wind %s in %s. Die Temperatur war <b>%s</b> Grad Celsius (<b>%s</b> degrees Fahrenheit), %s und der Luftdruck war <b>%s</b> hPa (<b>%s</b> inHg). Die relative Luftfeuchtigkeit war <b>%s%%</b>. %s %s %s %s %s %s</p></blockquote>'
);
$wind_dir_text_short_array = array(
Index: locale_en.inc
===================================================================
RCS file: /cvsroot/phpweather/phpweather-1.x/locale_en.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- locale_en.inc 7 Mar 2002 09:49:11 -0000 1.1.1.1
+++ locale_en.inc 24 Mar 2002 19:52:32 -0000 1.2
@@ -37,14 +37,15 @@
'wind_str_calm' => '<b>calm</b>',
'wind_vrb_long' => 'variable directions',
'wind_vrb_short' => 'VAR',
+ 'windchill' => ' the windchill was <b>%s</b> °C (<b>%s</b> °F) ',
'precip_last_hour' => 'in the last hour. ',
'precip_last_6_hours' => 'in the last 3 to 6 hours. ',
'precip_last_24_hours' => 'in the last 24 hours. ',
'precip_snow' => 'There is <b>%s</b> mm (<b>%s</b> inches) of snow on the ground. ',
- 'temp_min_max_6_hours' => 'The maximum and minimum temperatures over the last 6 hours were <b>%s</b> and <b>%s</b> degrees Celsius (<b>%s</b> and <b>%s</b> degrees Fahrenheit).',
- 'temp_max_6_hours' => 'The maximum temperature over the last 6 hours was <b>%s</b> degrees Celsius (<b>%s</b> degrees Fahrenheit). ',
- 'temp_min_6_hours' => 'The minimum temperature over the last 6 hours was <b>%s</b> degrees Celsius (<b>%s</b> degrees Fahrenheit). ',
- 'temp_min_max_24_hours' => 'The maximum and minimum temperatures over the last 24 hours were <b>%s</b> and <b>%s</b> degrees Celsius (<b>%s</b> and <b>%s</b> degrees Fahrenheit). ',
+ 'temp_min_max_6_hours' => 'The maximum and minimum temperatures over the last 6 hours were <b>%s</b> and <b>%s</b> °C (<b>%s</b> and <b>%s</b> °F).',
+ 'temp_max_6_hours' => 'The maximum temperature over the last 6 hours was <b>%s</b> °C (<b>%s</b> °F). ',
+ 'temp_min_6_hours' => 'The minimum temperature over the last 6 hours was <b>%s</b> °C (<b>%s</b> °F). ',
+ 'temp_min_max_24_hours' => 'The maximum and minimum temperatures over the last 24 hours were <b>%s</b> and <b>%s</b> °C (<b>%s</b> and <b>%s</b> °F). ',
'runway_vis' => 'The visibility for runway <b>%s</b> is <b>%s</b> meters (<b>%s</b> feet).',
'runway_vis_min_max' => 'The visibility for runway <b>%s</b> varies between <b>%s</b> meters (<b>%s</b> feet) and <b>%s</b> meters (<b>%s</b> feet).',
'light' => 'Light ',
@@ -52,7 +53,7 @@
'Heavy' => 'Heavy ',
'nearby' => 'Nearby ',
'current_weather' => 'Current weather is <b>%s</b>. ',
- 'pretty_print_metar' => '<blockquote><p><b>%s</b> minutes ago, at <b>%s</b> UTC, the wind was %s in %s. The temperature was <b>%s</b> degrees Celsius (<b>%s</b> degrees Fahrenheit), and the pressure was <b>%s</b> hPa (<b>%s</b> inHg). The relative humidity was <b>%s%%</b>. %s %s %s %s %s %s</p></blockquote>'
+ 'pretty_print_metar' => '<blockquote><p><b>%s</b> minutes ago, at <b>%s</b> UTC, the wind was %s in %s. The temperature was <b>%s</b> °C (<b>%s</b> °F), %s and the pressure was <b>%s</b> hPa (<b>%s</b> inHg). The relative humidity was <b>%s%%</b>. %s %s %s %s %s %s</p></blockquote>'
);
$wind_dir_text_short_array = array(
Index: locale_es.inc
===================================================================
RCS file: /cvsroot/phpweather/phpweather-1.x/locale_es.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- locale_es.inc 7 Mar 2002 09:49:11 -0000 1.1.1.1
+++ locale_es.inc 24 Mar 2002 19:52:32 -0000 1.2
@@ -37,6 +37,7 @@
'wind_str_calm' => '<b>calmo</b>',
'wind_vrb_long' => 'variable directions',
'wind_vrb_short' => 'VAR',
+ 'windchill' => ' the windchill was <b>%s</b> °C (<b>%s</b> °F) ',
'precip_last_hour' => 'en la última hora. ',
'precip_last_6_hours' => 'durante las últimas 3 a 6 horas. ',
'precip_last_24_hours' => 'durante las últimas 24 horas. ',
@@ -52,7 +53,7 @@
'Heavy' => 'Severo ',
'nearby' => 'Cercano ',
'current_weather' => 'El clima actual es <b>%s</b>. ',
- 'pretty_print_metar' => '<blockquote><p><b>%s</b> minutos atrás, de las <b>%s</b> UTC, el viento %s en %s. La temperatura era de <b>%s</b> grados Celsius (<b>%s</b> grados Fahrenheit), y la presión de <b>%s</b> hectopascales (hPa) (<b>%s</b> milibares (inHg)). La humedad relativa era de <b>%s%%</b>. %s %s %s %s %s</p></blockquote>'
+ 'pretty_print_metar' => '<blockquote><p><b>%s</b> minutos atrás, de las <b>%s</b> UTC, el viento %s en %s. La temperatura era de <b>%s</b> grados Celsius (<b>%s</b> grados Fahrenheit), %s y la presión de <b>%s</b> hectopascales (hPa) (<b>%s</b> milibares (inHg)). La humedad relativa era de <b>%s%%</b>. %s %s %s %s %s</p></blockquote>'
);
$wind_dir_text_short_array = array(
Index: locale_fr.inc
===================================================================
RCS file: /cvsroot/phpweather/phpweather-1.x/locale_fr.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- locale_fr.inc 7 Mar 2002 09:49:11 -0000 1.1.1.1
+++ locale_fr.inc 24 Mar 2002 19:52:32 -0000 1.2
@@ -37,6 +37,7 @@
'wind_str_calm' => '<b>calme</b>',
'wind_vrb_long' => 'variable directions',
'wind_vrb_short' => 'VAR',
+ 'windchill' => ' the windchill was <b>%s</b> °C (<b>%s</b> °F) ',
'precip_last_hour' => 'au cours de la dernière heure. ',
'precip_last_6_hours' => 'au cours des 3 à 6 dernières heures. ',
'precip_last_24_hours' => 'au cours des dernières 24 heures. ',
@@ -52,7 +53,7 @@
'Heavy' => 'Fort ',
'nearby' => 'Proche de ',
'current_weather' => 'La météo actuelle est <b>%s</b>. ',
- 'pretty_print_metar' => '<blockquote><p>Il y a <b>%s</b> minutes, à <b>%s</b> UTC, le vent %s à %s. La température était de <b>%s</b> degrés Celsius (<b>%s</b> degrés Fahrenheit), et la pression atmosphérique était de <b>%s</b> hPa (<b>%s</b> inHg). Il y avait une humidité relative de <b>%s%%</b>. %s %s %s %s %s</p></blockquote>'
+ 'pretty_print_metar' => '<blockquote><p>Il y a <b>%s</b> minutes, à <b>%s</b> UTC, le vent %s à %s. La température était de <b>%s</b> degrés Celsius (<b>%s</b> degrés Fahrenheit), %s et la pression atmosphérique était de <b>%s</b> hPa (<b>%s</b> inHg). Il y avait une humidité relative de <b>%s%%</b>. %s %s %s %s %s</p></blockquote>'
);
$wind_dir_text_short_array = array(
Index: locale_hu.inc
===================================================================
RCS file: /cvsroot/phpweather/phpweather-1.x/locale_hu.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- locale_hu.inc 7 Mar 2002 09:49:11 -0000 1.1.1.1
+++ locale_hu.inc 24 Mar 2002 19:52:32 -0000 1.2
@@ -44,6 +44,7 @@
'wind_str_calm' => '<b>nem fúj</b>',
'wind_vrb_long' => 'változó',
'wind_vrb_short' => 'VAR',
+ 'windchill' => ' the windchill was <b>%s</b> °C (<b>%s</b> °F) ',
'precip_last_hour' => 'az utolsó órában. ',
'precip_last_6_hours' => 'az utóbbi 3-6 órában. ',
'precip_last_24_hours' => 'az utóbbi 24 órában. ',
@@ -61,7 +62,7 @@
'current_weather' => 'A pillanatnyi idõjárási jellemzõ: <b>%s</b>. ',
'pretty_print_metar' => '<blockquote><p><b>%s</b> perccel ezelõtt,
<b>%s</b> UTC-kor, a szél %s (%s). A hõmérséklet <b>%s</b> Celsius fok
-(<b>%s</b> Fahrenheit fok), a légnyomás <b>%s</b> hPa (<b>%s</b>
+(<b>%s</b> Fahrenheit fok), %s a légnyomás <b>%s</b> hPa (<b>%s</b>
Hgmm). Relatív páratartalom <b>%s%%</b>. %s %s %s %s %s
%s</p></blockquote>'
);
Index: locale_it.inc
===================================================================
RCS file: /cvsroot/phpweather/phpweather-1.x/locale_it.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- locale_it.inc 7 Mar 2002 09:49:11 -0000 1.1.1.1
+++ locale_it.inc 24 Mar 2002 19:52:32 -0000 1.2
@@ -37,6 +37,7 @@
'wind_str_calm' => '<b>calma</b>',
'wind_vrb_long' => 'direzione variabile',
'wind_vrb_short' => 'VAR',
+ 'windchill' => ' the windchill was <b>%s</b> °C (<b>%s</b> °F) ',
'precip_last_hour' => 'nella ultima ora. ',
'precip_last_6_hours' => 'nelle ultime 3 fino 6 ore. ',
'precip_last_24_hours' => 'nelle ultime 24 ore. ',
@@ -52,7 +53,7 @@
'Heavy' => 'Intenso ',
'nearby' => 'Vicino ',
'current_weather' => 'Le condizioni attuali sono <b>%s</b>. ',
- 'pretty_print_metar' => '<blockquote><p><b>%s</b> minuti fa, alle <b>%s</b> UTC, il vento era %s in %s. La temperatura era <b>%s</b> gradi Celsius (<b>%s</b> gradi Fahrenheit), e la pressione era <b>%s</b> hPa (<b>%s</b> inHg). Umiditá relativa era <b>%s%%</b>. %s %s %s %s %s %s</p></blockquote>'
+ 'pretty_print_metar' => '<blockquote><p><b>%s</b> minuti fa, alle <b>%s</b> UTC, il vento era %s in %s. La temperatura era <b>%s</b> gradi Celsius (<b>%s</b> gradi Fahrenheit), %s e la pressione era <b>%s</b> hPa (<b>%s</b> inHg). Umiditá relativa era <b>%s%%</b>. %s %s %s %s %s %s</p></blockquote>'
);
$wind_dir_text_short_array = array(
Index: locale_mt.inc
===================================================================
RCS file: /cvsroot/phpweather/phpweather-1.x/locale_mt.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- locale_mt.inc 7 Mar 2002 09:49:11 -0000 1.1.1.1
+++ locale_mt.inc 24 Mar 2002 19:52:32 -0000 1.2
@@ -40,6 +40,7 @@
'wind_str_calm' => '<b>kalm</b>',
'wind_vrb_long' => 'direzzjoni varjabbli',
'wind_vrb_short' => 'VAR',
+ 'windchill' => ' the windchill was <b>%s</b> °C (<b>%s</b> °F) ',
'precip_last_hour' => 'fl-ahhar siegha. ',
'precip_last_6_hours' => 'fl-ahhar 3 sa 6 sieghat. ',
'precip_last_24_hours' => 'fl-ahhar 24 siegha. ',
@@ -55,7 +56,7 @@
'Heavy' => 'Qawwi ',
'nearby' => 'Qrib ',
'current_weather' => 'It-temp bhalissa huwa <b>%s</b>. ',
- 'pretty_print_metar' => '<blockquote><p><b>%s</b> minuti ilu, ghall-habta ta\' <b>%s</b> UTC, ir-rih kien %s gewwa %s. It-temperatura kienet <b>%s</b> grad Celsius (<b>%s</b> grad Fahrenheit), u l-pressjoni kienet <b>%s</b> hPa (<b>%s</b> inHg). L-umdita\' kienet <b>%s%%</b>. %s %s %s %s %s %s</p></blockquote>'
+ 'pretty_print_metar' => '<blockquote><p><b>%s</b> minuti ilu, ghall-habta ta\' <b>%s</b> UTC, ir-rih kien %s gewwa %s. It-temperatura kienet <b>%s</b> grad Celsius (<b>%s</b> grad Fahrenheit), %s u l-pressjoni kienet <b>%s</b> hPa (<b>%s</b> inHg). L-umdita\' kienet <b>%s%%</b>. %s %s %s %s %s %s</p></blockquote>'
);
$wind_dir_text_short_array = array(
Index: locale_nl.inc
===================================================================
RCS file: /cvsroot/phpweather/phpweather-1.x/locale_nl.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- locale_nl.inc 7 Mar 2002 09:49:11 -0000 1.1.1.1
+++ locale_nl.inc 24 Mar 2002 19:52:32 -0000 1.2
@@ -37,6 +37,7 @@
'wind_str_calm' => '<b>kalm</b>',
'wind_vrb_long' => 'variable richtingen',
'wind_vrb_short' => 'VAR',
+ 'windchill' => ' the windchill was <b>%s</b> °C (<b>%s</b> °F) ',
'precip_last_hour' => 'in het laatste uur. ',
'precip_last_6_hours' => 'in de laatste 3 tot 6 uur. ',
'precip_last_24_hours' => 'in de laatste 24 uur. ',
@@ -52,7 +53,7 @@
'Heavy' => 'Zwaar ',
'nearby' => 'Dichtbij ',
'current_weather' => 'Het huidige weer is <b>%s</b>. ',
- 'pretty_print_metar' => '<blockquote><p><b>%s</b> minuten geleden, om <b>%s</b> UTC, de wind blies %s nabij %s. De temperatuur was <b>%s</b> graden Celsius (<b>%s</b> graden Fahrenheit), en de barometerdruk was <b>%s</b> hPa (<b>%s</b> inHg). De relatieve vochtigheid was <b>%s%%</b>. %s %s %s %s %s</p></blockquote>'
+ 'pretty_print_metar' => '<blockquote><p><b>%s</b> minuten geleden, om <b>%s</b> UTC, de wind blies %s nabij %s. De temperatuur was <b>%s</b> graden Celsius (<b>%s</b> graden Fahrenheit), %s en de barometerdruk was <b>%s</b> hPa (<b>%s</b> inHg). De relatieve vochtigheid was <b>%s%%</b>. %s %s %s %s %s</p></blockquote>'
);
$wind_dir_text_short_array = array(
Index: locale_no.inc
===================================================================
RCS file: /cvsroot/phpweather/phpweather-1.x/locale_no.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- locale_no.inc 7 Mar 2002 09:49:11 -0000 1.1.1.1
+++ locale_no.inc 24 Mar 2002 19:52:32 -0000 1.2
@@ -37,6 +37,7 @@
'wind_str_calm' => '<b>stille</b>',
'wind_vrb_long' => 'variable retninger',
'wind_vrb_short' => 'VAR',
+ 'windchill' => ' the windchill was <b>%s</b> °C (<b>%s</b> °F) ',
'precip_last_hour' => 'i den siste timen. ',
'precip_last_6_hours' => 'i de siste 3 til 6 timer. ',
'precip_last_24_hours' => 'i de siste 24 timer. ',
@@ -52,7 +53,7 @@
'Heavy' => 'Kraftig ',
'nearby' => 'Nær ',
'current_weather' => 'Nåværende vær er <b>%s</b>. ',
- 'pretty_print_metar' => '<blockquote><p><b>%s</b> minutter siden, klokka <b>%s</b> UTC, blåste vinden %s i %s. Temperaturen var <b>%s</b> grader Celsius (<b>%s</b> grader Fahrenheit), og lufttrykket var <b>%s</b> hPa (<b>%s</b> inHg). Den relative luftfuktigheten var <b>%s%%</b>. %s %s %s %s %s</p></blockquote>'
+ 'pretty_print_metar' => '<blockquote><p><b>%s</b> minutter siden, klokka <b>%s</b> UTC, blåste vinden %s i %s. Temperaturen var <b>%s</b> grader Celsius (<b>%s</b> grader Fahrenheit), %s og lufttrykket var <b>%s</b> hPa (<b>%s</b> inHg). Den relative luftfuktigheten var <b>%s%%</b>. %s %s %s %s %s</p></blockquote>'
);
Index: locale_po_br.inc
===================================================================
RCS file: /cvsroot/phpweather/phpweather-1.x/locale_po_br.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- locale_po_br.inc 7 Mar 2002 09:49:11 -0000 1.1.1.1
+++ locale_po_br.inc 24 Mar 2002 19:52:32 -0000 1.2
@@ -47,6 +47,7 @@
'wind_str_calm' => '<b>calmo</b>',
'wind_vrb_long' => 'direção variável',
'wind_vrb_short' => 'VAR',
+ 'windchill' => ' the windchill was <b>%s</b> °C (<b>%s</b> °F) ',
'precip_last_hour' => 'na última hora. ',
'precip_last_6_hours' => 'nas últimas 3 a 6 horas. ',
'precip_last_24_hours' => 'na últimas horas 24 horas. ',
@@ -73,7 +74,7 @@
'current_weather' => 'Tempo atual é <b>%s</b>. ',
'pretty_print_metar' => '<blockquote><p><b>%s</b> minutos atrás, às
<b>%s</b> UTC, o vento estava %s em %s. A temperatura era de <b>%s</b> graus
-Celsius (<b>%s</b> graus Fahrenheit), e a pressão do ar estava em <b>%s</b>
+Celsius (<b>%s</b> graus Fahrenheit), %s e a pressão do ar estava em <b>%s</b>
hPa (<b>%s</b> inHg). A umidade relativa era de <b>%s%%</b>. %s %s %s %s %s
%s</p></blockquote>'
);
Index: phpweather.inc
===================================================================
RCS file: /cvsroot/phpweather/phpweather-1.x/phpweather.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- phpweather.inc 7 Mar 2002 09:49:11 -0000 1.1.1.1
+++ phpweather.inc 24 Mar 2002 19:52:32 -0000 1.2
@@ -294,6 +294,15 @@
$wind_str = $strings['wind_str_calm'];
}
+ /* Windchill */
+ if (isset($data['windchill_c'])) {
+ $windchill_str = sprintf($strings['windchill'],
+ $data['windchill_c'],
+ $data['windchill_f']);
+ } else {
+ $windchill_str = '';
+ }
+
/* Precipitation. */
$prec_str = '';
if (isset($data['precip_in'])) {
@@ -371,6 +380,7 @@
$location,
$data['temp_c'],
$data['temp_f'],
+ $windchill_str,
$data['altimeter_hpa'],
$data['altimeter_inhg'],
$data['rel_humidity'],
@@ -964,6 +974,25 @@
((237.3 + $decoded_metar['dew_c']) * (237.3 + $decoded_metar['temp_c']))
+ 2)), 1);
+ /*
+ * Windchill.
+ *
+ * This is only appropriate if temp < 40f and windspeed > 3 mph
+ */
+ if ($decoded_metar['temp_f'] <= '40' &&
+ $decoded_metar['wind_miles_per_hour'] > '3'){
+ $decoded_metar['windchill_f'] =
+ number_format(35.74 + 0.6215 * $decoded_metar['temp_f'] -
+ 35.75 * pow($decoded_metar['wind_miles_per_hour'], 0.16) +
+ 0.4275 * $decoded_metar['temp_f'] *
+ pow($decoded_metar['wind_miles_per_hour'],0.16));
+ $decoded_metar['windchill_c'] =
+ number_format(13.112 + 0.6215 * $decoded_metar['temp_c'] -
+ 13.37 * pow(($decoded_metar['wind_miles_per_hour']/1.609), 0.16) +
+ 0.3965 * $decoded_metar['temp_c'] *
+ pow(($decoded_metar['wind_miles_per_hour']/1.609),0.16));
+ }
+
return $decoded_metar;
}
|
