whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #30924 from sftim/20211214_improve_release_data_shortcode

Browse Source 
Improve release data shortcode
This commit is contained in:
Kubernetes Prow Robot
2021-12-14 10:25:47 -08:00
committed by GitHub
parent 003ffe4b56 3fcc2c812f
commit 45342348cd
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/i18n/en/en.toml
+5
View File
@@ -217,6 +217,11 @@ other = ")"
[release_date_before]
other = "(released: "
# See https://gohugo.io/functions/format/#gos-layout-string
# Use a suitable format for your locale
[release_date_format]
other = "2006-01-02"
[seealso_heading]
other = "See Also"
layouts/shortcodes/release-data.html
+7 -8
View File
@@ -5,23 +5,22 @@
<div class="release-details">
{{ if not $data.previousPatches }}
<!-- initial minor release -->
<div>
<b class="release-inline-heading">{{ T "latest_release" }}</b><span class="release-version release-inline-value">{{ printf "%s.0" $dataVersion }}</span>
<b class="release-inline-heading">{{ T "latest_release" }}</b><span class="release-inline-value">{{ printf "%s.0" $dataVersion }}{{ if isset $data "releaseDate" }} {{ T "release_date_before" }}<time datetime="{{ time.Format "2006-01-02" $data.releaseDate }}">{{ time.Format ( T "release_date_format") $data.releaseDate }}</time>{{ T "release_date_after" }}{{- end -}}</span>
</div>
<div>
<b class="release-inline-heading">{{ T "end_of_life" }}</b><span class="release-eoldate release-inline-value">{{ printf "%s" $data.endOfLifeDate }}</span>
<b class="release-inline-heading">{{ T "end_of_life" }}</b><span class="release-eoldate release-inline-value"><time datetime="{{ time.Format "2006-01-02" $data.endOfLifeDate }}">{{ time.Format ( T "release_date_format") $data.endOfLifeDate }}</time></span>
</div>
<div>
<b class="release-inline-heading">{{ T "previous_patches" }}</b> <span class="notapplicable release-inline-value">{{ T "not_applicable" }}</span>
</div>
{{ end }}
{{ if $data.previousPatches }}
{{- else -}}
<div>
<b class="release-inline-heading">{{ T "latest_release" }}</b><span class="release-inline-value">{{ index $data.previousPatches 0 "release" }} {{ T "release_date_before" }}{{ index $data.previousPatches 0 "targetDate" }}{{ T "release_date_after" }}</span>
<b class="release-inline-heading">{{ T "latest_release" }}</b><span class="release-inline-value">{{ index $data.previousPatches 0 "release" }} {{ T "release_date_before" }}<time datetime="{{ time.Format "2006-01-02" ( index $data.previousPatches 0 "targetDate" ) }}">{{ time.Format ( T "release_date_format") ( index $data.previousPatches 0 "targetDate" ) }}</time>{{ T "release_date_after" }}</span>
</div>
<div>
<b class="release-inline-heading">{{ T "end_of_life" }}</b><span class="release-eoldate release-inline-value">{{ printf "%s" $data.endOfLifeDate }}</span>
<b class="release-inline-heading">{{ T "end_of_life" }}</b><span class="release-eoldate release-inline-value"><time datetime="{{ time.Format "2006-01-02" $data.endOfLifeDate }}">{{ time.Format ( T "release_date_format") $data.endOfLifeDate }}</time></span>
</div>
<div>
<b>{{ T "previous_patches" }}</b>
@@ -30,10 +29,10 @@
{{ if $key }}{{ T "inline_list_separator" }}{{ end }}
<a href="https://git.k8s.io/kubernetes/CHANGELOG/CHANGELOG-{{ $dataVersion }}.md#v{{ replace .release `.` `` }}">{{ printf "%s" .release }}</a>
{{- end -}}
{{- end -}}
</span>
</div>
{{- end -}}
<!-- not yet localized, mark as English -->
<p lang="en">
Complete {{ $dataVersion }} <a href="/releases/patch-releases/#{{ replace $dataVersion `.` `-` }}">Schedule</a>