Skip to content

Commit 166f142

Browse files
134770: Migrated @ngx-translate/core to standalone format
1 parent 954af96 commit 166f142

File tree

33 files changed

+79
-81
lines changed

33 files changed

+79
-81
lines changed

config/config.example.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ submission:
235235
style: text-muted
236236
icon: fa-circle-xmark
237237

238-
# Default Language in which the UI will be rendered if the user's browser language is not an active language
239-
defaultLanguage: en
238+
# Fallback language in which the UI will be rendered if the user's browser language is not an active language
239+
fallbackLanguage: en
240240

241241
# Languages. DSpace Angular holds a message catalog for each of the following languages.
242242
# When set to active, users will be able to switch to the use of this language in the user interface.

package-lock.json

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"@ngrx/effects": "^19.2.1",
102102
"@ngrx/router-store": "^19.2.1",
103103
"@ngrx/store": "^19.2.1",
104-
"@ngx-translate/core": "^16.0.3",
104+
"@ngx-translate/core": "^17.0.0",
105105
"@nicky-lenaers/ngx-scroll-to": "^14.0.0",
106106
"@terraformer/wkt": "^2.2.1",
107107
"altcha": "^0.9.0",

src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ describe('LdnServiceFormEditComponent', () => {
8686
instant: () => 'translated-text',
8787
onLangChange: new EventEmitter(),
8888
onTranslationChange: new EventEmitter(),
89-
onDefaultLangChange: new EventEmitter(),
89+
onFallbackLangChange: new EventEmitter(),
9090
};
9191

9292
beforeEach(async () => {

src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('LdnServicesOverviewComponent', () => {
4444
get: () => of('translated-text'),
4545
onLangChange: new EventEmitter(),
4646
onTranslationChange: new EventEmitter(),
47-
onDefaultLangChange: new EventEmitter(),
47+
onFallbackLangChange: new EventEmitter(),
4848
};
4949

5050
beforeEach(async () => {

src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
import {
32
Component,
43
EventEmitter,
@@ -7,13 +6,9 @@ import {
76
} from '@angular/core';
87
import { AdminNotifyMessage } from '@dspace/core/coar-notify/notify-info/models/admin-notify-message.model';
98
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
10-
import {
11-
TranslateModule,
12-
TranslateService,
13-
} from '@ngx-translate/core';
9+
import { TranslatePipe } from '@ngx-translate/core';
1410

1511
import { fadeIn } from '../../../shared/animations/fade';
16-
import { MissingTranslationHelper } from '../../../shared/translate/missing-translation.helper';
1712

1813
@Component({
1914
selector: 'ds-admin-notify-detail-modal',
@@ -22,7 +17,7 @@ import { MissingTranslationHelper } from '../../../shared/translate/missing-tran
2217
fadeIn,
2318
],
2419
imports: [
25-
TranslateModule,
20+
TranslatePipe,
2621
],
2722
})
2823
/**
@@ -42,9 +37,9 @@ export class AdminNotifyDetailModalComponent {
4237
public isCoarMessageVisible = false;
4338

4439

45-
constructor(protected activeModal: NgbActiveModal,
46-
public translationsService: TranslateService) {
47-
this.translationsService.missingTranslationHandler = new MissingTranslationHelper();
40+
constructor(
41+
protected activeModal: NgbActiveModal,
42+
) {
4843
}
4944

5045

src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ describe('CollectionItemMapperComponent', () => {
127127
get: () => of('test-message of collection ' + mockCollection.name),
128128
onLangChange: new EventEmitter(),
129129
onTranslationChange: new EventEmitter(),
130-
onDefaultLangChange: new EventEmitter(),
130+
onFallbackLangChange: new EventEmitter(),
131131
};
132132
const searchServiceStub = Object.assign(new SearchServiceStub(), {
133133
search: () => of(emptyList),

src/app/core/cookies/browser-orejime.service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ describe('BrowserOrejimeService', () => {
8787
enablePrivacyStatement: true,
8888
enableCookieConsentPopup: true,
8989
},
90-
defaultLanguage: 'en',
90+
fallbackLanguage: 'en',
9191
};
9292

9393
TestBed.configureTestingModule({

src/app/core/cookies/browser-orejime.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export class BrowserOrejimeService extends OrejimeService {
164164
}),
165165
);
166166

167-
this.translateService.setDefaultLang(this.appConfig.defaultLanguage);
167+
this.translateService.setFallbackLang(this.appConfig.fallbackLanguage);
168168

169169
const user$: Observable<EPerson> = this.getUser$();
170170

@@ -353,7 +353,7 @@ export class BrowserOrejimeService extends OrejimeService {
353353
/**
354354
* Make sure the fallback language is english
355355
*/
356-
this.translateService.setDefaultLang(this.appConfig.defaultLanguage);
356+
this.translateService.setFallbackLang(this.appConfig.fallbackLanguage);
357357

358358
this.translate(this.orejimeConfig.translations.zz);
359359
}

src/app/core/locale/locale.service.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
LocaleService,
2626
} from './locale.service';
2727

28-
describe('LocaleService test suite', () => {
28+
describe('LocaleService', () => {
2929
let service: LocaleService;
3030
let serviceAsAny: any;
3131
let cookieService: CookieService;
@@ -101,7 +101,7 @@ describe('LocaleService test suite', () => {
101101
{ provide: AuthService, useValue: authService },
102102
{ provide: RouteService, useValue: routeServiceStub },
103103
{ provide: Document, useValue: document },
104-
{ provide: APP_CONFIG, useValue: { languages, defaultLanguage: 'en' } },
104+
{ provide: APP_CONFIG, useValue: { languages, fallbackLanguage: 'en' } },
105105
LocaleService,
106106
],
107107
});
@@ -139,14 +139,14 @@ describe('LocaleService test suite', () => {
139139
});
140140
});
141141

142-
it('should return the default language if the cookie language is disabled', () => {
142+
it('should return the fallback language if the cookie language is disabled', () => {
143143
spyOnGet.and.returnValue('disabled');
144144
testScheduler.run(({ expectObservable }) => {
145145
expectObservable(service.getCurrentLanguageCode()).toBe('(a|)', { a: 'en' });
146146
});
147147
});
148148

149-
it('should return the default language if the cookie language does not exist', () => {
149+
it('should return the fallback language if the cookie language does not exist', () => {
150150
spyOnGet.and.returnValue('does-not-exist');
151151
testScheduler.run(({ expectObservable }) => {
152152
expectObservable(service.getCurrentLanguageCode()).toBe('(a|)', { a: 'en' });
@@ -179,15 +179,15 @@ describe('LocaleService test suite', () => {
179179
});
180180
});
181181

182-
it('should return default language list without user preferred language when no logged in user', () => {
182+
it('should return fallback language list without user preferred language when no logged in user', () => {
183183
authService.isAuthenticated.and.returnValue(of(false));
184184
authService.isAuthenticationLoaded.and.returnValue(of(false));
185185
testScheduler.run(({ expectObservable }) => {
186186
expectObservable(service.getLanguageCodeList()).toBe('(a|)', { a: ['en-US;q=1', 'en;q=0.9'] });
187187
});
188188
});
189189

190-
it('should return default language list with user preferred language when user is logged in', () => {
190+
it('should return fallback language list with user preferred language when user is logged in', () => {
191191
authService.isAuthenticated.and.returnValue(of(true));
192192
authService.isAuthenticationLoaded.and.returnValue(of(true));
193193
authService.getAuthenticatedUserFromStore.and.returnValue(of(EPersonMock2));

0 commit comments

Comments
 (0)