Skip to content

chore: tidy up language check in menu globe button 🌋 #727

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

Merged
darcywong00 merged 2 commits into from
May 8, 2026
Merged

chore: tidy up language check in menu globe button 🌋 #727

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4af252f
chore: tidy up language check in menu globe button
darcywong00 May 8, 2026
89b50cd
fix: skip certain paths like _legacy
darcywong00 May 8, 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
13 changes: 6 additions & 7 deletions _includes/2020/templates/Menu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ public static function render(array $fields): void {
}

/**
* Modify link of the current URL for a given UI language
* Modify link of the current URL for a given UI language.
* Skip if current URL isn't localized (e.g. _legacy)
* @param language - language tag to use
* @return string - modified URL
*/
Expand All @@ -45,15 +46,13 @@ private static function change_ui_language($language): string {

$path = '';
// Replace language if current language in path is valid BCP-47
// Note: Validate::validate_bcp47 differs from regex in .htaccess
if (!empty($parts['path'])) {
$path = explode("/", $parts['path']);
if ($path[1] != null ) {
/* TODO: add validation back && class_exists('\\Keyman\\Site\\com\\keyman\\Validation') &&
\Keyman\Site\com\keyman\Validation::validate_bcp47($path[1]) != null*/
if ($path[1] == Locale::pageLocale()) {
$path[1] = $language;
} else {
// original URL didn't have a valid BCP-47 so inert it
} else if (preg_match('/^\/(_legacy)\/.*$/i', $path[1], $matches)) {
// original URL didn't have a valid BCP-47, so insert new langage
// Skip for certain paths like: _legacy
array_splice($path, 1, 0, $language);
}
}
Expand Down
Loading