Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ RewriteCond "%{HTTP_COOKIE}" embed_keyboards_no_locale_redirect [OR]
RewriteCond "%{QUERY_STRING}" embed
RewriteRule "^keyboards(/)?$" "/_content/keyboards/index.php" [END,QSA]

# Dedicated landing pages
RewriteCond "%{HTTP_COOKIE}" embed_keyboards_no_locale_redirect [OR]
RewriteCond "%{QUERY_STRING}" embed
RewriteRule "^keyboards/h/(.*)$" "/_content/keyboards/h/$1/index.php" [END,QSA]



Expand Down
5 changes: 4 additions & 1 deletion _content/keyboards/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ function _m($id, ...$args) { return Locale::m(LOCALE_KEYBOARDS, $id, ...$args
Menu::render([]); // we'll be doing client-side os detection now
Body::render();

$keyboardsPage = '/' . Locale::pageLocale() . '/keyboards/';
// For embedded mode, use root-level /keyboards, for Keyman 14.0-18.0.
// See .htaccess for full discussion (line ~32)
$keyboardsPage = ($embed != 'none') ? '/keyboards' :
'/' . Locale::pageLocale() . '/keyboards/';
?>

<script>
Expand Down
Loading