Skip to content

Fix Issue 1876 #1877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix Issue 1876 #1877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e273571
Update Annual Report link
scottmakestech Mar 24, 2025
9d387ea
Fix image overflow in sponsor section. Move period into localization …
scottmakestech Mar 24, 2025
9d89b4f
Add support for fallback sentences for home hero and global impact se…
scottmakestech Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion i18n/cs.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ other = "Nezisková organizace poskytující bezplatné TLS certifikáty pro ví
other = "550 m"

[home_hero_nonprofit_suffix]
other = "webových stránek"
other = "webových stránek."

[projects_section_title]
other = "Více způsobů, jak zlepšujeme bezpečnost a soukromí"
Expand Down
4 changes: 2 additions & 2 deletions i18n/en.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ other = "ISRG"

# Home Hero - home_hero_nonprofit_sentence used if language does not follow English word order
[home_hero_nonprofit_sentence]
other = "A nonprofit providing free TLS certificates to more than ### websites"
other = "A nonprofit providing free TLS certificates to more than ### websites."

[home_hero_nonprofit_prefix]
other = "A nonprofit providing free TLS certificates to more than"
Expand All @@ -414,7 +414,7 @@ other = "A nonprofit providing free TLS certificates to more than"
other = "550M"

[home_hero_nonprofit_suffix]
other = "websites"
other = "websites."

[projects_section_title]
other = "More ways we're improving security and privacy"
Expand Down
2 changes: 1 addition & 1 deletion i18n/zh-cn.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ other = "A nonprofit providing free TLS certificates to more than"
other = "550M"

[home_hero_nonprofit_suffix]
other = "websites"
other = "websites."

[projects_section_title]
other = "我们促进互联网安全与隐私的其他方式"
Expand Down
24 changes: 12 additions & 12 deletions themes/le-2025/assets/css/le-2025-theme-output.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1813,30 +1813,30 @@ div[data-netlify-deploy-id] {
height: 400px;
}

.h-\[70px\] {
height: 70px;
.h-\[48px\] {
height: 48px;
}

.h-full {
height: 100%;
.h-\[64px\] {
height: 64px;
}

.h-\[70px\] {
height: 70px;
}

.max-h-\[48px\] {
max-height: 48px;
.h-\[80px\] {
height: 80px;
}

.max-h-\[64px\] {
max-height: 64px;
.h-full {
height: 100%;
}

.max-h-\[80\%\] {
max-height: 80%;
}

.max-h-\[80px\] {
max-height: 80px;
}

.min-h-full {
min-height: 100%;
}
Expand Down
4 changes: 2 additions & 2 deletions themes/le-2025/layouts/partials/components/sponsor-item.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{{ with .id }}id="{{ . }}"{{ end }}
{{ with .nofollow }}rel="nofollow"{{ end }}
{{ with .sponsored }}rel="sponsored"{{ end }}
class="border bg-white border-gray-200 rounded-lg p-2 flex items-center h-[70px] justify-center hover:border-gray-300 transition group">
class="border bg-white border-gray-200 rounded-lg p-2 flex items-center h-[70px] justify-center hover:border-gray-300 transition group {{ .class }}">
<img src="/images/sponsors/small/{{ .image }}"
alt="{{ .name }}"
class="w- max-w-[80%] max-h-[80%] transition-transform duration-200 ease-in-out group-hover:scale-105 {{ .class }}">
class=" max-w-[80%] max-h-[80%] transition-transform duration-200 ease-in-out group-hover:scale-105">
</a>
8 changes: 6 additions & 2 deletions themes/le-2025/layouts/partials/sections/home-hero.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ <h1 class="text-4xl md:text-6xl font-bold mb-3">
{{ safeHTML (T "home_hero_heading") }}
</h1>
<h2 class="text-2xl md:text-3xl font-bold mb-6 text-balance">
{{ T "home_hero_nonprofit_prefix" }} <span class="relative inline-block"><span class="invisible text-4xl">{{ T "home_hero_certificate_count" }}</span><span id="certificate-count" class="text-4xl absolute left-0">{{ T "home_hero_certificate_count" }}</span></span> {{ T "home_hero_nonprofit_suffix" }}.
{{ if and (T "home_hero_nonprofit_prefix") (T "home_hero_certificate_count") (T "home_hero_nonprofit_suffix") }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems both Crowdin and the T function of Hugo return the English text as a fallback, so this condition will always be true. What about doing something like this instead:

            <h2 class="text-2xl md:text-3xl font-bold mb-6 text-balance">
              {{ $count := (T "home_hero_certificate_count") }}
              {{ if findRE `^\d+M$` $count }}
                {{ $count = printf `<span class="relative inline-block"><span class="invisible text-4xl">%[1]s</span><span id="certificate-count" class="text-4xl absolute left-0">%[1]s</span></span>` $count }}
              {{ end }}

              {{ replace (T "home_hero_nonprofit_sentence") "###" $count | safeHTML }}
            </h2>

This also removes the need for home_hero_nonprofit_prefix and home_hero_nonprofit_suffix.

{{ T "home_hero_nonprofit_prefix" }} <span class="relative inline-block"><span class="invisible text-4xl">{{ T "home_hero_certificate_count" }}</span><span id="certificate-count" class="text-4xl absolute left-0">{{ T "home_hero_certificate_count" }}</span></span> {{ T "home_hero_nonprofit_suffix" }}
{{ else if and (T "home_hero_nonprofit_sentence") (T "home_hero_certificate_count") }}
{{ replace (T "home_hero_nonprofit_sentence") "###" (T "home_hero_certificate_count") }}
{{ end }}
</h2>
<hr class="w-20 border-le-yellow border-2 mb-7">
<div class="flex flex-wrap gap-4">
Expand Down Expand Up @@ -38,7 +42,7 @@ <h2 class="text-base font-bold mb-2">{{ T "home_hero_annual_report_title" }}</h2
<p class="mb-0 text-sm">{{ T "home_hero_annual_report_description" }}</p>
</div>
<div class="md:col-span-4 md:text-right">
<a href="/documents/annual-report-2024.pdf" class="text-sm btn btn-primary">
<a href="https://www.abetterinternet.org/documents/2024-ISRG-Annual-Report.pdf" class="text-sm btn btn-primary">
{{ T "home_hero_annual_report_button" }} →
</a>
</div>
Expand Down
8 changes: 4 additions & 4 deletions themes/le-2025/layouts/partials/sections/sponsors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h2 class="text-hero-heading mb-6">{{ i18n "sponsors_heading" }}</h2>
<h3 class="text-eyebrow mb-6">{{ i18n "sponsors_diamond" }}</h3>
<div class="grid grid-cols-2 md:grid-cols-3 gap-1">
{{ range $sponsor := . }}
{{ partial "components/sponsor-item" (dict "url" .url "id" .id "nofollow" .nofollow "sponsored" .sponsored "image" .image "name" .name "class" "max-h-[80px]") }}
{{ partial "components/sponsor-item" (dict "url" .url "id" .id "nofollow" .nofollow "sponsored" .sponsored "image" .image "name" .name "class" "h-[80px]") }}
{{ end }}
</div>
</div>
Expand All @@ -21,7 +21,7 @@ <h3 class="text-eyebrow mb-6">{{ i18n "sponsors_diamond" }}</h3>
<h3 class="text-eyebrow mb-6">{{ i18n "sponsors_platinum" }}</h3>
<div class="grid grid-cols-3 md:grid-cols-4 gap-1">
{{ range $sponsor := . }}
{{ partial "components/sponsor-item" (dict "url" .url "id" .id "nofollow" .nofollow "sponsored" .sponsored "image" .image "name" .name "class" "max-h-[64px]") }}
{{ partial "components/sponsor-item" (dict "url" .url "id" .id "nofollow" .nofollow "sponsored" .sponsored "image" .image "name" .name "class" "h-[64px]") }}
{{ end }}
</div>
</div>
Expand All @@ -32,7 +32,7 @@ <h3 class="text-eyebrow mb-6">{{ i18n "sponsors_platinum" }}</h3>
<h3 class="text-eyebrow mb-6">{{ i18n "sponsors_gold" }}</h3>
<div class="grid grid-cols-4 md:grid-cols-6 gap-1">
{{ range $sponsor := . }}
{{ partial "components/sponsor-item" (dict "url" .url "id" .id "nofollow" .nofollow "sponsored" .sponsored "image" .image "name" .name "class" "max-h-[48px]") }}
{{ partial "components/sponsor-item" (dict "url" .url "id" .id "nofollow" .nofollow "sponsored" .sponsored "image" .image "name" .name "class" "h-[48px]") }}
{{ end }}
</div>
</div>
Expand All @@ -43,7 +43,7 @@ <h3 class="text-eyebrow mb-6">{{ i18n "sponsors_gold" }}</h3>
<h3 class="text-eyebrow mb-6">{{ i18n "sponsors_silver" }}</h3>
<div class="grid grid-cols-4 md:grid-cols-6 gap-1">
{{ range $sponsor := . }}
{{ partial "components/sponsor-item" (dict "url" .url "id" .id "nofollow" .nofollow "sponsored" .sponsored "image" .image "name" .name "class" "max-h-[48px]") }}
{{ partial "components/sponsor-item" (dict "url" .url "id" .id "nofollow" .nofollow "sponsored" .sponsored "image" .image "name" .name "class" "h-[48px]") }}
{{ end }}
</div>
</div>
Expand Down
15 changes: 10 additions & 5 deletions themes/le-2025/layouts/partials/sections/support.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@
<div class="relative z-10">
<div class="container mx-auto">
<h2 class="text-left text-3xl md:text-4xl font-bold mb-8">
{{ i18n "support_heading_base" }} <span class="text-le-blue rotate-words"
data-word1="{{ i18n "support_heading_word1" }}"
data-word2="{{ i18n "support_heading_word2" }}"
data-word3="{{ i18n "support_heading_word3" }}"
data-word4="{{ i18n "support_heading_word4" }}">{{ i18n "support_heading_word1" }}</span>
{{ if and (i18n "support_heading_base") (i18n "support_heading_word1") (i18n "support_heading_word2") (i18n "support_heading_word3") (i18n "support_heading_word4") }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similarly always true. How about:

Suggested change
{{ if and (i18n "support_heading_base") (i18n "support_heading_word1") (i18n "support_heading_word2") (i18n "support_heading_word3") (i18n "support_heading_word4") }}
{{ if hasPrefix (i18n "support_heading_entire_sentence") (i18n "support_heading_base") }}

{{ i18n "support_heading_base" }}
<span class="text-le-blue rotate-words"
data-word1="{{ i18n "support_heading_word1" }}"
data-word2="{{ i18n "support_heading_word2" }}"
data-word3="{{ i18n "support_heading_word3" }}"
data-word4="{{ i18n "support_heading_word4" }}">{{ i18n "support_heading_word1" }}</span>
{{ else if i18n "support_heading_entire_sentence" }}
{{ i18n "support_heading_entire_sentence" }}
{{ end }}
</h2>

<script>
Expand Down
Loading