Skip to content

laji-taxon-name doesn't use lang fallback for alternativeVernacularName #864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
olzraiti wants to merge 1 commit into
base: development
Choose a base branch
from
Open

laji-taxon-name doesn't use lang fallback for alternativeVernacularName #864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...s/laji/src/app/+taxonomy/taxon/info-card/info-card-header/info-card-header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<div *ngIf="taxon.hasParent || taxon.hasChildren">
<select class="form-control input-sm" [ngModel]="taxon.id" (ngModelChange)="taxonSelect.emit($event)">
<option *ngFor="let sibling of siblings" [value]="sibling.id">
{{ sibling.vernacularName | multiLang:false | capitalize }}
<ng-container *ngIf="(sibling.vernacularName | multiLang:false ) && sibling.scientificName">
{{ sibling.vernacularName | capitalize }}
<ng-container *ngIf="sibling.vernacularName && sibling.scientificName">
&ndash;
</ng-container>
{{ sibling.scientificName }}
Expand Down
2 changes: 1 addition & 1 deletion projects/laji/src/app/shared/omni-search/omni-search.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h3><laji-taxon-name [capitalizeName]="true" [taxon]="taxon"></laji-taxon-name><
{{ 'omniSearch.rank' | translate }}: {{ taxon.taxonRank | label }}
</div>
<div>
{{ 'omniSearch.groups' | translate }}: {{ taxon.informalTaxonGroups | multiLang | values }}
{{ 'omniSearch.groups' | translate }}: {{ taxon.informalTaxonGroups | values }}
</div>
</div>
<div class="informal-group-image {{taxon.informalTaxonGroupsClass}}"></div>
Expand Down
16 changes: 8 additions & 8 deletions projects/laji/src/app/shared/taxon-name/taxon-name.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<ng-container *ngIf="taxon">
<ng-container *ngIf="(taxon.vernacularName | multiLang:false)" [ngTemplateOutlet]="vernacularName"></ng-container>
<ng-container *ngIf="(taxon.vernacularName | multiLang:false) && (taxon.colloquialVernacularName | multiLang:false)">
(<ul class="separated-list colloquialVernacularName">
<li *ngFor="let obj of (taxon.colloquialVernacularName | multiLang:false)">{{obj}}</li>
<ng-container *ngIf="taxon.vernacularNameMultiLang | multiLang:false" [ngTemplateOutlet]="vernacularName"></ng-container>
<ng-container *ngIf="(taxon.vernacularNameMultiLang | multiLang:false) && (taxon.colloquialVernacularNameMultiLang | multiLang:false)">
(<ul class="separated-list colloquialVernacularNameMultiLang">
<li *ngFor="let obj of taxon.colloquialVernacularNameMultiLang">{{obj}}</li>
</ul>
<laji-info [placement]="'top'">{{ 'taxonomy.vernacular.colloquial.info' | translate }}</laji-info>)
</ng-container>
<ng-container *ngIf="((taxon.vernacularName | multiLang:false) || taxon.alternativeVernacularName | multiLang:false | values) && taxon.scientificName">
<ng-container *ngIf="((taxon.vernacularNameMultiLang | multiLang:false) || taxon.alternativeVernacularNameMultiLang | multiLang:false | values) && taxon.scientificName">
&ndash;
</ng-container>
<ng-container [ngTemplateOutlet]="scientificName"></ng-container>
Expand All @@ -21,13 +21,13 @@
<span class="glyphicon glyphicon-warning-sign"></span>
</ng-container>
<img *ngIf="((taxon.id || taxon.qname || taxonID) | toQName)?.startsWith('gbif:')" class="gbif-icon" src="/static/images/icons/gbif.svg" [luTooltip]="'species.tree.gbif.help' | translate" />
<div class="alternative-names mt-2" *ngIf="!hideObsoleteVernacularName && taxon?.obsoleteVernacularName | multiLang:false | values; let obsoleteVernacularName">
<div class="alternative-names mt-2" *ngIf="!hideObsoleteVernacularName && taxon?.obsoleteVernacularName | values; let obsoleteVernacularName">
{{ obsoleteVernacularName }}
</div>
<ng-template #scientificName><ng-container *ngIf="taxon.cursiveName; else noCursive"><em>{{ taxon.scientificName }}</em></ng-container><ng-template #noCursive>{{ taxon.scientificName }}</ng-template></ng-template>
<ng-template #vernacularName>
{{ capitalizeName ? (taxon.vernacularName | multiLang | capitalize) : (taxon.vernacularName | multiLang) }}
<ng-container *ngIf="taxon?.alternativeVernacularName | multiLang:false | values; let alternativeVernacularName">
{{ capitalizeName ? (taxon.vernacularNameMultiLang | multiLang:false | capitalize) : taxon.vernacularNameMultiLang | multiLang:false }}
<ng-container *ngIf="taxon?.alternativeVernacularNameMultiLang | multiLang:false | values; let alternativeVernacularName">
({{ alternativeVernacularName }})
</ng-container>
</ng-template>
Expand Down