Skip to content

Commit 2ad0b1e

Browse files
Improve locale lookup
1 parent b56cc38 commit 2ad0b1e

1 file changed

Lines changed: 11 additions & 9 deletions

File tree

extractor/src/main/java/org/schabi/newpipe/extractor/StreamingService.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -367,15 +367,17 @@ public List<ContentCountry> getSupportedCountries() {
367367
*/
368368
public Locale getLocale() {
369369
final var preferredLocale = NewPipe.getPreferredLocale();
370-
return getSupportedLocales().stream()
371-
.filter(locale -> {
372-
// Check the localization's language and country
373-
return preferredLocale.equals(locale)
374-
// Fallback to the first supported language that matches the preferred
375-
// language
376-
|| preferredLocale.getLanguage().equals(locale.getLanguage());
377-
})
378-
.findFirst().orElse(Locale.UK);
370+
final var supportedLocales = getSupportedLocales();
371+
if (supportedLocales.contains(preferredLocale)) {
372+
return preferredLocale;
373+
} else {
374+
return supportedLocales.stream()
375+
// Fallback to the first supported language that matches the preferred
376+
// language
377+
.filter(locale ->
378+
preferredLocale.getLanguage().equals(locale.getLanguage()))
379+
.findFirst().orElse(Locale.UK);
380+
}
379381
}
380382

381383
/**

0 commit comments

Comments
 (0)