fxLayoutGap="8px"
>
@@ -63,25 +64,13 @@
Question #{{ questionIndex + 1 }}
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
diff --git a/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.scss b/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.scss
index 41baff19086..e2b65bf609f 100644
--- a/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.scss
+++ b/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.scss
@@ -48,3 +48,7 @@ li {
.question-input {
width: 100%;
}
+
+.question-button-div {
+ height: 100%;
+}
\ No newline at end of file
diff --git a/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts b/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts
index 8292bafc22a..f9489c8cd45 100644
--- a/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts
+++ b/src/app/authoring-tool/edit-question-bank-rules/edit-question-bank-rules.component.ts
@@ -54,4 +54,10 @@ export class EditQuestionBankRulesComponent extends EditFeedbackRulesComponent {
customTrackBy(index: number): number {
return index;
}
+
+ protected getQuestionLabel(rule: QuestionBankRule, questionIndex: number): string {
+ return rule.questions.length === 1
+ ? $localize`Question`
+ : $localize`Question #${questionIndex + 1}`;
+ }
}
diff --git a/src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html b/src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html
index f176c47c459..8404976fb3f 100644
--- a/src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html
+++ b/src/app/authoring-tool/edit-question-bank/edit-question-bank.component.html
@@ -11,16 +11,13 @@
-
- Custom Label
-
-
+
+ arrow_drop_downtranslate {{ selectedLanguage.language }}
+
+
+
+
diff --git a/src/app/common/project-language-chooser/project-language-chooser.component.scss b/src/app/common/project-language-chooser/project-language-chooser.component.scss
new file mode 100644
index 00000000000..2cf5c68da5b
--- /dev/null
+++ b/src/app/common/project-language-chooser/project-language-chooser.component.scss
@@ -0,0 +1,3 @@
+.mat-mdc-button {
+ text-transform: none;
+}
diff --git a/src/app/common/project-language-chooser/project-language-chooser.component.spec.ts b/src/app/common/project-language-chooser/project-language-chooser.component.spec.ts
new file mode 100644
index 00000000000..3dfb285e3fe
--- /dev/null
+++ b/src/app/common/project-language-chooser/project-language-chooser.component.spec.ts
@@ -0,0 +1,69 @@
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ProjectLanguageChooserComponent } from './project-language-chooser.component';
+import { ProjectLocale } from '../../domain/projectLocale';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { HarnessLoader } from '@angular/cdk/testing';
+import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
+import { MatMenuHarness, MatMenuItemHarness } from '@angular/material/menu/testing';
+import { ProjectService } from '../../../assets/wise5/services/projectService';
+
+class MockProjectService {
+ currentLanguage() {
+ return null;
+ }
+}
+
+let loader: HarnessLoader;
+let component: ProjectLanguageChooserComponent;
+let fixture: ComponentFixture;
+describe('ProjectLanguageChooserComponent', () => {
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [BrowserAnimationsModule, HttpClientTestingModule, ProjectLanguageChooserComponent],
+ providers: [{ provide: ProjectService, useClass: MockProjectService }]
+ }).compileComponents();
+ });
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ProjectLanguageChooserComponent);
+ loader = TestbedHarnessEnvironment.loader(fixture);
+ component = fixture.componentInstance;
+ setProjectLocale(new ProjectLocale({ default: 'en_US', supported: ['ja', 'es'] }));
+ });
+
+ it('shows available languages and selects the default language', async () => {
+ const options = await getOptions();
+ expect(options.length).toEqual(3);
+ expect(await options[0].getText()).toMatch('English');
+ expect(await options[1].getText()).toMatch('Japanese');
+ expect(await options[2].getText()).toMatch('Spanish');
+ const selected = await options[0].host();
+ expect(await selected.getAttribute('class')).toContain('primary');
+ });
+
+ it('keeps selected language option when language option changes', async () => {
+ const menuHarness = await loader.getHarness(MatMenuHarness);
+ await menuHarness.clickItem({ text: 'Japanese' });
+ spyOn(TestBed.inject(ProjectService), 'currentLanguage').and.returnValue({
+ locale: 'ja',
+ language: 'Japanese'
+ });
+ setProjectLocale(new ProjectLocale({ default: 'it', supported: ['de', 'fr', 'ja', 'es'] }));
+ const options = await getOptions();
+ const selected = await options[3].host();
+ expect(await selected.getAttribute('class')).toContain('primary');
+ });
+});
+
+function setProjectLocale(locale: ProjectLocale): void {
+ component.projectLocale = locale;
+ component.ngOnChanges();
+ fixture.detectChanges();
+}
+
+async function getOptions(): Promise {
+ const menuHarness = await loader.getHarness(MatMenuHarness);
+ await menuHarness.open();
+ return await menuHarness.getItems();
+}
diff --git a/src/app/common/project-language-chooser/project-language-chooser.component.ts b/src/app/common/project-language-chooser/project-language-chooser.component.ts
new file mode 100644
index 00000000000..b0b91913d0a
--- /dev/null
+++ b/src/app/common/project-language-chooser/project-language-chooser.component.ts
@@ -0,0 +1,42 @@
+import { CommonModule } from '@angular/common';
+import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
+import { Language } from '../../domain/language';
+import { ProjectLocale } from '../../domain/projectLocale';
+import { MatMenuModule } from '@angular/material/menu';
+import { MatIconModule } from '@angular/material/icon';
+import { MatButtonModule } from '@angular/material/button';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { ProjectService } from '../../../assets/wise5/services/projectService';
+
+@Component({
+ standalone: true,
+ selector: 'project-language-chooser',
+ styleUrl: './project-language-chooser.component.scss',
+ imports: [CommonModule, MatButtonModule, MatIconModule, MatMenuModule, MatTooltipModule],
+ templateUrl: './project-language-chooser.component.html'
+})
+export class ProjectLanguageChooserComponent implements OnChanges {
+ protected availableLanguages: Language[];
+ @Output() languageChangedEvent = new EventEmitter();
+ @Input() projectLocale: ProjectLocale;
+ protected selectedLanguage: Language;
+ @Input() tooltip: string = $localize`Select language`;
+
+ constructor(private projectService: ProjectService) {}
+
+ ngOnChanges(): void {
+ this.availableLanguages = this.projectLocale.getAvailableLanguages();
+ this.selectedLanguage = this.projectService.currentLanguage();
+ if (
+ this.selectedLanguage == null ||
+ !this.availableLanguages.some((lang) => lang.locale === this.selectedLanguage.locale)
+ ) {
+ this.selectedLanguage = this.projectLocale.getDefaultLanguage();
+ }
+ }
+
+ protected changeLanguage(language: Language): void {
+ this.selectedLanguage = language;
+ this.languageChangedEvent.emit(language);
+ }
+}
diff --git a/src/app/domain/language.ts b/src/app/domain/language.ts
new file mode 100644
index 00000000000..9a73bb4f2a8
--- /dev/null
+++ b/src/app/domain/language.ts
@@ -0,0 +1,4 @@
+export interface Language {
+ language: string;
+ locale: string;
+}
diff --git a/src/app/domain/localeToLanguage.ts b/src/app/domain/localeToLanguage.ts
new file mode 100644
index 00000000000..c18f05d2bbc
--- /dev/null
+++ b/src/app/domain/localeToLanguage.ts
@@ -0,0 +1,12 @@
+export const localeToLanguage: { [locale: string]: string } = {
+ zh_CN: $localize`Chinese (Simplified)`,
+ zh_TW: $localize`Chinese (Traditional)`,
+ nl: $localize`Dutch`,
+ en_US: $localize`English`,
+ de: $localize`German`,
+ it: $localize`Italian`,
+ ja: $localize`Japanese`,
+ ko: $localize`Korean`,
+ es: $localize`Spanish`,
+ vi: $localize`Vietnamese`
+};
diff --git a/src/app/domain/projectLocale.ts b/src/app/domain/projectLocale.ts
new file mode 100644
index 00000000000..6c1e676d0b2
--- /dev/null
+++ b/src/app/domain/projectLocale.ts
@@ -0,0 +1,52 @@
+import { Language } from './language';
+import { localeToLanguage } from './localeToLanguage';
+
+export class ProjectLocale {
+ private locale: { default: string; supported: string[] };
+
+ constructor(locale: any) {
+ this.locale = locale;
+ }
+
+ getAvailableLanguages(): Language[] {
+ return [this.getDefaultLanguage()].concat(this.getSupportedLanguages());
+ }
+
+ getDefaultLanguage(): Language {
+ return { language: localeToLanguage[this.locale.default], locale: this.locale.default };
+ }
+
+ setDefaultLocale(locale: string): void {
+ this.locale.default = locale;
+ this.locale.supported = this.locale.supported.filter(
+ (supportedLocale) => supportedLocale != locale
+ );
+ }
+
+ getSupportedLanguages(): Language[] {
+ return this.locale.supported.map((locale) => ({
+ language: localeToLanguage[locale],
+ locale: locale
+ }));
+ }
+
+ setSupportedLanguages(languages: Language[]): void {
+ this.locale.supported = languages.map((language) => language.locale);
+ }
+
+ hasTranslations(): boolean {
+ return this.locale.supported.length > 0;
+ }
+
+ hasTranslationsToApply(locale: string): boolean {
+ return !this.isDefaultLocale(locale) && this.hasLocale(locale);
+ }
+
+ isDefaultLocale(locale: string): boolean {
+ return this.locale.default === locale;
+ }
+
+ private hasLocale(locale: string): boolean {
+ return this.locale.supported.includes(locale);
+ }
+}
diff --git a/src/app/domain/translations.ts b/src/app/domain/translations.ts
new file mode 100644
index 00000000000..c8aadf8f3bf
--- /dev/null
+++ b/src/app/domain/translations.ts
@@ -0,0 +1,6 @@
+export interface Translations extends Record {}
+
+export interface TranslationValue {
+ value: string;
+ modified: number;
+}
diff --git a/src/app/notebook/notebook-item/notebook-item.component.ts b/src/app/notebook/notebook-item/notebook-item.component.ts
index 938e3af8212..3e8441110fa 100644
--- a/src/app/notebook/notebook-item/notebook-item.component.ts
+++ b/src/app/notebook/notebook-item/notebook-item.component.ts
@@ -55,6 +55,10 @@ export class NotebookItemComponent {
);
}
+ ngOnChanges(): void {
+ this.label = this.config.itemTypes[this.type].label;
+ }
+
ngOnDestroy(): void {
this.notebookUpdatedSubscription.unsubscribe();
}
diff --git a/src/app/notebook/notebook-launcher/notebook-launcher.component.ts b/src/app/notebook/notebook-launcher/notebook-launcher.component.ts
index 5f47babf9b4..8140bc35885 100644
--- a/src/app/notebook/notebook-launcher/notebook-launcher.component.ts
+++ b/src/app/notebook/notebook-launcher/notebook-launcher.component.ts
@@ -1,5 +1,7 @@
import { Component, Input } from '@angular/core';
import { NotebookService } from '../../../assets/wise5/services/notebookService';
+import { ProjectService } from '../../../assets/wise5/services/projectService';
+import { Subscription } from 'rxjs';
import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { MatTooltipModule } from '@angular/material/tooltip';
@@ -13,10 +15,20 @@ import { MatTooltipModule } from '@angular/material/tooltip';
export class NotebookLauncherComponent {
protected label: string = '';
@Input() notebookConfig: any;
+ private subscription: Subscription = new Subscription();
- constructor(private notebookService: NotebookService) {}
+ constructor(private notebookService: NotebookService, private projectService: ProjectService) {}
ngOnInit(): void {
+ this.setLabel();
+ this.subscription.add(this.projectService.projectParsed$.subscribe(() => this.setLabel()));
+ }
+
+ ngOnDestroy(): void {
+ this.subscription.unsubscribe();
+ }
+
+ private setLabel(): void {
this.label = this.notebookConfig.itemTypes.note.label.link;
}
diff --git a/src/app/notebook/notebook-notes/notebook-notes.component.ts b/src/app/notebook/notebook-notes/notebook-notes.component.ts
index 70f3193ae21..40c86cc97e6 100644
--- a/src/app/notebook/notebook-notes/notebook-notes.component.ts
+++ b/src/app/notebook/notebook-notes/notebook-notes.component.ts
@@ -37,7 +37,7 @@ export class NotebookNotesComponent extends NotebookParentComponent {
ngOnInit(): void {
super.ngOnInit();
- this.label = this.config.itemTypes.note.label;
+ this.setLabel();
this.addPersonalGroupToGroups();
this.addSpacesToGroups();
this.hasPrivateNotes = this.isHasPrivateNotes();
@@ -76,6 +76,13 @@ export class NotebookNotesComponent extends NotebookParentComponent {
})
);
+ this.subscriptions.add(
+ this.ProjectService.projectParsed$.subscribe(() => {
+ this.setConfig();
+ this.setLabel();
+ })
+ );
+
this.NotebookService.retrievePublicNotebookItems('public');
}
@@ -83,6 +90,10 @@ export class NotebookNotesComponent extends NotebookParentComponent {
this.subscriptions.unsubscribe();
}
+ private setLabel(): void {
+ this.label = this.config.itemTypes.note.label;
+ }
+
isHasPrivateNotes(): boolean {
return this.groupNameToGroup['private'].items.some((note) => note.serverDeleteTime == null);
}
diff --git a/src/app/notebook/notebook-report/notebook-report.component.ts b/src/app/notebook/notebook-report/notebook-report.component.ts
index 0b4c4804257..178efd3d989 100644
--- a/src/app/notebook/notebook-report/notebook-report.component.ts
+++ b/src/app/notebook/notebook-report/notebook-report.component.ts
@@ -56,9 +56,6 @@ export class NotebookReportComponent extends NotebookParentComponent {
if (this.mode !== 'classroomMonitor') {
this.reportItem.id = null; // set the id to null so it can be inserted as initial version, as opposed to updated. this is true for both new and just-loaded reports.
}
- this.reportItemContent = this.ProjectService.injectAssetPaths(
- replaceWiseLinks(this.reportItem.content.content)
- );
this.latestAnnotations = this.AnnotationService.getLatestNotebookItemAnnotations(
this.workgroupId,
this.reportId
@@ -105,6 +102,15 @@ export class NotebookReportComponent extends NotebookParentComponent {
}
})
);
+
+ this.subscriptions.add(
+ this.ProjectService.projectParsed$.subscribe(() => {
+ if (this.saveTime == null) {
+ this.setConfig();
+ this.setReportItem();
+ }
+ })
+ );
}
ngOnDestroy(): void {
@@ -125,6 +131,11 @@ export class NotebookReportComponent extends NotebookParentComponent {
} else {
this.reportItem = this.NotebookService.getTemplateReportItemByReportId(this.reportId);
}
+ if (this.reportItem != null) {
+ this.reportItemContent = this.ProjectService.injectAssetPaths(
+ replaceWiseLinks(this.reportItem.content.content)
+ );
+ }
}
calculateHasAnnotation(latestAnnotations: any): boolean {
diff --git a/src/app/services/copyTranslationsService.spec.ts b/src/app/services/copyTranslationsService.spec.ts
new file mode 100644
index 00000000000..f6cdf577fc1
--- /dev/null
+++ b/src/app/services/copyTranslationsService.spec.ts
@@ -0,0 +1,50 @@
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
+import { TeacherProjectService } from '../../assets/wise5/services/teacherProjectService';
+import { StudentTeacherCommonServicesModule } from '../student-teacher-common-services.module';
+import { ProjectLocale } from '../domain/projectLocale';
+import { ComponentContent } from '../../assets/wise5/common/ComponentContent';
+import { ConfigService } from '../../assets/wise5/services/configService';
+import { CopyTranslationsService } from '../../assets/wise5/services/copyTranslationsService';
+import { Node } from '../../assets/wise5/common/Node';
+
+let configService: ConfigService;
+let http: HttpTestingController;
+let projectService: TeacherProjectService;
+let service: CopyTranslationsService;
+describe('CopyTranslationsService', () => {
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ imports: [HttpClientTestingModule, StudentTeacherCommonServicesModule],
+ providers: [CopyTranslationsService, TeacherProjectService],
+ teardown: { destroyAfterEach: false }
+ });
+ configService = TestBed.inject(ConfigService);
+ http = TestBed.inject(HttpTestingController);
+ projectService = TestBed.inject(TeacherProjectService);
+ service = TestBed.inject(CopyTranslationsService);
+ });
+ tryCopyComponents();
+});
+
+function tryCopyComponents() {
+ describe('tryCopyComponents()', () => {
+ it('fetches all supported translations', () => {
+ spyOn(projectService, 'getLocale').and.returnValue(
+ new ProjectLocale({ default: 'en_us', supported: ['es', 'ja'] })
+ );
+ spyOn(configService, 'getProjectId').and.returnValue('123');
+ spyOn(configService, 'getConfigParam').and.returnValue('/123/project.json');
+ service.tryCopyComponents({ components: [{ id: 'abc' }] } as Node, [
+ {
+ id: 'abc',
+ type: 'OpenResponse',
+ prompt: 'hello',
+ 'prompt.i18n': { id: 'xyz' }
+ } as ComponentContent
+ ]);
+ http.expectOne(`/123/translations.es.json`).flush({ xyz: {} });
+ http.expectOne(`/123/translations.ja.json`).flush({ xyz: {} });
+ });
+ });
+}
diff --git a/src/app/services/deleteTranslationsService.spec.ts b/src/app/services/deleteTranslationsService.spec.ts
new file mode 100644
index 00000000000..febac4b9ff5
--- /dev/null
+++ b/src/app/services/deleteTranslationsService.spec.ts
@@ -0,0 +1,49 @@
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
+import { TeacherProjectService } from '../../assets/wise5/services/teacherProjectService';
+import { StudentTeacherCommonServicesModule } from '../student-teacher-common-services.module';
+import { DeleteTranslationsService } from '../../assets/wise5/services/deleteTranslationsService';
+import { ProjectLocale } from '../domain/projectLocale';
+import { ComponentContent } from '../../assets/wise5/common/ComponentContent';
+import { ConfigService } from '../../assets/wise5/services/configService';
+
+let configService: ConfigService;
+let http: HttpTestingController;
+let projectService: TeacherProjectService;
+let service: DeleteTranslationsService;
+describe('DeleteTranslationsService', () => {
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ imports: [HttpClientTestingModule, StudentTeacherCommonServicesModule],
+ providers: [DeleteTranslationsService, TeacherProjectService],
+ teardown: { destroyAfterEach: false }
+ });
+ configService = TestBed.inject(ConfigService);
+ http = TestBed.inject(HttpTestingController);
+ projectService = TestBed.inject(TeacherProjectService);
+ service = TestBed.inject(DeleteTranslationsService);
+ });
+ tryDeleteComponents();
+});
+
+function tryDeleteComponents() {
+ describe('tryDeleteComponents()', () => {
+ it('fetches all supported translations', () => {
+ spyOn(projectService, 'getLocale').and.returnValue(
+ new ProjectLocale({ default: 'en_us', supported: ['es', 'ja'] })
+ );
+ spyOn(configService, 'getProjectId').and.returnValue('123');
+ spyOn(configService, 'getConfigParam').and.returnValue('/123/project.json');
+ service.tryDeleteComponents([
+ {
+ id: 'abc',
+ type: 'OpenResponse',
+ prompt: 'hello',
+ 'prompt.i18n': { id: 'xyz' }
+ } as ComponentContent
+ ]);
+ http.expectOne(`/123/translations.es.json`).flush({ xyz: {} });
+ http.expectOne(`/123/translations.ja.json`).flush({ xyz: {} });
+ });
+ });
+}
diff --git a/src/app/services/projectService.spec.ts b/src/app/services/projectService.spec.ts
index ae0a23af26e..b2a884d6fcb 100644
--- a/src/app/services/projectService.spec.ts
+++ b/src/app/services/projectService.spec.ts
@@ -514,7 +514,8 @@ function calculateNodeNumbersWhenNoLessons(): void {
service.project = {
nodes: [{ id: 'group0', type: 'group', ids: [], startId: '' }],
startNodeId: 'group0',
- startGroupId: 'group0'
+ startGroupId: 'group0',
+ metadata: {}
};
service.parseProject();
expectNodeIdsToHaveNumbers([{ nodeId: 'group0', number: '0' }]);
diff --git a/src/app/services/sampleData/curriculum/Demo.project.json b/src/app/services/sampleData/curriculum/Demo.project.json
index 0f03547f92b..995b19eb9e6 100644
--- a/src/app/services/sampleData/curriculum/Demo.project.json
+++ b/src/app/services/sampleData/curriculum/Demo.project.json
@@ -2679,6 +2679,7 @@
},
"metadata": {
"title": "Demo Project",
+ "title.i18n": { "id": "d66d3be571e16cf8d0166286a0a632ec", "modified": 123 },
"authors": [
{
"firstName": "g",
diff --git a/src/app/services/sampleData/curriculum/TeacherProjectServiceSpec.project.json b/src/app/services/sampleData/curriculum/TeacherProjectServiceSpec.project.json
index bd80120f958..89021c0d7b9 100644
--- a/src/app/services/sampleData/curriculum/TeacherProjectServiceSpec.project.json
+++ b/src/app/services/sampleData/curriculum/TeacherProjectServiceSpec.project.json
@@ -1,6 +1,7 @@
{
"startGroupId": "group0",
"startNodeId": "node1",
+ "metadata": {},
"nodes": [
{
"id": "group0",
diff --git a/src/app/services/studentProjectTranslationService.spec.ts b/src/app/services/studentProjectTranslationService.spec.ts
new file mode 100644
index 00000000000..c5f62ccb908
--- /dev/null
+++ b/src/app/services/studentProjectTranslationService.spec.ts
@@ -0,0 +1,69 @@
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
+import { StudentTeacherCommonServicesModule } from '../student-teacher-common-services.module';
+import { StudentProjectTranslationService } from '../../assets/wise5/services/studentProjectTranslationService';
+import { ProjectService } from '../../assets/wise5/services/projectService';
+import { StudentDataService } from '../../assets/wise5/services/studentDataService';
+import { ProjectLocale } from '../domain/projectLocale';
+import demoProjectJSON_import from './sampleData/curriculum/Demo.project.json';
+import { copy } from '../../assets/wise5/common/object/object';
+import { ConfigService } from '../../assets/wise5/services/configService';
+
+let http: HttpTestingController;
+let demoProjectJSON: any;
+let configService: ConfigService;
+let dataService: StudentDataService;
+let projectService: ProjectService;
+let service: StudentProjectTranslationService;
+describe('StudentProjectTranslationService', () => {
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ imports: [HttpClientTestingModule, StudentTeacherCommonServicesModule],
+ providers: [
+ {
+ provide: StudentDataService,
+ useValue: jasmine.createSpyObj('StudentDataService', ['saveVLEEvent', 'getCurrentNodeId'])
+ }
+ ]
+ });
+ http = TestBed.inject(HttpTestingController);
+ demoProjectJSON = copy(demoProjectJSON_import);
+ configService = TestBed.inject(ConfigService);
+ dataService = TestBed.inject(StudentDataService);
+ projectService = TestBed.inject(ProjectService);
+ service = TestBed.inject(StudentProjectTranslationService);
+ spyOn(projectService, 'getOriginalProject').and.returnValue(demoProjectJSON);
+ });
+ describe('switchLanguage()', () => {
+ describe('has no translations to apply', () => {
+ beforeEach(() => {
+ spyOn(projectService, 'getLocale').and.returnValue(
+ new ProjectLocale({ default: 'en_US', supported: [] })
+ );
+ spyOn(projectService, 'setCurrentLanguage').and.stub();
+ spyOn(configService, 'isRunActive').and.returnValue(true);
+ });
+ it('should keep original project in tact', () => {
+ service.switchLanguage({ language: 'Japanese', locale: 'ja' }, 'student').then(() => {
+ expect(projectService.getProjectTitle()).toEqual('Demo Project');
+ });
+ });
+ });
+ describe('has translations to apply', () => {
+ beforeEach(() => {
+ spyOn(projectService, 'getLocale').and.returnValue(
+ new ProjectLocale({ default: 'en_US', supported: ['es'] })
+ );
+ spyOn(configService, 'getConfigParam').and.returnValue('/123/project.json');
+ });
+ it('should retrieve translation mapping file and translate project', () => {
+ service.switchLanguage({ language: 'Spanish', locale: 'es' }, 'student').then(() => {
+ expect(projectService.getProjectTitle()).toEqual('Proyecto de demostración');
+ http.expectOne('/123/translations.es.json').flush({
+ d66d3be571e16cf8d0166286a0a632ec: { value: 'Proyecto de demostración', modified: 456 }
+ });
+ });
+ });
+ });
+ });
+});
diff --git a/src/app/services/studentStatusService.spec.ts b/src/app/services/studentStatusService.spec.ts
index 871e87d4171..21d8550b150 100644
--- a/src/app/services/studentStatusService.spec.ts
+++ b/src/app/services/studentStatusService.spec.ts
@@ -9,6 +9,8 @@ import { of } from 'rxjs';
import { MatDialogModule } from '@angular/material/dialog';
import { StudentTeacherCommonServicesModule } from '../student-teacher-common-services.module';
import { NodeProgressService } from '../../assets/wise5/services/nodeProgressService';
+import { ProjectService } from '../../assets/wise5/services/projectService';
+import { ProjectLocale } from '../domain/projectLocale';
let configService: ConfigService;
let http: HttpClient;
@@ -92,6 +94,9 @@ function saveStudentStatus_nodeStatusChanged_PostStudentStatus() {
spyOn(configService, 'getStudentStatusURL').and.returnValue(studentStatusUrl);
spyOn(studentDataService, 'getCurrentNodeId').and.returnValue(nodeId);
spyOn(nodeProgressService, 'getNodeProgress').and.returnValue(projectCompletion);
+ spyOn(TestBed.inject(ProjectService), 'getLocale').and.returnValue(
+ new ProjectLocale({ default: 'en_US', supported: [] })
+ );
const httpPostSpy = spyOn(http, 'post').and.callFake((url: string, body: any) => {
return of({} as any);
});
diff --git a/src/app/services/teacherProjectTranslationService.spec.ts b/src/app/services/teacherProjectTranslationService.spec.ts
new file mode 100644
index 00000000000..d7ddb632fa6
--- /dev/null
+++ b/src/app/services/teacherProjectTranslationService.spec.ts
@@ -0,0 +1,51 @@
+import { TestBed } from '@angular/core/testing';
+import { TeacherProjectTranslationService } from '../../assets/wise5/services/teacherProjectTranslationService';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { TeacherProjectService } from '../../assets/wise5/services/teacherProjectService';
+import { ConfigService } from '../../assets/wise5/services/configService';
+import { signal } from '@angular/core';
+import { ProjectService } from '../../assets/wise5/services/projectService';
+
+class ConfigServiceStub {
+ getProjectId() {
+ return 1;
+ }
+}
+
+class TeacherProjectServiceStub {
+ readonly currentLanguage = signal({
+ language: 'Spanish',
+ locale: 'es'
+ });
+ broadcastSavingProject(): void {}
+ broadcastProjectSaved(): void {}
+}
+
+let http: HttpTestingController;
+let projectService: TeacherProjectService;
+let service: TeacherProjectTranslationService;
+describe('TeacherProjectTranslationService', () => {
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ providers: [
+ TeacherProjectTranslationService,
+ HttpClientTestingModule,
+ { provide: ConfigService, useClass: ConfigServiceStub },
+ { provide: ProjectService, useClass: TeacherProjectServiceStub },
+ { provide: TeacherProjectService, useClass: TeacherProjectServiceStub }
+ ],
+ imports: [HttpClientTestingModule]
+ });
+ http = TestBed.inject(HttpTestingController);
+ projectService = TestBed.inject(TeacherProjectService);
+ service = TestBed.inject(TeacherProjectTranslationService);
+ });
+ describe('saveCurrentTranslations()', () => {
+ it('makes a POST request to backend', () => {
+ service.saveCurrentTranslations({}).subscribe();
+ const request = http.expectOne(`/api/author/project/translate/1/es`);
+ expect(request.request.method).toEqual('POST');
+ expect(request.request.body).toEqual({});
+ });
+ });
+});
diff --git a/src/app/student-teacher-common-services.module.ts b/src/app/student-teacher-common-services.module.ts
index 49de92ff787..bd5925dab02 100644
--- a/src/app/student-teacher-common-services.module.ts
+++ b/src/app/student-teacher-common-services.module.ts
@@ -53,6 +53,7 @@ import { PeerGroupService } from '../assets/wise5/services/peerGroupService';
import { NodeProgressService } from '../assets/wise5/services/nodeProgressService';
import { CompletionService } from '../assets/wise5/services/completionService';
import { StudentNodeService } from '../assets/wise5/services/studentNodeService';
+import { StudentProjectTranslationService } from '../assets/wise5/services/studentProjectTranslationService';
import { AiChatService } from '../assets/wise5/components/aiChat/aiChatService';
@NgModule({
@@ -110,6 +111,7 @@ import { AiChatService } from '../assets/wise5/components/aiChat/aiChatService';
TableService,
TabulatorDataService,
TagService,
+ StudentProjectTranslationService,
VLEProjectService,
WiseLinkService
]
diff --git a/src/app/student/top-bar/top-bar.component.html b/src/app/student/top-bar/top-bar.component.html
index bb822b04bc3..30ce917c820 100644
--- a/src/app/student/top-bar/top-bar.component.html
+++ b/src/app/student/top-bar/top-bar.component.html
@@ -25,24 +25,27 @@ {{ projectName }}
Constraints Are Off
-
-
-
+