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

Jump to bottom

Issue#819 #857

Merged
merged 5 commits into from Sep 8, 2020
Merged

Issue#819 #857

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99c0f6c
Fixed issue that emits successful remote data twice with undefined pa…
atarix83 Sep 3, 2020
a76e079
Fixed issue with LocaleInterceptor that blocked new request
atarix83 Sep 3, 2020
b58defc
Revert "Fixed issue that emits successful remote data twice with unde…
atarix83 Sep 7, 2020
6feb344
Revert "Fixed issue with LocaleInterceptor that blocked new request"
atarix83 Sep 7, 2020
ac86976
Disabled EPerson language when sending Accept-Language header
atarix83 Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/app/core/locale/locale.service.ts
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ export enum LANG_ORIGIN {
UI,
EPERSON,
BROWSER
};
}

/**
* Service to provide localization handler
Expand Down Expand Up @@ -75,8 +75,9 @@ export class LocaleService {
return obs$.pipe(
take(1),
flatMap(([isAuthenticated, isLoaded]) => {
let epersonLang$: Observable<string[]> = observableOf([]);
if (isAuthenticated && isLoaded) {
// TODO to enabled again when https://github.com/DSpace/dspace-angular/issues/739 will be resolved
const epersonLang$: Observable<string[]> = observableOf([]);
/* if (isAuthenticated && isLoaded) {
epersonLang$ = this.authService.getAuthenticatedUserFromStore().pipe(
take(1),
map((eperson) => {
Expand All @@ -91,7 +92,7 @@ export class LocaleService {
return languages;
})
);
}
}*/
return epersonLang$.pipe(
map((epersonLang: string[]) => {
const languages: string[] = [];
Expand Down