Skip to content

chore: merge master to epic/i18n-url-scheme mid Sprint A19S28 🌋 #716

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
darcywong00 wants to merge 3 commits into
base: epic/i18n-url-scheme
Choose a base branch
from
+6 −6
Open

chore: merge master to epic/i18n-url-scheme mid Sprint A19S28 🌋 #716

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
e35d73c
chore: Update links about SIL Global
darcywong00 Apr 21, 2026
25b2ae1
Merge pull request #711 from keymanapp/chore/sil-about
darcywong00 Apr 28, 2026
e78ae90
Merge remote-tracking branch 'origin/epic/i18n-url-scheme' into chore…
darcywong00 Apr 30, 2026
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
4 changes: 2 additions & 2 deletions _content/about/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ SIL Global is a faith-based nonprofit organization committed to serving language
worldwide as they build capacity for sustainable language development. SIL does this primarily
through research, translation, training and materials development.

You can learn more about SIL Global on the [SIL Global web site](https://www.sil.org/about).
You can learn more about SIL Global on the [SIL Global web site](https://global.sil.org/about/).

➡️ [About SIL Global](https://www.sil.org/about)
➡️ [About SIL Global](https://global.sil.org/about/)
2 changes: 1 addition & 1 deletion _content/free/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ are licensed under the MIT License. All lexical models in the
are also licensed under the MIT License. Copyright for these keyboards and
lexical models belongs to many different authors.

* [About SIL Global](https://www.sil.org/about)
* [About SIL Global](https://global.sil.org/about/)
* [About Keyman](../about)
2 changes: 1 addition & 1 deletion _content/sil-acquisition/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<p>If you have questions about the acquisition, and how it may affect you, please read our Frequently Asked Questions section below.</p>

<p><a href='http://www.sil.org/about/news/sil-acquires-rights-keyman'>Read the SIL announcement</a></p>
<p><a href='https://global.sil.org/stories-news/sil-acquires-rights-keyman/'>Read the SIL announcement</a></p>

<p class='center'><img class='inline' src='<?= cdn('img/android-splash.png'); ?>' alt='Keyman running on Android devices'></p>
<h4 class='caption'>Keyman running on Android devices</h4>
Expand Down
4 changes: 2 additions & 2 deletions _includes/2020/templates/Foot.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ static function render(array $fields = []) {
</div>
<div class="footer-third sil-logo">
<br>
<a href="/<?=$fields->lang?>/about/"><img id="sil-logo" src="<?php echo ImageRandomizer::randomizer(); ?>" width="50%" alt='SIL' /></a>
<p>Created by <a href="/<?=$fields->lang?>/about/">SIL Global</a></p>
<a href="https://global.sil.org/about/"><img id="sil-logo" src="<?php echo ImageRandomizer::randomizer(); ?>" width="50%" alt='SIL' /></a>
<p>Created by <a href="https://global.sil.org/about/">SIL Global</a></p>
</div>
</div>
</div>
Expand Down
Loading