Update of /cvsroot/phpweather/phpweather/output
In directory usw-pr-cvs1:/tmp/cvs-serv3062
Modified Files:
pw_text.php pw_text_da.php pw_text_en.php pw_text_hu.php
pw_text_no.php
Log Message:
Added windchill factor
Index: pw_text.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/output/pw_text.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- pw_text.php 20 Mar 2002 19:26:50 -0000 1.3
+++ pw_text.php 24 Mar 2002 17:25:48 -0000 1.4
@@ -766,6 +766,15 @@
$this->properties['mark_end'] . '.';
}
+ function print_pretty_windchill($windchill) {
+ extract($windchill);
+ $output = $this->strings['windchill'] .
+ $this->pref_units($this->properties['mark_begin'] . $windchill_c .
+ $this->properties['mark_end'] . ' °C',
+ $this->properties['mark_begin'] . $windchill_f .
+ $this->properties['mark_end'] . ' °F') . '.';
+ return $output;
+ }
function print_pretty_clouds($clouds) {
if (empty($clouds[0]) ||
@@ -1004,6 +1013,14 @@
if (!in_array('temperature', $this->properties['exclude']) &&
!empty($temperature)) {
$output['temperature'] = $this->print_pretty_temperature($temperature);
+ }
+
+ /*********************************
+ * Windchill *
+ *********************************/
+ if (!in_array('windchill', $this->properties['exclude']) &&
+ !empty($windchill)) {
+ $output['windchill'] = $this->print_pretty_windchill($windchill);
}
/****************************
Index: pw_text_da.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/output/pw_text_da.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- pw_text_da.php 17 Mar 2002 13:39:04 -0000 1.1
+++ pw_text_da.php 24 Mar 2002 17:25:48 -0000 1.2
@@ -96,6 +96,7 @@
$this->strings['hPa'] = ' hPa';
$this->strings['inHg'] = ' inHg';
$this->strings['rel_humidity'] = 'Den relative luftfugtigheden var ';
+ $this->strings['windchill'] = 'Temperaturen, med vindkylde, var ';
$this->strings['cloud_group_beg'] = 'Der var ';
$this->strings['cloud_group_end'] = '.';
$this->strings['cloud_clear'] = 'Himlen var %sskyfri%s.';
Index: pw_text_en.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/output/pw_text_en.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- pw_text_en.php 18 Mar 2002 16:14:31 -0000 1.2
+++ pw_text_en.php 24 Mar 2002 17:25:48 -0000 1.3
@@ -98,6 +98,7 @@
$this->strings['hPa'] = ' hPa';
$this->strings['inHg'] = ' inHg';
$this->strings['rel_humidity'] = 'The relative humidity was ';
+ $this->strings['windchill'] = 'The temperature including windchill was ';
$this->strings['cloud_group_beg'] = 'There were ';
$this->strings['cloud_group_end'] = '.';
$this->strings['cloud_clear'] = 'The sky was %sclear%s.';
Index: pw_text_hu.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/output/pw_text_hu.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- pw_text_hu.php 20 Mar 2002 19:26:50 -0000 1.2
+++ pw_text_hu.php 24 Mar 2002 17:25:48 -0000 1.3
@@ -106,6 +106,7 @@
$this->strings['hPa'] = ' hPa';
$this->strings['inHg'] = ' inHg';
$this->strings['rel_humidity'] = 'A relatív páratartalom ';
+ $this->strings['windchill'] = 'The temperature including windchill was ';
$this->strings['cloud_group_beg'] = 'Az égbolton';
$this->strings['cloud_group_end'] = ' magasságban.';
$this->strings['cloud_clear'] = 'Az égbolt %sfelhõtlen%s volt.';
Index: pw_text_no.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/output/pw_text_no.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- pw_text_no.php 17 Mar 2002 13:39:04 -0000 1.1
+++ pw_text_no.php 24 Mar 2002 17:25:48 -0000 1.2
@@ -97,6 +97,7 @@
$this->strings['hPa'] = ' hPa';
$this->strings['inHg'] = ' inHg';
$this->strings['rel_humidity'] = 'Den relative fuktigheten var ';
+ $this->strings['windchill'] = 'Temperaturen, med vindkylde, var ';
$this->strings['cloud_group_beg'] = 'Det var ';
$this->strings['cloud_group_end'] = '.';
$this->strings['cloud_clear'] = 'Himmelen var %sclear%s.';
|
