Skip to content

Commit

Permalink
Merge branch 'master' into 8059-finish-course-step
Browse files Browse the repository at this point in the history
  • Loading branch information
dogi authored Jan 9, 2025
2 parents e4682e9 + 5d17955 commit 1ad3659
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"license": "AGPL-3.0",
"version": "0.16.48",
"myplanet": {
"latest": "v0.21.75",
"min": "v0.20.75"
"latest": "v0.21.81",
"min": "v0.20.81"
},
"scripts": {
"ng": "ng",
Expand Down
1 change: 1 addition & 0 deletions src/app/health/health-event.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ export class HealthEventComponent implements OnInit {
this.goBack();
}
},
displayName: '',
showMainParagraph: false,
extraMessage: $localize`The value(s) of the following are not in the normal range. Click <b>Cancel</b> to fix or click <b>OK</b> to submit.`,
showLabels: invalidFields
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ export class UsersAchievementsComponent implements OnInit {
{
text: `
${this.user.firstName} ${this.user.middleName ? this.user.middleName : ''} ${this.user.lastName}
${formattedBirthDate ? $localize`Birthplace: ${formattedBirthDate}` : ''}
${this.user.Birthplace ? $localize`Birthdate: ${this.user.Birthplace}` : ''}
${formattedBirthDate ? $localize`Birthdate: ${formattedBirthDate}` : ''}
${this.user.birthplace ? $localize`Birthplace: ${this.user.birthplace}` : ''}
`,
alignment: 'center',
},
Expand Down

0 comments on commit 1ad3659

Please sign in to comment.