Skip to content

Fix browser language detection for region specific languages (#8982) #9026

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
bramkragten merged 5 commits into from
Apr 29, 2021
Merged

Fix browser language detection for region specific languages (#8982) #9026

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f80f83f
Fix browser language detection for region specific languages (#8982)
rmogstad Apr 28, 2021
25cd7c7
CR feedback
rmogstad Apr 28, 2021
440f8c2
Update src/util/hass-translation.ts
rmogstad Apr 29, 2021
6117055
Update src/util/hass-translation.ts
rmogstad Apr 29, 2021
e651b7f
Update src/util/hass-translation.ts
rmogstad Apr 29, 2021
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
21 changes: 13 additions & 8 deletions src/util/hass-translation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,21 @@ export function findAvailableLanguage(language: string) {
return LOCALE_LOOKUP[langLower];
}

return Object.keys(translationMetadata.translations).find(
let translation = Object.keys(translationMetadata.translations).find(
Comment thread
rmogstad marked this conversation as resolved.
Outdated
(lang) => lang.toLowerCase() === langLower
);
if (translation) {
return translation;
}

if (language.includes("-")) {
translation = findAvailableLanguage(language.split("-")[0]);
if (translation) {
return translation;
}
Comment thread
rmogstad marked this conversation as resolved.
Outdated
}

return null;
Comment thread
rmogstad marked this conversation as resolved.
Outdated
}

/**
Expand Down Expand Up @@ -94,13 +106,6 @@ export function getLocalLanguage() {
if (language) {
return language;
}
if (navigator.language && navigator.language.includes("-")) {
language = findAvailableLanguage(navigator.language.split("-")[0]);
if (language) {
return language;
}
}
Comment on lines -97 to -102

@bramkragten bramkragten Apr 28, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think adding it to navigator.languages makes sense, but we should not remove it here? We should instead make a helper function for:

      language = findAvailableLanguage(locale);
      if (language) {
        return language;
      }
      if (locale.includes("-")) {
        language = findAvailableLanguage(locale.split("-")[0]);
        if (language) {
          return language;
        }
      }

@rmogstad rmogstad Apr 28, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

OK, I see. I misunderstood what navigator.language was. I will make a method and call it in both places.

@rmogstad rmogstad Apr 28, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I made a change that is a little different. I couldn't think of a good name for the helper function, and it seemed like something we would want to always check when searching for an available translation, so I added it to that function.

I'll understand if you prefer not to have the recursive call there and want me to break it out differently.

This is my first time doing a CR on github, first time submitting to HA (or any OS project, for that matter), and first time working with TS, so I'm not super familiar with the industry best practices, nor with the project best practices. I am more than happy to make changes to make it

I am in the discord (@Zondebok) if you want to discuss directly.


// Final fallback
return "en";
}
Expand Down