Skip to content

Commit 36b7b3f

Browse files
davelab6felipesanches
authored andcommitted
Update OFL URL
New OFL website URL is expected, while the old one emits a WARN com.google.fonts/check/name/license_url On the Google Fonts Profile (issue #4358)
1 parent 779cb06 commit 36b7b3f

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ A more detailed list of changes is available in the corresponding milestones for
2323

2424
#### On the Google Fonts Profile
2525
- **[com.google.fonts/check/metadata/valid_name_values]:** Compare METADATA family name against the font's best family name (issue #4262)
26+
- **[com.google.fonts/check/name/license_url]:** New OFL website URL is expected, while the old one emits a WARN (issue #4358)
2627

2728
#### On the TypeNework Profile
2829
- Updated including latest universal checks and improved writing of some rationales and log messages. (PR #4402)

Lib/fontbakery/profiles/googlefonts.py

+14-4
Original file line numberDiff line numberDiff line change
@@ -1452,7 +1452,7 @@ def com_google_fonts_check_license_OFL_body_text(license_contents):
14521452
name table:
14531453
14541454
- "This Font Software is licensed under the SIL Open Font License, Version 1.1.
1455-
This license is available with a FAQ at: https://scripts.sil.org/OFL"
1455+
This license is available with a FAQ at: openfontlicense.org"
14561456
14571457
- "Licensed under the Apache License, Version 2.0"
14581458
@@ -1532,7 +1532,7 @@ def com_google_fonts_check_name_license(ttFont, license_filename):
15321532
The string snippets used for detecting licensing terms are:
15331533
15341534
- "This Font Software is licensed under the SIL Open Font License, Version 1.1.
1535-
This license is available with a FAQ at: https://scripts.sil.org/OFL"
1535+
This license is available with a FAQ at: openfontlicense.org"
15361536
15371537
- "Licensed under the Apache License, Version 2.0"
15381538
@@ -1545,15 +1545,18 @@ def com_google_fonts_check_name_license(ttFont, license_filename):
15451545
When in doubt, please choose OFL for new font projects.
15461546
""",
15471547
conditions=["familyname"],
1548-
proposal="legacy:check/030",
1548+
proposal=[
1549+
"legacy:check/030",
1550+
"https://github.com/fonttools/fontbakery/issues/4358",
1551+
],
15491552
)
15501553
def com_google_fonts_check_name_license_url(ttFont, familyname):
15511554
"""License URL matches License text on name table?"""
15521555
from fontbakery.constants import PLACEHOLDER_LICENSING_TEXT
15531556

15541557
LEGACY_UFL_FAMILIES = ["Ubuntu", "UbuntuCondensed", "UbuntuMono"]
15551558
LICENSE_URL = {
1556-
"OFL.txt": "https://scripts.sil.org/OFL",
1559+
"OFL.txt": "https://openfontlicense.org",
15571560
"LICENSE.txt": "https://www.apache.org/licenses/LICENSE-2.0",
15581561
"UFL.txt": "https://www.ubuntu.com/legal/terms-and-policies/font-licence",
15591562
}
@@ -1618,6 +1621,13 @@ def com_google_fonts_check_name_license_url(ttFont, familyname):
16181621
string = "https://".join(string.split("http://"))
16191622
if string == expected:
16201623
found_good_entry = True
1624+
elif "scripts.sil.org/OFL" in string:
1625+
found_good_entry = True
1626+
yield WARN, Message(
1627+
"deprecated-ofl-url",
1628+
'OFL url is no longer "https://scripts.sil.org/OFL". '
1629+
"Use 'https://openfontlicense.org' instead.",
1630+
)
16211631
else:
16221632
passed = False
16231633
yield FAIL, Message(

0 commit comments

Comments
 (0)