Skip to content

Commit

Permalink
Merge branch 'main' into lmendoza/9576-qa-dynamic-field-name-not-work…
Browse files Browse the repository at this point in the history
…ing-for-new-work-types
  • Loading branch information
leomendoza123 authored Jan 10, 2025
2 parents 1597cc8 + 5a94165 commit 9e16553
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 5 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## v2.109.19 - 2025-01-09

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.109.18...v2.109.19)

- [#2444](https://github.com/ORCID/orcid-angular/pull/2444): 9579-v3-work-types-lecture-and-public-speech

## v2.109.18 - 2025-01-09

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.109.17...v2.109.18)

- [#2443](https://github.com/ORCID/orcid-angular/pull/2443): 9579-v3-work-types-lecture-and-public-speech

## v2.109.17 - 2025-01-08

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.109.16...v2.109.17)
Expand Down
3 changes: 2 additions & 1 deletion src/app/cdk/platform-info/browserlist.regexp.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
// tslint:disable-next-line: max-line-length
export const BROWSERLIST_REGEXP = /((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+|17\.0|17\.([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/
export const BROWSERLIST_REGEXP =
/((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+|17\.0|17\.([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/
5 changes: 2 additions & 3 deletions src/app/types/works.endpoint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export enum WorkTypes {
musicalComposition = 'musical-composition',
sound = 'sound',
transcription = 'transcription',
publicSpeech = 'public-speech'
publicSpeech = 'public-speech',
}

export const WorkCategoriesLabel = {
Expand Down Expand Up @@ -233,11 +233,10 @@ export const WorkTypesTitle = {
[WorkTypes.image]: WorksTitleName.publisher,
[WorkTypes.learningObject]: WorksTitleName.publisher,
[WorkTypes.movingImage]: WorksTitleName.publisher,
[WorkTypes.musicalComposition]: WorksTitleName.publisher,
[WorkTypes.musicalComposition]: WorksTitleName.publisher,
[WorkTypes.sound]: WorksTitleName.publisher,
[WorkTypes.transcription]: WorksTitleName.publisher,
[WorkTypes.publicSpeech]: WorksTitleName.publisher,

}

export const LanguageMap = {
Expand Down
2 changes: 1 addition & 1 deletion src/locale/properties/works/works.en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -278,4 +278,4 @@ works.academicPublication=Academic publications
works.reviewAndEditing=Review and editing
works.pleaseSelectWork=Please select a work type
works.learningObject=Teaching material
works.publicSpeech=Talk, interview, podcast or speech
works.publicSpeech=Talk, interview, podcast or speech
1 change: 1 addition & 0 deletions src/locale/properties/works/works.lr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -285,3 +285,4 @@ works.dissemination=LR
works.academicPublication=LR
works.reviewAndEditing=LR
works.pleaseSelectWork=LR
works.publicSpeech=LR
1 change: 1 addition & 0 deletions src/locale/properties/works/works.rl.properties
Original file line number Diff line number Diff line change
Expand Up @@ -285,3 +285,4 @@ works.dissemination=RL
works.academicPublication=RL
works.reviewAndEditing=RL
works.pleaseSelectWork=RL
works.publicSpeech=RL
1 change: 1 addition & 0 deletions src/locale/properties/works/works.xx.properties
Original file line number Diff line number Diff line change
Expand Up @@ -285,3 +285,4 @@ works.dissemination=X
works.academicPublication=X
works.reviewAndEditing=X
works.pleaseSelectWork=X
works.publicSpeech=X

0 comments on commit 9e16553

Please sign in to comment.