Update of /cvsroot/phpweather/phpweather/locales In directory usw-pr-cvs1:/tmp/cvs-serv32743 Modified Files: locale_common.php locale_en.php Log Message: An English string was still hiding in locale_common.php. Index: locale_common.php =================================================================== RCS file: /cvsroot/phpweather/phpweather/locales/locale_common.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- locale_common.php 2001/06/28 11:44:01 1.2 +++ locale_common.php 2001/06/30 19:22:19 1.3 @@ -317,13 +317,16 @@ $output = ''; - if ($weather_group['descriptor'] == 'TS' && - !empty($weather_group['precipitation'])) { - $output .= $this->strings['weather'][$weather_group['descriptor']] . - $this->strings['with']; - } else { - $output .= $this->strings['weather'][$weather_group['descriptor']]; + if (!empty($weather_group['descriptor'])) { + if ($weather_group['descriptor'] == 'TS' && + !empty($weather_group['precipitation'])) { + $output .= $this->strings['weather'][$weather_group['descriptor']] . + $this->strings['with']; + } else { + $output .= $this->strings['weather'][$weather_group['descriptor']]; + } } + if (!empty($weather_group['intensity'])) { $output .= $this->strings['weather'][$weather_group['intensity']]; } elseif (!empty($weather_group['precipitation'])) { @@ -848,7 +851,7 @@ if (!in_array('weather', $this->properties['exclude']) && !empty($weather_group1)) { - $weather_str = 'Currently ' . + $weather_str = $this->strings['currently'] . $this->properties['mark_begin'] . $this->parse_weather_group($weather_group1) . $this->properties['mark_end']; Index: locale_en.php =================================================================== RCS file: /cvsroot/phpweather/phpweather/locales/locale_en.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- locale_en.php 2001/06/28 11:44:01 1.2 +++ locale_en.php 2001/06/30 19:22:19 1.3 @@ -109,6 +109,7 @@ $this->strings['cumulonimbus'] = ' cumulonimbus'; $this->strings['towering_cumulus'] = ' towering cumulus'; $this->strings['cavok'] = ' no clouds below %s and no cumulonimbus clouds'; + $this->strings['currently'] = 'Currently '; $this->strings['weather'] = array( '-' => 'light ', _______________________________________________ PHPWeather-checkins mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/phpweather-checkins