Author: duncan
Date: Mon Nov 12 15:20:08 2007
New Revision: 10110
Log:
[ 1830634 ] translator friendly weather plugin
Pathc from Tanja Kotthaus applied
Modified:
branches/rel-1-7/freevo/src/plugins/weather.py
branches/rel-1/freevo/src/plugins/weather.py
Modified: branches/rel-1-7/freevo/src/plugins/weather.py
==============================================================================
--- branches/rel-1-7/freevo/src/plugins/weather.py (original)
+++ branches/rel-1-7/freevo/src/plugins/weather.py Mon Nov 12 15:20:08 2007
@@ -73,105 +73,105 @@
('14', _('Showers'), 'showers.png'),
('16', _('Snow'), 'snowshow.png'),
('18', _('Rain'), 'showers.png'),
- ('19', _('AM Showers'), 'showers.png'),
+ ('19', _('AM')+_('Showers'), 'showers.png'),
('20', _('Fog'), 'fog.png'),
('21', _('Few Showers'), 'lshowers.png'),
('22', _('Mostly Sunny'), 'sunny.png'),
('24', _('Sunny'), 'sunny.png'),
('25', _('Scattered Flurries'), 'flurries.png'),
- ('26', _('AM Clouds/PM Sun'), 'pcloudy.png'),
+ ('26', _('AM')+_('Cloudy')+'/'+_('PM')+_('Sun'), 'pcloudy.png'),
('27', _('Isolated T-Storms'), 'thunshowers.png'),
('28', _('Scattered Thunderstorms'), 'thunshowers.png'),
- ('29', _('PM Showers'), 'showers.png'),
- ('30', _('PM Showers/Wind'), 'showers.png'),
- ('31', _('Rain/Snow Showers'), 'rainsnow.png'),
+ ('29', _('PM')+_('Showers'), 'showers.png'),
+ ('30', _('PM')+_('Showers')+'/'+_('Wind'), 'showers.png'),
+ ('31', _('Rain')+'/'+_('Snow Showers'), 'rainsnow.png'),
('32', _('Few Snow Showers'), 'flurries.png'),
- ('33', _('Cloudy/Wind'), 'cloudy.png'),
- ('34', _('Flurries/Wind'), 'flurries.png'),
- ('35', _('Mostly Cloudy/Windy'), 'mcloudy.png'),
- ('36', _('Rain/Thunder'), 'thunshowers.png'),
- ('37', _('Partly Cloudy/Windy'), 'pcloudy.png'),
- ('38', _('AM Rain/Snow Showers'), 'rainsnow.png'),
- ('40', _('Light Rain/Wind'), 'lshowers.png'),
- ('41', _('Showers/Wind'), 'showers.png'),
+ ('33', _('Cloudy')+'/'+_('Wind'), 'cloudy.png'),
+ ('34', _('Flurries')+'/'+_('Wind'), 'flurries.png'),
+ ('35', _('Mostly Cloudy')+'/'+_('Wind'), 'mcloudy.png'),
+ ('36', _('Rain')+'/'+_('Thunder'), 'thunshowers.png'),
+ ('37', _('Partly Cloudy')+'/'+_('Wind'), 'pcloudy.png'),
+ ('38', _('AM')+_('Rain')+'/'+_('Snow Showers'), 'rainsnow.png'),
+ ('40', _('Light Rain')+'/'+_('Wind'), 'lshowers.png'),
+ ('41', _('Showers')+'/'+_('Wind'), 'showers.png'),
('42', _('Heavy Snow'), 'snowshow.png'),
('43', _('Drizzle'), 'showers.png'),
- ('44', _('Mostly Sunny/Wind'), 'sunny.png'),
+ ('44', _('Mostly Sunny')+'/'+_('Wind'), 'sunny.png'),
('45', _('Flurries'), 'flurries.png'),
- ('47', _('Rain/Wind'), 'showers.png'),
- ('49', _('Sct Flurries/Wind'), 'flurries.png'),
+ ('47', _('Rain')+'/'+_('Wind'), 'showers.png'),
+ ('49', _('Sct Flurries')+'/'+_('Wind'), 'flurries.png'),
('50', _('Sct Strong Storms'), 'thunshowers.png'),
- ('51', _('PM T-Storms'), 'thunshowers.png'),
+ ('51', _('PM')+_('Thunderstorms'), 'thunshowers.png'),
('53', _('Thunderstorms'), 'thunshowers.png'),
- ('55', _('Sunny/Windy'), 'sunny.png'),
- ('56', _('AM Thunderstorms'), 'thunshowers.png'),
- ('62', _('AM Rain'), 'showers.png'),
- ('64', _('Iso T-Storms/Wind'), 'thunshowers.png'),
- ('65', _('Rain/Snow'), 'rainsnow.png'),
- ('66', _('Sct T-Storms/Wind'), 'showers.png'),
- ('67', _('AM Showers/Wind'), 'showers.png'),
+ ('55', _('Sunny')+'/'+_('Wind'), 'sunny.png'),
+ ('56', _('AM')+_('Thunderstorms'), 'thunshowers.png'),
+ ('62', _('AM')+_('Rain'), 'showers.png'),
+ ('64', _('Iso T-Storms')+'/'+_('Wind'), 'thunshowers.png'),
+ ('65', _('Rain')+'/'+_('Snow'), 'rainsnow.png'),
+ ('66', _('Sct T-Storms')+'/'+_('Wind'), 'showers.png'),
+ ('67', _('AM')+_('Showers')+'/'+_('Wind'), 'showers.png'),
('70', _('Sct Snow Showers'), 'snowshow.png'),
- ('71', _('Snow to Ice/Wind'), 'snowshow.png'),
- ('76', _('AM Ice'), 'rainsnow.png'),
- ('77', _('Snow to Rain'), 'rainsnow.png'),
- ('80', _('AM Light Rain'), 'lshowers.png'),
- ('81', _('PM Light Rain'), 'lshowers.png'),
- ('82', _('PM Rain'), 'showers.png'),
+ ('71', _('Snow')+ _('to')+_('Ice')+'/'+_('Wind'), 'snowshow.png'),
+ ('76', _('AM')+_('Ice'), 'rainsnow.png'),
+ ('77', _('Snow')+_('to')+_('Rain'), 'rainsnow.png'),
+ ('80', _('AM')+_('Light Rain'), 'lshowers.png'),
+ ('81', _('PM')+_('Light Rain'), 'lshowers.png'),
+ ('82', _('PM')+_('Rain'), 'showers.png'),
('84', _('Snow Showers'), 'snowshow.png'),
- ('85', _('Rain to Snow'), 'rainsnow.png'),
- ('86', _('PM Rain/Snow'), 'snowshow.png'),
- ('88', _('Few Showers/Wind'), 'showers.png'),
- ('90', _('Snow/Wind'), 'snowshow.png'),
- ('91', _('PM Rain/Snow Showers'), 'rainsnow.png'),
- ('92', _('PM Rain/Snow/Wind'), 'rainsnow.png'),
- ('93', _('Rain/Snow Showers/Wind'), 'rainsnow.png'),
- ('94', _('Rain/Snow/Wind'), 'rainsnow.png'),
+ ('85', _('Rain')+_('to')+_('Snow'), 'rainsnow.png'),
+ ('86', _('PM')+_('Rain')+'/'+_('Snow'), 'snowshow.png'),
+ ('88', _('Few Showers')+'/'+_('Wind'), 'showers.png'),
+ ('90', _('Snow')+'/'+_('Wind'), 'snowshow.png'),
+ ('91', _('PM')+_('Rain')+'/'+_('Snow Showers'), 'rainsnow.png'),
+ ('92', _('PM')+_('Rain')+'/'+_('Snow')+'/'+_('Wind'), 'rainsnow.png'),
+ ('93', _('Rain')+'/'+_('Snow Showers')+'/'+_('Wind'), 'rainsnow.png'),
+ ('94', _('Rain')+'/'+_('Snow')+'/'+_('Wind'), 'rainsnow.png'),
('98', _('Light Snow'), 'flurries.png'),
- ('100', _('PM Snow'), 'snowshow.png'),
- ('101', _('Few Snow Showers/Wind'), 'snowshow.png'),
- ('103', _('Light Snow/Wind'), 'flurries.png'),
+ ('100', _('PM')+_('Snow'), 'snowshow.png'),
+ ('101', _('Few Snow Showers')+'/'+_('Wind'), 'snowshow.png'),
+ ('103', _('Light Snow')+'/'+_('Wind'), 'flurries.png'),
('104', _('Wintry Mix'), 'flurries.png'),
- ('105', _('AM Wintry Mix'), 'rainsnow.png'),
- ('106', _('Hvy Rain/Freezing Rain'), 'rainsnow.png'),
- ('108', _('AM Light Snow'), 'flurries.png'),
- ('109', _('PM Rain/Snow/Wind'), 'rainsnow.png'),
- ('114', _('Rain/Freezing Rain'), 'showers.png'),
- ('118', _('T-Storms/Wind'), 'thunshowers.png'),
+ ('105', _('AM')+_('Wintry Mix'), 'rainsnow.png'),
+ ('106', _('Hvy Rain')+'/'+_('Freezing Rain'), 'rainsnow.png'),
+ ('108', _('AM')+_('Light Snow'), 'flurries.png'),
+ ('109', _('PM')+_('Rain')+'/'+_('Snow')+'/'+_('Wind'), 'rainsnow.png'),
+ ('114', _('Rain')+'/'+_('Freezing Rain'), 'showers.png'),
+ ('118', _('T-Storms')+'/'+_('Wind'), 'thunshowers.png'),
('123', _('Sprinkles'), 'lshowers.png'),
- ('125', _('AM Snow Showers'), 'snowshow.png'),
- ('126', _('AM Clouds/PM Sun/Wind'), 'pcloudy.png'),
- ('128', _('AM Rain/Snow/Wind'), 'rainsnow.png'),
- ('130', _('Rain to Snow/Wind'), 'rainsnow.png'),
- ('132', _('Snow to Wintry Mix'), 'snowshow.png'),
- ('133', _('PM Snow Showers/Wind'), 'snowshow.png'),
- ('135', _('Snow and Ice to Rain'), 'rainsnow.png'),
+ ('125', _('AM')+_('Snow Showers'), 'snowshow.png'),
+ ('126', _('AM')+_('Cloudy')+'/'+_('PM')+_('Sun')+'/'+_('Wind'),
'pcloudy.png'),
+ ('128', _('AM')+_('Rain')+'/'+_('Snow')+'/'+_('Wind'), 'rainsnow.png'),
+ ('130', _('Rain')+_('to')+_('Snow')+'/'+_('Wind'), 'rainsnow.png'),
+ ('132', _('Snow')+_('to')+_('Wintry Mix'), 'snowshow.png'),
+ ('133', _('PM')+_('Snow Showers')+'/'+_('Wind'), 'snowshow.png'),
+ ('135', _('Snow')+_('and')+_('Ice')+_('to')+_('Rain'), 'rainsnow.png'),
('137', _('Heavy Rain'), 'showers.png'),
- ('138', _('AM Rain/Ice'), 'showers.png'),
- ('145', _('AM Snow Showers/Wind'), 'snowshow.png'),
- ('146', _('AM Light Snow/Wind'), 'flurries.png'),
- ('150', _('PM Light Rain/Wind'), 'lshowers.png'),
- ('152', _('AM Light Wintry Mix'), 'rainsnow.png'),
- ('153', _('PM Light Snow/Wind'), 'flurries.png'),
- ('154', _('Heavy Rain/Wind'), 'showers.png'),
- ('155', _('PM Snow Shower'), 'snowshow.png'),
- ('158', _('Snow to Rain/Wind'), 'rainsnow.png'),
- ('164', _('PM Light Rain/Ice'), 'showers.png'),
- ('167', _('AM Snow'), 'snowshow.png'),
- ('171', _('Snow to Ice'), 'snowshow.png'),
- ('172', _('Wintry Mix/Wind'), 'rainsnow.png'),
- ('175', _('PM Light Snow'), 'flurries.png'),
- ('178', _('AM Drizzle'), 'lshowers.png'),
- ('189', _('Strong Storms/Wind'), 'thunshowers.png'),
- ('193', _('PM Drizzle'), 'lshowers.png'),
+ ('138', _('AM')+_('Rain')+'/'+_('Ice'), 'showers.png'),
+ ('145', _('AM')+_('Snow Showers')+'/'+_('Wind'), 'snowshow.png'),
+ ('146', _('AM')+_('Light Snow')+'/'+_('Wind'), 'flurries.png'),
+ ('150', _('PM')+_('Light Rain')+'/'+_('Wind'), 'lshowers.png'),
+ ('152', _('AM')+_('Light Wintry Mix'), 'rainsnow.png'),
+ ('153', _('PM')+_('Light Snow')+'/'+_('Wind'), 'flurries.png'),
+ ('154', _('Heavy Rain')+'/'+_('Wind'), 'showers.png'),
+ ('155', _('PM')+_('Snow Shower'), 'snowshow.png'),
+ ('158', _('Snow')+_('to')+_('Rain')+'/'+_('Wind'), 'rainsnow.png'),
+ ('164', _('PM')+_('Light Rain')+'/'+_('Ice'), 'showers.png'),
+ ('167', _('AM')+_('Snow'), 'snowshow.png'),
+ ('171', _('Snow')+_('to')+_('Ice'), 'snowshow.png'),
+ ('172', _('Wintry Mix')+'/'+_('Wind'), 'rainsnow.png'),
+ ('175', _('PM')+_('Light Snow'), 'flurries.png'),
+ ('178', _('AM')+_('Drizzle'), 'lshowers.png'),
+ ('189', _('Strong Storms')+'/'+_('Wind'), 'thunshowers.png'),
+ ('193', _('PM')+_('Drizzle'), 'lshowers.png'),
('194', _('Drizzle'), 'lshowers.png'),
- ('201', _('AM Light Rain/Wind'), 'lshowers.png'),
- ('204', _('AM Rain/Wind'), 'showers.png'),
- ('223', _('Wintry Mix to Snow'), 'rainsnow.png'),
+ ('201', _('AM')+_('Light Rain')+'/'+_('Wind'), 'lshowers.png'),
+ ('204', _('AM')+_('Rain')+'/'+_('Wind'), 'showers.png'),
+ ('223', _('Wintry Mix')+_('to')+_('Snow'), 'rainsnow.png'),
('231', _('Rain'), 'showers.png'),
- ('240', _('AM Light Rain/Ice'), 'rainsnow.png'),
- ('259', _('Hvy Rain/Freezing Rain'), 'showers.png'),
- ('271', _('Snow Showers/Windy'), 'snowshow.png'),
- ('988', _('Partly Cloudy/Windy'), 'pcloudy.png'),
+ ('240', _('AM')+_('Light Rain')+'/'+_('Ice'), 'rainsnow.png'),
+ ('259', _('Hvy Rain')+'/'+_('Freezing Rain'), 'showers.png'),
+ ('271', _('Snow Showers')+'/'+_('Wind'), 'snowshow.png'),
+ ('988', _('Partly Cloudy')+'/'+_('Wind'), 'pcloudy.png'),
('989', _('Light Rain Shower'), 'lshowers.png'),
('990', _('Light Rain with Thunder'), 'thunshowers.png'),
('991', _('Light Drizzle'), 'lshowers.png'),
@@ -179,7 +179,7 @@
('993', _('Smoke'), 'fog.png'),
('994', _('Haze'), 'fog.png'),
('995', _('Light Snow Shower'), 'flurries.png'),
- ('996', _('Light Snow Shower/ Windy'), 'flurries.png'),
+ ('996', _('Light Snow Shower')+'/'+_('Wind'), 'flurries.png'),
('997', _('Clear'), 'fair.png'),
('998', _('A Few Clouds'), 'pcloudy.png'),
('999', _('Fair'), 'fair.png')
@@ -989,19 +989,17 @@
y_start = self.content.y + (30 * self.xmult)
lines = []
- lines.append('%s %s %s %s.' % (\
- _('Today, a high of'), self.parent.weather.highTemp[0], \
- _('and a low of'), self.parent.weather.lowTemp[0]))
+ lines.append(_('Today, a high of %s degrees')
%self.parent.weather.highTemp[0])
+ lines.append(_('and a low of %s degrees.')
%self.parent.weather.lowTemp[0])
lines.append('%s %s %s' % (_("Currently, there is a humidity of"),
self.parent.weather.getHumidity(), _("and"),))
- text = _("the winds are ")
if self.parent.weather.windDir == "CALM":
- text += "%s. " % (_("calm"),)
+ text = _('the winds are calm')
else:
- text += "%s %s %s %s." % (\
- _("coming in at"), self.parent.weather.getWind(), \
- _("from the"), self.parent.weather.windDir)
+ text =_('the winds are coming in at %s from the %s') \
+ %(self.parent.weather.getWind(),self.parent.weather.windDir)
+
lines.append(text)
if float(self.parent.weather.visibility) == 999.00:
Modified: branches/rel-1/freevo/src/plugins/weather.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/weather.py (original)
+++ branches/rel-1/freevo/src/plugins/weather.py Mon Nov 12 15:20:08 2007
@@ -73,105 +73,105 @@
('14', _('Showers'), 'showers.png'),
('16', _('Snow'), 'snowshow.png'),
('18', _('Rain'), 'showers.png'),
- ('19', _('AM Showers'), 'showers.png'),
+ ('19', _('AM')+_('Showers'), 'showers.png'),
('20', _('Fog'), 'fog.png'),
('21', _('Few Showers'), 'lshowers.png'),
('22', _('Mostly Sunny'), 'sunny.png'),
('24', _('Sunny'), 'sunny.png'),
('25', _('Scattered Flurries'), 'flurries.png'),
- ('26', _('AM Clouds/PM Sun'), 'pcloudy.png'),
+ ('26', _('AM')+_('Cloudy')+'/'+_('PM')+_('Sun'), 'pcloudy.png'),
('27', _('Isolated T-Storms'), 'thunshowers.png'),
('28', _('Scattered Thunderstorms'), 'thunshowers.png'),
- ('29', _('PM Showers'), 'showers.png'),
- ('30', _('PM Showers/Wind'), 'showers.png'),
- ('31', _('Rain/Snow Showers'), 'rainsnow.png'),
+ ('29', _('PM')+_('Showers'), 'showers.png'),
+ ('30', _('PM')+_('Showers')+'/'+_('Wind'), 'showers.png'),
+ ('31', _('Rain')+'/'+_('Snow Showers'), 'rainsnow.png'),
('32', _('Few Snow Showers'), 'flurries.png'),
- ('33', _('Cloudy/Wind'), 'cloudy.png'),
- ('34', _('Flurries/Wind'), 'flurries.png'),
- ('35', _('Mostly Cloudy/Windy'), 'mcloudy.png'),
- ('36', _('Rain/Thunder'), 'thunshowers.png'),
- ('37', _('Partly Cloudy/Windy'), 'pcloudy.png'),
- ('38', _('AM Rain/Snow Showers'), 'rainsnow.png'),
- ('40', _('Light Rain/Wind'), 'lshowers.png'),
- ('41', _('Showers/Wind'), 'showers.png'),
+ ('33', _('Cloudy')+'/'+_('Wind'), 'cloudy.png'),
+ ('34', _('Flurries')+'/'+_('Wind'), 'flurries.png'),
+ ('35', _('Mostly Cloudy')+'/'+_('Wind'), 'mcloudy.png'),
+ ('36', _('Rain')+'/'+_('Thunder'), 'thunshowers.png'),
+ ('37', _('Partly Cloudy')+'/'+_('Wind'), 'pcloudy.png'),
+ ('38', _('AM')+_('Rain')+'/'+_('Snow Showers'), 'rainsnow.png'),
+ ('40', _('Light Rain')+'/'+_('Wind'), 'lshowers.png'),
+ ('41', _('Showers')+'/'+_('Wind'), 'showers.png'),
('42', _('Heavy Snow'), 'snowshow.png'),
('43', _('Drizzle'), 'showers.png'),
- ('44', _('Mostly Sunny/Wind'), 'sunny.png'),
+ ('44', _('Mostly Sunny')+'/'+_('Wind'), 'sunny.png'),
('45', _('Flurries'), 'flurries.png'),
- ('47', _('Rain/Wind'), 'showers.png'),
- ('49', _('Sct Flurries/Wind'), 'flurries.png'),
+ ('47', _('Rain')+'/'+_('Wind'), 'showers.png'),
+ ('49', _('Sct Flurries')+'/'+_('Wind'), 'flurries.png'),
('50', _('Sct Strong Storms'), 'thunshowers.png'),
- ('51', _('PM T-Storms'), 'thunshowers.png'),
+ ('51', _('PM')+_('Thunderstorms'), 'thunshowers.png'),
('53', _('Thunderstorms'), 'thunshowers.png'),
- ('55', _('Sunny/Windy'), 'sunny.png'),
- ('56', _('AM Thunderstorms'), 'thunshowers.png'),
- ('62', _('AM Rain'), 'showers.png'),
- ('64', _('Iso T-Storms/Wind'), 'thunshowers.png'),
- ('65', _('Rain/Snow'), 'rainsnow.png'),
- ('66', _('Sct T-Storms/Wind'), 'showers.png'),
- ('67', _('AM Showers/Wind'), 'showers.png'),
+ ('55', _('Sunny')+'/'+_('Wind'), 'sunny.png'),
+ ('56', _('AM')+_('Thunderstorms'), 'thunshowers.png'),
+ ('62', _('AM')+_('Rain'), 'showers.png'),
+ ('64', _('Iso T-Storms')+'/'+_('Wind'), 'thunshowers.png'),
+ ('65', _('Rain')+'/'+_('Snow'), 'rainsnow.png'),
+ ('66', _('Sct T-Storms')+'/'+_('Wind'), 'showers.png'),
+ ('67', _('AM')+_('Showers')+'/'+_('Wind'), 'showers.png'),
('70', _('Sct Snow Showers'), 'snowshow.png'),
- ('71', _('Snow to Ice/Wind'), 'snowshow.png'),
- ('76', _('AM Ice'), 'rainsnow.png'),
- ('77', _('Snow to Rain'), 'rainsnow.png'),
- ('80', _('AM Light Rain'), 'lshowers.png'),
- ('81', _('PM Light Rain'), 'lshowers.png'),
- ('82', _('PM Rain'), 'showers.png'),
+ ('71', _('Snow')+ _('to')+_('Ice')+'/'+_('Wind'), 'snowshow.png'),
+ ('76', _('AM')+_('Ice'), 'rainsnow.png'),
+ ('77', _('Snow')+_('to')+_('Rain'), 'rainsnow.png'),
+ ('80', _('AM')+_('Light Rain'), 'lshowers.png'),
+ ('81', _('PM')+_('Light Rain'), 'lshowers.png'),
+ ('82', _('PM')+_('Rain'), 'showers.png'),
('84', _('Snow Showers'), 'snowshow.png'),
- ('85', _('Rain to Snow'), 'rainsnow.png'),
- ('86', _('PM Rain/Snow'), 'snowshow.png'),
- ('88', _('Few Showers/Wind'), 'showers.png'),
- ('90', _('Snow/Wind'), 'snowshow.png'),
- ('91', _('PM Rain/Snow Showers'), 'rainsnow.png'),
- ('92', _('PM Rain/Snow/Wind'), 'rainsnow.png'),
- ('93', _('Rain/Snow Showers/Wind'), 'rainsnow.png'),
- ('94', _('Rain/Snow/Wind'), 'rainsnow.png'),
+ ('85', _('Rain')+_('to')+_('Snow'), 'rainsnow.png'),
+ ('86', _('PM')+_('Rain')+'/'+_('Snow'), 'snowshow.png'),
+ ('88', _('Few Showers')+'/'+_('Wind'), 'showers.png'),
+ ('90', _('Snow')+'/'+_('Wind'), 'snowshow.png'),
+ ('91', _('PM')+_('Rain')+'/'+_('Snow Showers'), 'rainsnow.png'),
+ ('92', _('PM')+_('Rain')+'/'+_('Snow')+'/'+_('Wind'), 'rainsnow.png'),
+ ('93', _('Rain')+'/'+_('Snow Showers')+'/'+_('Wind'), 'rainsnow.png'),
+ ('94', _('Rain')+'/'+_('Snow')+'/'+_('Wind'), 'rainsnow.png'),
('98', _('Light Snow'), 'flurries.png'),
- ('100', _('PM Snow'), 'snowshow.png'),
- ('101', _('Few Snow Showers/Wind'), 'snowshow.png'),
- ('103', _('Light Snow/Wind'), 'flurries.png'),
+ ('100', _('PM')+_('Snow'), 'snowshow.png'),
+ ('101', _('Few Snow Showers')+'/'+_('Wind'), 'snowshow.png'),
+ ('103', _('Light Snow')+'/'+_('Wind'), 'flurries.png'),
('104', _('Wintry Mix'), 'flurries.png'),
- ('105', _('AM Wintry Mix'), 'rainsnow.png'),
- ('106', _('Hvy Rain/Freezing Rain'), 'rainsnow.png'),
- ('108', _('AM Light Snow'), 'flurries.png'),
- ('109', _('PM Rain/Snow/Wind'), 'rainsnow.png'),
- ('114', _('Rain/Freezing Rain'), 'showers.png'),
- ('118', _('T-Storms/Wind'), 'thunshowers.png'),
+ ('105', _('AM')+_('Wintry Mix'), 'rainsnow.png'),
+ ('106', _('Hvy Rain')+'/'+_('Freezing Rain'), 'rainsnow.png'),
+ ('108', _('AM')+_('Light Snow'), 'flurries.png'),
+ ('109', _('PM')+_('Rain')+'/'+_('Snow')+'/'+_('Wind'), 'rainsnow.png'),
+ ('114', _('Rain')+'/'+_('Freezing Rain'), 'showers.png'),
+ ('118', _('T-Storms')+'/'+_('Wind'), 'thunshowers.png'),
('123', _('Sprinkles'), 'lshowers.png'),
- ('125', _('AM Snow Showers'), 'snowshow.png'),
- ('126', _('AM Clouds/PM Sun/Wind'), 'pcloudy.png'),
- ('128', _('AM Rain/Snow/Wind'), 'rainsnow.png'),
- ('130', _('Rain to Snow/Wind'), 'rainsnow.png'),
- ('132', _('Snow to Wintry Mix'), 'snowshow.png'),
- ('133', _('PM Snow Showers/Wind'), 'snowshow.png'),
- ('135', _('Snow and Ice to Rain'), 'rainsnow.png'),
+ ('125', _('AM')+_('Snow Showers'), 'snowshow.png'),
+ ('126', _('AM')+_('Cloudy')+'/'+_('PM')+_('Sun')+'/'+_('Wind'),
'pcloudy.png'),
+ ('128', _('AM')+_('Rain')+'/'+_('Snow')+'/'+_('Wind'), 'rainsnow.png'),
+ ('130', _('Rain')+_('to')+_('Snow')+'/'+_('Wind'), 'rainsnow.png'),
+ ('132', _('Snow')+_('to')+_('Wintry Mix'), 'snowshow.png'),
+ ('133', _('PM')+_('Snow Showers')+'/'+_('Wind'), 'snowshow.png'),
+ ('135', _('Snow')+_('and')+_('Ice')+_('to')+_('Rain'), 'rainsnow.png'),
('137', _('Heavy Rain'), 'showers.png'),
- ('138', _('AM Rain/Ice'), 'showers.png'),
- ('145', _('AM Snow Showers/Wind'), 'snowshow.png'),
- ('146', _('AM Light Snow/Wind'), 'flurries.png'),
- ('150', _('PM Light Rain/Wind'), 'lshowers.png'),
- ('152', _('AM Light Wintry Mix'), 'rainsnow.png'),
- ('153', _('PM Light Snow/Wind'), 'flurries.png'),
- ('154', _('Heavy Rain/Wind'), 'showers.png'),
- ('155', _('PM Snow Shower'), 'snowshow.png'),
- ('158', _('Snow to Rain/Wind'), 'rainsnow.png'),
- ('164', _('PM Light Rain/Ice'), 'showers.png'),
- ('167', _('AM Snow'), 'snowshow.png'),
- ('171', _('Snow to Ice'), 'snowshow.png'),
- ('172', _('Wintry Mix/Wind'), 'rainsnow.png'),
- ('175', _('PM Light Snow'), 'flurries.png'),
- ('178', _('AM Drizzle'), 'lshowers.png'),
- ('189', _('Strong Storms/Wind'), 'thunshowers.png'),
- ('193', _('PM Drizzle'), 'lshowers.png'),
+ ('138', _('AM')+_('Rain')+'/'+_('Ice'), 'showers.png'),
+ ('145', _('AM')+_('Snow Showers')+'/'+_('Wind'), 'snowshow.png'),
+ ('146', _('AM')+_('Light Snow')+'/'+_('Wind'), 'flurries.png'),
+ ('150', _('PM')+_('Light Rain')+'/'+_('Wind'), 'lshowers.png'),
+ ('152', _('AM')+_('Light Wintry Mix'), 'rainsnow.png'),
+ ('153', _('PM')+_('Light Snow')+'/'+_('Wind'), 'flurries.png'),
+ ('154', _('Heavy Rain')+'/'+_('Wind'), 'showers.png'),
+ ('155', _('PM')+_('Snow Shower'), 'snowshow.png'),
+ ('158', _('Snow')+_('to')+_('Rain')+'/'+_('Wind'), 'rainsnow.png'),
+ ('164', _('PM')+_('Light Rain')+'/'+_('Ice'), 'showers.png'),
+ ('167', _('AM')+_('Snow'), 'snowshow.png'),
+ ('171', _('Snow')+_('to')+_('Ice'), 'snowshow.png'),
+ ('172', _('Wintry Mix')+'/'+_('Wind'), 'rainsnow.png'),
+ ('175', _('PM')+_('Light Snow'), 'flurries.png'),
+ ('178', _('AM')+_('Drizzle'), 'lshowers.png'),
+ ('189', _('Strong Storms')+'/'+_('Wind'), 'thunshowers.png'),
+ ('193', _('PM')+_('Drizzle'), 'lshowers.png'),
('194', _('Drizzle'), 'lshowers.png'),
- ('201', _('AM Light Rain/Wind'), 'lshowers.png'),
- ('204', _('AM Rain/Wind'), 'showers.png'),
- ('223', _('Wintry Mix to Snow'), 'rainsnow.png'),
+ ('201', _('AM')+_('Light Rain')+'/'+_('Wind'), 'lshowers.png'),
+ ('204', _('AM')+_('Rain')+'/'+_('Wind'), 'showers.png'),
+ ('223', _('Wintry Mix')+_('to')+_('Snow'), 'rainsnow.png'),
('231', _('Rain'), 'showers.png'),
- ('240', _('AM Light Rain/Ice'), 'rainsnow.png'),
- ('259', _('Hvy Rain/Freezing Rain'), 'showers.png'),
- ('271', _('Snow Showers/Windy'), 'snowshow.png'),
- ('988', _('Partly Cloudy/Windy'), 'pcloudy.png'),
+ ('240', _('AM')+_('Light Rain')+'/'+_('Ice'), 'rainsnow.png'),
+ ('259', _('Hvy Rain')+'/'+_('Freezing Rain'), 'showers.png'),
+ ('271', _('Snow Showers')+'/'+_('Wind'), 'snowshow.png'),
+ ('988', _('Partly Cloudy')+'/'+_('Wind'), 'pcloudy.png'),
('989', _('Light Rain Shower'), 'lshowers.png'),
('990', _('Light Rain with Thunder'), 'thunshowers.png'),
('991', _('Light Drizzle'), 'lshowers.png'),
@@ -179,7 +179,7 @@
('993', _('Smoke'), 'fog.png'),
('994', _('Haze'), 'fog.png'),
('995', _('Light Snow Shower'), 'flurries.png'),
- ('996', _('Light Snow Shower/ Windy'), 'flurries.png'),
+ ('996', _('Light Snow Shower')+'/'+_('Wind'), 'flurries.png'),
('997', _('Clear'), 'fair.png'),
('998', _('A Few Clouds'), 'pcloudy.png'),
('999', _('Fair'), 'fair.png')
@@ -989,19 +989,17 @@
y_start = self.content.y + (30 * self.xmult)
lines = []
- lines.append('%s %s %s %s.' % (\
- _('Today, a high of'), self.parent.weather.highTemp[0], \
- _('and a low of'), self.parent.weather.lowTemp[0]))
+ lines.append(_('Today, a high of %s degrees')
%self.parent.weather.highTemp[0])
+ lines.append(_('and a low of %s degrees.')
%self.parent.weather.lowTemp[0])
lines.append('%s %s %s' % (_("Currently, there is a humidity of"),
self.parent.weather.getHumidity(), _("and"),))
- text = _("the winds are ")
if self.parent.weather.windDir == "CALM":
- text += "%s. " % (_("calm"),)
+ text = _('the winds are calm')
else:
- text += "%s %s %s %s." % (\
- _("coming in at"), self.parent.weather.getWind(), \
- _("from the"), self.parent.weather.windDir)
+ text =_('the winds are coming in at %s from the %s') \
+ %(self.parent.weather.getWind(),self.parent.weather.windDir)
+
lines.append(text)
if float(self.parent.weather.visibility) == 999.00:
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
