Skip to content
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

Workaround the Chromium bug with navigator.language #17094

Merged
merged 1 commit into from
Dec 18, 2024
Merged

Workaround the Chromium bug with navigator.language #17094

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
7 changes: 5 additions & 2 deletions packages/filebrowser/src/listing.ts
View file
Original file line number Diff line number Diff line change
@@ -3569,8 +3569,11 @@ namespace Private {
* Compare two items by their name using `translator.languageCode`, with fallback to `navigator.language`.
*/
function compareByName(a: Contents.IModel, b: Contents.IModel) {
// Wokaround for Chromium invalid language code on CI, see
// https://github.com/jupyterlab/jupyterlab/issues/17079
const navigatorLanguage = navigator.language.split('@')[0];
const languageCode = (
translator.languageCode ?? navigator.language
translator.languageCode ?? navigatorLanguage
).replace('_', '-');
try {
return a.name.localeCompare(b.name, languageCode, {
@@ -3581,7 +3584,7 @@ namespace Private {
console.warn(
`localeCompare failed to compare ${a.name} and ${b.name} under languageCode: ${languageCode}`
);
return a.name.localeCompare(b.name, navigator.language, {
return a.name.localeCompare(b.name, navigatorLanguage, {
numeric: true,
sensitivity: 'base'
});
Loading