Skip to content

Commit a65b1a3

Browse files
authored
Merge pull request #36375 from rolfedh/release-info
Fix release-data i18n
2 parents 982d01b + b6299f9 commit a65b1a3

File tree

2 files changed

+27
-4
lines changed

2 files changed

+27
-4
lines changed

data/i18n/en/en.toml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# i18n strings for the English (main) site.
22
# NOTE: Please keep the entries in alphabetical order when editing
3+
4+
# Avoid using conjunction_1.
5+
# Must match the context in layouts/shortcodes/release-data.html
6+
# Appears on https://kubernetes.io/releases/
7+
# For example the "and" in "Complete 1.25 Schedule and Changelog"
8+
[conjunction_1]
9+
other = "and"
10+
311
[caution]
412
other = "Caution:"
513

@@ -262,6 +270,21 @@ other = "(released: "
262270
[release_date_format]
263271
other = "2006-01-02"
264272

273+
# Deprecated. Planned for removal in a future release.
274+
# Use [release_full_details_initial_text] instead.
275+
[release_complete]
276+
other = "Complete"
277+
278+
# Replace [release_complete] with [release_full_details_initial_text]
279+
[release_full_details_initial_text]
280+
other = "Complete"
281+
282+
[release_schedule]
283+
other = "Schedule"
284+
285+
[release_changelog]
286+
other = "Changelog"
287+
265288
[seealso_heading]
266289
other = "See Also"
267290

layouts/shortcodes/release-data.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ <h3 id="release-v{{ $dataIdVersion }}">{{ $dataVersion }}</h3>
3333
</div>
3434

3535
{{- end -}}
36-
<!-- not yet localized, mark as English -->
37-
<p lang="en">
38-
Complete {{ $dataVersion }} <a href="/releases/patch-releases/#{{ replace $dataVersion `.` `-` }}">Schedule</a>
39-
and <a href="https://git.k8s.io/kubernetes/CHANGELOG/CHANGELOG-{{ $dataVersion }}.md">Changelog</a>
36+
<p>
37+
{{ T "release_full_details_initial_text" }} {{ $dataVersion }}
38+
<a href="/releases/patch-releases/#{{ replace $dataVersion `.` `-` }}">{{ T "release_schedule" }}</a> {{ T "conjunction_1" }}
39+
<a hreflang="en" href="https://git.k8s.io/kubernetes/CHANGELOG/CHANGELOG-{{ $dataVersion }}.md">{{ T "release_changelog" }}</a>
4040
</p>
4141

4242
</div>

0 commit comments

Comments
 (0)