Update of /cvsroot/phpweather/phpweather
In directory usw-pr-cvs1:/tmp/cvs-serv3995
Modified Files:
locale_common.php locale_en.php
Log Message:
Fixed the CAVOK-case.
Index: locale_common.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/locale_common.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- locale_common.php 2001/04/02 19:34:21 1.4
+++ locale_common.php 2001/04/08 09:57:17 1.5
@@ -275,6 +275,16 @@
$this->properties['mark_end'] . $this->strings['meter'],
$this->properties['mark_begin'] . $ft .
$this->properties['mark_end'] . $this->strings['feet']);
+ } elseif($condition == 'CAVOK') {
+ $output = sprintf($this->strings['cavok'],
+ $this->pref_units($this->properties['mark_begin'] .
+ '1524' .
+ $this->properties['mark_end'] .
+ $this->strings['meter'],
+ $this->properties['mark_begin'] .
+ '5000' .
+ $this->properties['mark_end'] .
+ $this->strings['feet']));
} else {
if (empty($cumulus)) {
$cumulus = '';
Index: locale_en.php
===================================================================
RCS file: /cvsroot/phpweather/phpweather/locale_en.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- locale_en.php 2001/04/02 19:34:21 1.3
+++ locale_en.php 2001/04/08 09:57:17 1.4
@@ -16,7 +16,7 @@
$this->strings['list_sentences_and'] = ' and ';
$this->strings['list_sentences_comma'] = ', ';
- $this->strings['list_sentences_final_and'] = ', and';
+ $this->strings['list_sentences_final_and'] = ', and ';
$this->strings['location'] = 'This is a report for %s%s%s.';
$this->strings['minutes'] = ' minutes';
$this->strings['time_format'] = 'The report was made %s ago, at
%s%s%s UTC.';
@@ -103,6 +103,7 @@
'OVC' => 'overcast');
$this->strings['cumulonimbus'] = ' cumulonimbus';
$this->strings['towering_cumulus'] = ' towering cumulus';
+ $this->strings['cavok'] = ' no clouds below %s and no cumulonimbus
+clouds';
$this->strings['weather'] =
array(
'-' => 'light ',
_______________________________________________
PHPWeather-checkins mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/phpweather-checkins
