diff --git a/src/main/webapp/app/custom/entities/team-skill/team-skill-vote/team-skill-vote.component.html b/src/main/webapp/app/custom/entities/team-skill/team-skill-vote/team-skill-vote.component.html index 4440938d..c3e2ab46 100644 --- a/src/main/webapp/app/custom/entities/team-skill/team-skill-vote/team-skill-vote.component.html +++ b/src/main/webapp/app/custom/entities/team-skill/team-skill-vote/team-skill-vote.component.html @@ -4,7 +4,7 @@

completed the skill

@@ -27,7 +27,7 @@

Skill
- {{ teamSkill?.skill?.title }} + {{ teamSkill?.skill?.titleEN }}
Completed At
diff --git a/src/main/webapp/app/custom/layouts/navbar/breadcrumb.service.ts b/src/main/webapp/app/custom/layouts/navbar/breadcrumb.service.ts index 54332296..48053bc2 100644 --- a/src/main/webapp/app/custom/layouts/navbar/breadcrumb.service.ts +++ b/src/main/webapp/app/custom/layouts/navbar/breadcrumb.service.ts @@ -62,20 +62,20 @@ export class BreadcrumbService { } if (this.dimension !== null && typeof this.dimension !== 'undefined') { const url = this.router.createUrlTree(path, { queryParams: this.params }).toString(); - breadcrumbs.push(new Breadcrumb(this.dimension.title, url, false)); + breadcrumbs.push(new Breadcrumb(this.dimension.titleEN, url, false)); } if (this.level !== null && typeof this.level !== 'undefined') { const url = this.router.createUrlTree(path, { queryParams: { level: this.level.id } }).toString(); - breadcrumbs.push(new Breadcrumb(this.level.title, url, false)); + breadcrumbs.push(new Breadcrumb(this.level.titleEN, url, false)); } if (this.badge !== null && typeof this.badge !== 'undefined') { const url = this.router.createUrlTree(path, { queryParams: { badge: this.badge.id } }).toString(); - breadcrumbs.push(new Breadcrumb(this.badge.title, url, false)); + breadcrumbs.push(new Breadcrumb(this.badge.titleEN, url, false)); } if (this.skill !== null && typeof this.skill !== 'undefined') { path.push('skills', this.skill.id); const url = this.router.createUrlTree(path, { queryParams: this.params }).toString(); - breadcrumbs.push(new Breadcrumb(this.skill.title, url, false)); + breadcrumbs.push(new Breadcrumb(this.skill.titleEN, url, false)); } if (breadcrumbs.length > 0) { breadcrumbs[breadcrumbs.length - 1].active = true; diff --git a/src/main/webapp/app/custom/overview/achievements/overview-achievements.component.html b/src/main/webapp/app/custom/overview/achievements/overview-achievements.component.html index 386d6aef..60265bfe 100644 --- a/src/main/webapp/app/custom/overview/achievements/overview-achievements.component.html +++ b/src/main/webapp/app/custom/overview/achievements/overview-achievements.component.html @@ -46,7 +46,7 @@

{{ 'teamDojoApp.overview.achievements.title' | translate }}

- {{ dimension.title }} + {{ dimension.titleEN }} {{ 'teamDojoApp.overview.skills.title' | translate }} [routerLink]="['/overview', 'skills', skill.id]" [queryParams]="{ level: activeLevel?.id, badge: activeBadge?.id }" > - {{ skill.title }} + {{ skill.titleEN }}
{{ getRelevantTeams(skill) }}
diff --git a/src/main/webapp/app/custom/overview/skills/overview-skills.component.ts b/src/main/webapp/app/custom/overview/skills/overview-skills.component.ts index 368e6548..c7728711 100644 --- a/src/main/webapp/app/custom/overview/skills/overview-skills.component.ts +++ b/src/main/webapp/app/custom/overview/skills/overview-skills.component.ts @@ -52,7 +52,7 @@ export class OverviewSkillsComponent implements OnInit, OnChanges { generalSkillsIds: number[] = []; search$: Subject = new Subject(); search = ''; - orderBy: keyof Skill = 'title'; + orderBy: keyof Skill = 'titleEN'; hasAuthority = false; constructor( diff --git a/src/main/webapp/app/custom/shared/pipe/skill-filter.pipe.ts b/src/main/webapp/app/custom/shared/pipe/skill-filter.pipe.ts index 13e6f836..7af4324f 100644 --- a/src/main/webapp/app/custom/shared/pipe/skill-filter.pipe.ts +++ b/src/main/webapp/app/custom/shared/pipe/skill-filter.pipe.ts @@ -4,6 +4,6 @@ import { ISkill } from 'app/entities/skill/skill.model'; @Pipe({ name: 'skillFilter' }) export class SkillFilterPipe implements PipeTransform { transform(skills: ISkill[], searchString: string): ISkill[] { - return skills.filter(skill => (skill.title ?? '').toLowerCase().includes(searchString.toLowerCase())); + return skills.filter(skill => (skill.titleEN ?? '').toLowerCase().includes(searchString.toLowerCase())); } } diff --git a/src/main/webapp/app/custom/shared/skill-details/info/skill-details-info.component.html b/src/main/webapp/app/custom/shared/skill-details/info/skill-details-info.component.html index 4046c044..99a42d11 100644 --- a/src/main/webapp/app/custom/shared/skill-details/info/skill-details-info.component.html +++ b/src/main/webapp/app/custom/shared/skill-details/info/skill-details-info.component.html @@ -1,5 +1,5 @@ - {{ skill?.title }} + {{ skill?.titleEN }} {{ 'teamDojoApp.customSkill.titleExplanationQuestion' | translate }} @@ -39,21 +39,21 @@ {{ 'teamDojoApp.teams.skills.details.desc' | translate }} {{ 'teamDojoApp.customSkill.descriptionExplanationQuestion' | translate }}
- +
{{ 'teamDojoApp.teams.skills.details.implementation' | translate }} {{ 'teamDojoApp.customSkill.implementationExplanationQuestion' | translate }}
- +
{{ 'teamDojoApp.teams.skills.details.validation' | translate }} {{ 'teamDojoApp.customSkill.validationExplanationQuestion' | translate }}
- +
@@ -107,14 +107,14 @@
'fa training-is-official': true }" > - {{ training.title }} - {{ training.title }} ({{ training.contact }}) + {{ training.titleEN }} + {{ training.titleEN }} ({{ training.contact }})
: {{ training.suggestedBy }}
-

{{ training.description }}

+

{{ training.descriptionEN }}

diff --git a/src/main/webapp/app/custom/shared/trainings/trainings-add.component.html b/src/main/webapp/app/custom/shared/trainings/trainings-add.component.html index 512c957e..b8cf2760 100644 --- a/src/main/webapp/app/custom/shared/trainings/trainings-add.component.html +++ b/src/main/webapp/app/custom/shared/trainings/trainings-add.component.html @@ -14,7 +14,7 @@