Skip to content

chore: merge staging to master (launch epic/web-i18n)#746

Merged
mcdurdin merged 190 commits into
masterfrom
chore/merge-staging-to-master-web-i18n
May 19, 2026
Merged

chore: merge staging to master (launch epic/web-i18n)#746
mcdurdin merged 190 commits into
masterfrom
chore/merge-staging-to-master-web-i18n

Conversation

@mcdurdin
Copy link
Copy Markdown
Member

Test-bot: skip

darcywong00 and others added 30 commits February 15, 2024 10:18
…b17s1

chore: Merge master to staging for Sprint B17S1
…a18s15

chore: Merge master to staging for Sprint A18S15
chore: mid-sprint merge of master to staging for A18S16
chore: Merge master to staging for Sprint A18S20
Merge master to staging for beginning of Sprint B18S1
…b18s2

chore: Merge master to staging for Sprint B18S2
…b18s3

chore: merge master to staging for Sprint B18S3
…-b18s4

chore: Merge master to staging for Sprint B18S4
chore: Merge master to staging for Sprint B18S5
fix: Disallow all bots since staging site doesn't need to be indexed
…a19s1

chore: Merge master to staging for Sprint A19S1
…a19s2

chore: Merge master to staging for Sprint A19S2
…a18s3

chore: Merge master to staging for Sprint A19S3
…a19s9

chore: Merge master to staging for Sprint A19S9
…a19s10

chore: Merge master to staging for Sprint A19S10
darcywong00 and others added 19 commits May 11, 2026 12:39
…staging

cherrypick: epic/i18n-url-scheme to staging
…staging

auto: A19S28 merge master into staging
Keyman 14.0 - 18.0 have a dependency on /keyboards which means that we
cannot rewrite URLs there when we are in 'embed' mode for those apps.
The apps check if the URL starts with /keyboards, and handle those paths
internally, while opening other URLs in an external browser.

See keymanapp/keyman#15948 for
platform-specific dependencies on this behaviour and for v19.0 planned
mitigations.

Also remove _ie_thunk and _legacy from .htaccess as these are no longer
required following removal of pre-Keyman-13.0 support.

Relates-to: keymanapp/keyman#15948
fix: rewrite /keyboards for embed mode and skip localization
fix: allow broken-link-checker to run on staging site
fix: set embed_keyboards_no_locale_redirect for entire domain
…-landings

fix: Check embed for "new search" and dedicated landing pages
Add locales.json with the list of available locales and language names,
update Locale.php to read that, and build a preprocess stage for
.htaccess to leverage that single source of truth for supported locales.

Test-bot: skip
feat: centralize supported locales and rebuild .htaccess with @Locale
fix globe button regex to ignore /_test/ folder 🌋
In order for the cookie to be set on Keyman for Windows embed keyboard
search, we need SameSite=None, because otherwise Chromium will block
it as a cross-site cookie, due to the the embed being in an iframe.

Relates-to: keymanapp/keyman#15957
Test-bot: skip
fix: use SameSite=None for embed cookie
@keymanapp-test-bot
Copy link
Copy Markdown

User Test Results

Test specification and instructions

User tests are not required

@keymanapp-test-bot keymanapp-test-bot Bot added this to the A19S29 milestone May 19, 2026
Copy link
Copy Markdown
Contributor

@darcywong00 darcywong00 left a comment

Choose a reason for hiding this comment

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

will do a smoke test...

Comment thread robots.txt Outdated
# This bot is too busy (300K+ visits/month across all keyman.com domains)
User-agent: TurnitinBot
# Disallow all bots since we don't need anything indexed on the staging site
User-agent: *
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think robots.txt we just add the bits to allow broken-link-checker to the existing file?

(remove the "Disallow all bots...") cause that was just for staging

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Restoring the version from master; the broken-link-checker is then allowed to run by default anyway

Copy link
Copy Markdown
Contributor

@darcywong00 darcywong00 left a comment

Choose a reason for hiding this comment

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

yeah the site and keyboard search is working

can cleanup robots.txt and TODO.md

Comment thread TODO.md Outdated
3. rewrite for .md would embed the lang parameter and the appropriate _content path also.

* Fixup absolute links in _content/ files to relative links
* Fixup absolute links in header files to relative links (make a helper function?)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

wonder if we clean this up / move to wiki?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

pulling this out of the PR and adding to issue #747, will review

@mcdurdin mcdurdin merged commit ef647e0 into master May 19, 2026
5 checks passed
@mcdurdin mcdurdin deleted the chore/merge-staging-to-master-web-i18n branch May 19, 2026 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants