Skip to content

refactor fallback locale 🌋 #739

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 1 commit into
base: staging
Choose a base branch
from
+23 −9
Open

refactor fallback locale 🌋 #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions _includes/2020/templates/Head.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@ static function render($fields = []) {
// Redirect to /en/... if not a supported locale; this needs to be emitted
// as a HTTP header before first content byte.
if(Locale::invalidLocale()) {
if(preg_match('/^\\/[^\/]+\\/(.+)$/', $_SERVER['REQUEST_URI'], $matches)) {
header("Location: /" . Locale::DEFAULT_LOCALE . "/" . $matches[1]);
return;
}
Locale::redirectLocale();
}
?><!DOCTYPE html>
<html lang='<?=$fields->pageLocale?>'>
Expand Down
27 changes: 22 additions & 5 deletions _includes/locale/Locale.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,39 @@ public static function invalidLocale() {
return self::$invalidLocale;
}

/**
* Redirect page to specified locale. Default to 'en' if unspecified
* @param $newLocale
*/
public static function redirectLocale($newLocale = Locale::DEFAULT_LOCALE) {
if(preg_match('/^\\/[^\/]+\\/(.+)$/', $_SERVER['REQUEST_URI'], $matches)) {
header("Location: /" . $newLocale . "/" . $matches[1]);
return;
}
}

/**
* Set the current locale based on the first path component
* /<locale>/rest/of/path for the current page URL
*/
private static function setLocaleFromURL() {
// First component of the URL is always the locale
if(preg_match('/^\\/(([a-z]{2,3})(-([A-Za-z]{4}))?(-([a-z]{2}|[0-9]{3}))?)\\//', $_SERVER['REQUEST_URI'], $matches)) {
if(!isset(DISPLAY_NAMES[$matches[1]])) {
// Note: this is an unsupported locale, so we'll end up redirecting in head.php to /en/...
if(preg_match('/^\/(([a-z]{2,3})(-([A-Z][a-z]{3}))?(-([A-Z]{2}|[0-9]{3}))?)\//', $_SERVER['REQUEST_URI'], $matches)) {
$fallbackLocales = self::calculateFallbackLocales($matches[1]);
if (isset($fallbackLocales[0])) {
$pageLocale = $fallbackLocales[0];
if ($pageLocale != $matches[1]) {
// Redirect if using a fallback locale
Locale::redirectLocale($pageLocale);
}
} else {
// Note: this is an unsupported locale, so we'll end up redirect in head.php to /en/...
$pageLocale = Locale::DEFAULT_LOCALE;
self::$invalidLocale = true;
} else {
$pageLocale = $matches[1];
}
} else {
$pageLocale = Locale::DEFAULT_LOCALE;
// Don't set invalidLocale so pages like /_test/ work
}
self::setLocale($pageLocale);
}
Expand Down
Loading