mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-04-20 09:37:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #741

Browse Source 
Fixes handling missing $gettext issues
This commit is contained in:
Tom Keffer
2022-02-08 14:02:41 -08:00
committed by GitHub
parent a42138f963 9f9b7b7952
commit 48bdf11998
6 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
skins/Seasons/rss.xml.tmpl
View File

@@ -62,14 +62,14 @@
#for $x in $observations
#if $getattr($timespan['span'], $x).has_data
#if $x == 'wind'
$gettext("Max") $obs.label.wind: $timespan['span'].wind.max $gettext("from") $timespan['span'].wind.gustdir at $timespan['span'].wind.maxtime;
$gettext("Max") $obs.label.wind: $timespan['span'].wind.max $gettext("from") $timespan['span'].wind.gustdir $gettext("at") $timespan['span'].wind.maxtime;
#elif $x in $obs_type_sum
$obs.label[$x]: $getattr($timespan['span'], $x).sum;
#elif $x in $obs_type_max
$gettext("Max") $obs.label[$x]: $getattr($timespan['span'], $x).max;
#else
$gettext("Min") $obs.label[$x]: $getattr($timespan['span'], $x).min at $getattr($timespan['span'], $x).mintime;
$gettext("Max") $obs.label[$x]: $getattr($timespan['span'], $x).max at $getattr($timespan['span'], $x).maxtime;
$gettext("Min") $obs.label[$x]: $getattr($timespan['span'], $x).min $gettext("at") $getattr($timespan['span'], $x).mintime;
$gettext("Max") $obs.label[$x]: $getattr($timespan['span'], $x).max $gettext("at") $getattr($timespan['span'], $x).maxtime;
#end if
#end if
#end for
@@ -83,14 +83,14 @@
#for $x in $observations
#if $getattr($timespan['span'], $x).has_data
#if $x == 'wind'
$gettext("Max") $obs.label.wind: $timespan['span'].wind.max $gettext("from") $timespan['span'].wind.gustdir at $timespan['span'].wind.maxtime<br/>
$gettext("Max") $obs.label.wind: $timespan['span'].wind.max $gettext("from") $timespan['span'].wind.gustdir $gettext("at") $timespan['span'].wind.maxtime<br/>
#elif $x in $obs_type_sum
$obs.label[$x]: $getattr($timespan['span'], $x).sum<br/>
#elif $x in $obs_type_max
$gettext("Max") $obs.label[$x]: $getattr($timespan['span'], $x).max<br/>
#else
$gettext("Min") $obs.label[$x]: $getattr($timespan['span'], $x).min at $getattr($timespan['span'], $x).mintime<br/>
$gettext("Max") $obs.label[$x]: $getattr($timespan['span'], $x).max at $getattr($timespan['span'], $x).maxtime<br/>
$gettext("Min") $obs.label[$x]: $getattr($timespan['span'], $x).min $gettext("at") $getattr($timespan['span'], $x).mintime<br/>
$gettext("Max") $obs.label[$x]: $getattr($timespan['span'], $x).max $gettext("at") $getattr($timespan['span'], $x).maxtime<br/>
#end if
#end if
#end for

4
skins/Smartphone/rain.html.tmpl
View File

@@ -19,13 +19,13 @@
<img src="dayrain.png"/>
<p>
$gettext("Total"): $day.rain.sum<br/>
$gettext("Max rate"): $day.rainRate.max at $day.rainRate.maxtime
$gettext("Max rate"): $day.rainRate.max $gettext("at") $day.rainRate.maxtime
</p>
<h4>$obs.label.rain $gettext("Last 7 days")</h4>
<img src="weekrain.png" />
<p>
$gettext("Total"): $week.rain.sum<br/>
$gettext("Max rate"): $week.rainRate.max at $week.rainRate.maxtime
$gettext("Max rate"): $week.rainRate.max $gettext("at") $week.rainRate.maxtime
</p>
<h4>$obs.label.rain $gettext("Last 30 days")</h4>
<img src="monthrain.png" />

84
skins/Standard/RSS/weewx_rss.xml.tmpl
View File

@@ -47,13 +47,13 @@
<title>$gettext("Daily Weather Summary as of") $current.dateTime</title>
<link>$station.station_url</link>
<description>
$gettext("Min outside temperature"): $day.outTemp.min at $day.outTemp.mintime;
$gettext("Max outside temperature"): $day.outTemp.max at $day.outTemp.maxtime;
$gettext("Min inside temperature"): $day.inTemp.min at $day.inTemp.mintime;
$gettext("Max inside temperature"): $day.inTemp.max at $day.inTemp.maxtime;
$gettext("Min barometer"): $day.barometer.min at $day.barometer.mintime;
$gettext("Max barometer"): $day.barometer.max at $day.barometer.maxtime;
$gettext("Max wind") : $day.wind.max $gettext("from") $day.wind.gustdir at $day.wind.maxtime;
$gettext("Min outside temperature"): $day.outTemp.min $gettext("at") $day.outTemp.mintime;
$gettext("Max outside temperature"): $day.outTemp.max $gettext("at") $day.outTemp.maxtime;
$gettext("Min inside temperature"): $day.inTemp.min $gettext("at") $day.inTemp.mintime;
$gettext("Max inside temperature"): $day.inTemp.max $gettext("at") $day.inTemp.maxtime;
$gettext("Min barometer"): $day.barometer.min $gettext("at") $day.barometer.mintime;
$gettext("Max barometer"): $day.barometer.max $gettext("at") $day.barometer.maxtime;
$gettext("Max wind") : $day.wind.max $gettext("from") $day.wind.gustdir $gettext("at") $day.wind.maxtime;
$gettext("Rain today"): $day.rain.sum
</description>
<pubDate>$current.dateTime.format("%a, %d %b %Y %H:%M:%S %Z")</pubDate>
@@ -62,13 +62,13 @@
<content:encoded><![CDATA[
<p>
$gettext("Day"): $day.dateTime.format("%d %b %Y")<br/>
$gettext("Min outside temperature"): $day.outTemp.min at $day.outTemp.mintime<br/>
$gettext("Max outside temperature"): $day.outTemp.max at $day.outTemp.maxtime<br/>
$gettext("Min inside temperature"): $day.inTemp.min at $day.inTemp.mintime<br/>
$gettext("Max inside temperature"): $day.inTemp.max at $day.inTemp.maxtime<br/>
$gettext("Min barometer"): $day.barometer.min at $day.barometer.mintime<br/>
$gettext("Max barometer"): $day.barometer.max at $day.barometer.maxtime<br/>
$gettext("Max wind") : $day.wind.max $gettext("from") $day.wind.gustdir at $day.wind.maxtime<br/>
$gettext("Min outside temperature"): $day.outTemp.min $gettext("at") $day.outTemp.mintime<br/>
$gettext("Max outside temperature"): $day.outTemp.max $gettext("at") $day.outTemp.maxtime<br/>
$gettext("Min inside temperature"): $day.inTemp.min $gettext("at") $day.inTemp.mintime<br/>
$gettext("Max inside temperature"): $day.inTemp.max $gettext("at") $day.inTemp.maxtime<br/>
$gettext("Min barometer"): $day.barometer.min $gettext("at") $day.barometer.mintime<br/>
$gettext("Max barometer"): $day.barometer.max $gettext("at") $day.barometer.maxtime<br/>
$gettext("Max wind") : $day.wind.max $gettext("from") $day.wind.gustdir $gettext("at") $day.wind.maxtime<br/>
$gettext("Rain today"): $day.rain.sum<br/>
</p>
]]></content:encoded>
@@ -78,26 +78,26 @@
<title>$gettext("Monthly Weather Summary as of") $current.dateTime</title>
<link>$station.station_url</link>
<description>
$gettext("Min outside temperature"): $month.outTemp.min at $month.outTemp.mintime;
$gettext("Max outside temperature"): $month.outTemp.max at $month.outTemp.maxtime;
$gettext("Min inside temperature"): $month.inTemp.min at $month.inTemp.mintime;
$gettext("Max inside temperature"): $month.inTemp.max at $month.inTemp.maxtime;
$gettext("Min barometer"): $month.barometer.min at $month.barometer.mintime;
$gettext("Max barometer"): $month.barometer.max at $month.barometer.maxtime;
$gettext("Max wind") : $month.wind.max $gettext("from") $month.wind.gustdir at $month.wind.maxtime;
$gettext("Min outside temperature"): $month.outTemp.min $gettext("at") $month.outTemp.mintime;
$gettext("Max outside temperature"): $month.outTemp.max $gettext("at") $month.outTemp.maxtime;
$gettext("Min inside temperature"): $month.inTemp.min $gettext("at") $month.inTemp.mintime;
$gettext("Max inside temperature"): $month.inTemp.max $gettext("at") $month.inTemp.maxtime;
$gettext("Min barometer"): $month.barometer.min $gettext("at") $month.barometer.mintime;
$gettext("Max barometer"): $month.barometer.max $gettext("at") $month.barometer.maxtime;
$gettext("Max wind") : $month.wind.max $gettext("from") $month.wind.gustdir $gettext("at") $month.wind.maxtime;
$gettext("Rain total for month"): $month.rain.sum
</description>
<pubDate>$current.dateTime.format("%a, %d %b %Y %H:%M:%S %Z")</pubDate>
<content:encoded><![CDATA[
<p>
$gettext("Month"): $month.dateTime.format("%B %Y")<br/>
$gettext("Max outside temperature"): $month.outTemp.max at $month.outTemp.maxtime<br/>
$gettext("Min outside temperature"): $month.outTemp.min at $month.outTemp.mintime<br/>
$gettext("Max inside temperature"): $month.inTemp.max at $month.inTemp.maxtime<br/>
$gettext("Min inside temperature"): $month.inTemp.min at $month.inTemp.mintime<br/>
$gettext("Min barometer"): $month.barometer.min at $month.barometer.mintime<br/>
$gettext("Max barometer"): $month.barometer.max at $month.barometer.maxtime<br/>
$gettext("Max wind") : $month.wind.max $gettext("from") $month.wind.gustdir at $month.wind.maxtime<br/>
$gettext("Max outside temperature"): $month.outTemp.max $gettext("at") $month.outTemp.maxtime<br/>
$gettext("Min outside temperature"): $month.outTemp.min $gettext("at") $month.outTemp.mintime<br/>
$gettext("Max inside temperature"): $month.inTemp.max $gettext("at") $month.inTemp.maxtime<br/>
$gettext("Min inside temperature"): $month.inTemp.min $gettext("at") $month.inTemp.mintime<br/>
$gettext("Min barometer"): $month.barometer.min $gettext("at") $month.barometer.mintime<br/>
$gettext("Max barometer"): $month.barometer.max $gettext("at") $month.barometer.maxtime<br/>
$gettext("Max wind") : $month.wind.max $gettext("from") $month.wind.gustdir $gettext("at") $month.wind.maxtime<br/>
$gettext("Rain total for month"): $month.rain.sum<br/>
</p>
]]></content:encoded>
@@ -107,26 +107,26 @@
<title>$gettext("Yearly Weather Summary as of") $current.dateTime</title>
<link>$station.station_url</link>
<description>
$gettext("Min outside temperature"): $year.outTemp.min at $year.outTemp.mintime;
$gettext("Max outside temperature"): $year.outTemp.max at $year.outTemp.maxtime;
$gettext("Min inside temperature"): $year.inTemp.min at $year.inTemp.mintime;
$gettext("Max inside temperature"): $year.inTemp.max at $year.inTemp.maxtime;
$gettext("Min barometer"): $year.barometer.min at $year.barometer.mintime;
$gettext("Max barometer"): $year.barometer.max at $year.barometer.maxtime;
$gettext("Max wind") : $year.wind.max $gettext("from") $year.wind.gustdir at $year.wind.maxtime;
$gettext("Min outside temperature"): $year.outTemp.min $gettext("at") $year.outTemp.mintime;
$gettext("Max outside temperature"): $year.outTemp.max $gettext("at") $year.outTemp.maxtime;
$gettext("Min inside temperature"): $year.inTemp.min $gettext("at") $year.inTemp.mintime;
$gettext("Max inside temperature"): $year.inTemp.max $gettext("at") $year.inTemp.maxtime;
$gettext("Min barometer"): $year.barometer.min $gettext("at") $year.barometer.mintime;
$gettext("Max barometer"): $year.barometer.max $gettext("at") $year.barometer.maxtime;
$gettext("Max wind") : $year.wind.max $gettext("from") $year.wind.gustdir $gettext("at") $year.wind.maxtime;
$gettext("Rain total for year"): $year.rain.sum
</description>
<pubDate>$current.dateTime.format("%a, %d %b %Y %H:%M:%S %Z")</pubDate>
<content:encoded><![CDATA[
<p>
$gettext("Year"): $year.dateTime.format("%Y")<br/>
$gettext("Max outside temperature"): $year.outTemp.max at $year.outTemp.maxtime<br/>
$gettext("Min outside temperature"): $year.outTemp.min at $year.outTemp.mintime<br/>
$gettext("Max inside temperature"): $year.inTemp.max at $year.inTemp.maxtime<br/>
$gettext("Min inside temperature"): $year.inTemp.min at $year.inTemp.mintime<br/>
$gettext("Min barometer"): $year.barometer.min at $year.barometer.mintime<br/>
$gettext("Max barometer"): $year.barometer.max at $year.barometer.maxtime<br/>
$gettext("Max wind") : $year.wind.max $gettext("from") $year.wind.gustdir at $year.wind.maxtime<br/>
$gettext("Max outside temperature"): $year.outTemp.max $gettext("at") $year.outTemp.maxtime<br/>
$gettext("Min outside temperature"): $year.outTemp.min $gettext("at") $year.outTemp.mintime<br/>
$gettext("Max inside temperature"): $year.inTemp.max $gettext("at") $year.inTemp.maxtime<br/>
$gettext("Min inside temperature"): $year.inTemp.min $gettext("at") $year.inTemp.mintime<br/>
$gettext("Min barometer"): $year.barometer.min $gettext("at") $year.barometer.mintime<br/>
$gettext("Max barometer"): $year.barometer.max $gettext("at") $year.barometer.maxtime<br/>
$gettext("Max wind") : $year.wind.max $gettext("from") $year.wind.gustdir $gettext("at") $year.wind.maxtime<br/>
$gettext("Rain total for year"): $year.rain.sum<br/>
</p>
]]></content:encoded>

2
skins/Standard/index.html.tmpl
View File

@@ -270,7 +270,7 @@
<img src="$Extras.radar_img" alt="Radar" />
#if 'radar_url' in $Extras
</a>
<p>Click image for expanded radar loop</p>
<p>$gettext("Click image for expanded radar loop")</p>
#end if
</div>
#end if

4
skins/Standard/smartphone/barometer.html.tmpl
View File

@@ -17,8 +17,8 @@
<h4>$gettext("24h") $obs.label.barometer</h4>
<img src="../daybarometer.png"/>
<ul>
<li>$gettext("Today's min"): $day.barometer.min at $day.barometer.mintime</li>
<li>$gettext("Today's max"): $day.barometer.max at $day.barometer.maxtime</li>
<li>$gettext("Today's min"): $day.barometer.min $gettext("at") $day.barometer.mintime</li>
<li>$gettext("Today's max"): $day.barometer.max $gettext("at") $day.barometer.maxtime</li>
</ul>
<h4>$gettext("7-day") $obs.label.barometer</h4>

2
skins/Standard/week.html.tmpl
View File

@@ -283,7 +283,7 @@
$gettext("High Wind")
</td>
<td class="stats_data">
$month.wind.max $gettext("from") $month.wind.gustdir $gettext("at") $month.wind.maxtime
$month.wind.max from $month.wind.gustdir $gettext("at") $month.wind.maxtime
</td>
</tr>
<tr>