Skip to content
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

140 localization fixes #1932

Merged
merged 4 commits into from
Jan 21, 2025
Merged

140 localization fixes #1932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e6eb29
fix localizations and remove console log
konolak Jan 21, 2025
ff1b236
fix localization key
konolak Jan 21, 2025
ee45ff4
fix showing of projects beta text in search results page
konolak Jan 21, 2025
fcd5267
hide persons caption when project data has empty fullname field and a…
konolak Jan 21, 2025
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
8 changes: 4 additions & 4 deletions src/app/portal/components/results/projects/projects.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,25 +100,25 @@ export class ProjectsComponent implements OnInit, OnDestroy, AfterViewInit {
this.tableColumns = [
{
key: 'name',
label: 'Hanke',
label: $localize`:@@spSortsProject:Project`,
class: 'col-8 col-lg-5 col-xl-3',
mobile: true,
},
{
key: 'abbreviation',
label: 'Akronyymi',
label: $localize`:@@spSortsAcronym:Acronym`,
class: 'col-lg-4 col-xl-3 d-none d-lg-block',
mobile: false,
},
{
key: 'organization',
label: 'Organisaatio',
label: $localize`:@@spSortsOrganization:Organization`,
class: 'col-xl-3 d-none d-xl-block',
mobile: false,
},
{
key: 'year',
label: 'Aloitusvuosi',
label: $localize`:@@spSortsStartYear:Starting year`,
class: 'col-lg-2',
mobile: true,
},
Expand Down
4 changes: 2 additions & 2 deletions src/app/portal/components/single/single-project/single-project.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ <h3>{{row.subFields[1].label}}</h3>
</ng-container>
</div>
</div>
<h3 *ngIf="item['responsiblePerson']?.length > 0">{{row.subFields[2].label}}</h3>
<ng-container *ngFor="let person of item['responsiblePerson']">
<ng-container *ngFor="let person of item['responsiblePerson']; let i = index">
<h3 *ngIf="i === 0 && item['responsiblePerson']?.length > 0 && person.fullName.length > 0">{{row.subFields[2].label}}</h3>
<div>
{{ person.fullName }}
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/portal/components/tab-button/tab-button.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div style='display: flex'>
<fa-icon [icon]="_icon" style='margin-right: 12px'></fa-icon>

<div>{{ label }} <span *ngIf="routerLink === '/results/projects/'"> - BETA</span></div>
<div>{{ label }} <span *ngIf="routerLink.includes('/results/projects/')"> - BETA</span></div>
</div>

<ng-container *ngIf='count !== -1'>
Expand Down
1 change: 0 additions & 1 deletion src/app/portal/services/filters/project-filter.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ export class ProjectFilterService {
clone.map((item) => {
item.key = item.key.toString();
});
console.log('years', clone);
return clone;
}

Expand Down
26 changes: 19 additions & 7 deletions src/i18n/messages.en.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1580,8 +1580,8 @@
<target>Method of funding research. Instruments of funding include research grants, project funding and research infrastructure funding. Instruments are often specific to each funder.</target>
</trans-unit>
<trans-unit id="fundingCountByIdentifiedTopic" datatype="html">
<source>Hankkeiden jakautuminen tunnistetun aiheen mukaan</source>
<target>Division of projects by identified topic</target>
<source>Rahoitusmyöntöjen jakautuminen tunnistetun aiheen mukaan</source>
<target state="new">Division of projects by identified topic</target>
</trans-unit>
<trans-unit id="identifiedTopic" datatype="html">
<source>Tunnistettu aihe</source>
Expand Down Expand Up @@ -3970,10 +3970,6 @@
<source>Hankkeet</source>
<target>Projects</target>
</trans-unit>
<trans-unit id="6312855125143647093" datatype="html">
<source>Hankkeet uudistuvat. Aiempien hankkeiden tiedot löytyvät nyt ‘Myönnetty rahoitus‘ -osiosta.</source>
<target>The projects are being renewed. The information from previous projects can now be found in the ‘Granted funding’ section.</target>
</trans-unit>
<trans-unit id="fundingType" datatype="html">
<source>Rahoitusmuoto</source>
<target>Method of funding</target>
Expand Down Expand Up @@ -4252,7 +4248,7 @@
</trans-unit>
<trans-unit id="spAbbreviation" datatype="html">
<source>Lyhenne</source>
<target>Lyhenne</target>
<target>Abbreviation</target>
</trans-unit>
<trans-unit id="spAbbreviationTooltip" datatype="html">
<source>Lyhenne</source>
Expand Down Expand Up @@ -4374,6 +4370,22 @@
<source>Lue lisää</source>
<target state="new">Read more</target>
</trans-unit>
<trans-unit id="spSortsProject" datatype="html">
<source>Project</source>
<target state="new">Project</target>
</trans-unit>
<trans-unit id="spSortsAcronym" datatype="html">
<source>Acronym</source>
<target state="new">Acronym</target>
</trans-unit>
<trans-unit id="spSortsOrganization" datatype="html">
<source>Organization</source>
<target state="new">Organization</target>
</trans-unit>
<trans-unit id="spSortsStartYear" datatype="html">
<source>Starting year</source>
<target state="new">Starting year</target>
</trans-unit>
</body>
</file>
</xliff>
34 changes: 23 additions & 11 deletions src/i18n/messages.sv.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1583,8 +1583,8 @@
<target>Sätt att finansiera forskning. Typer av finansiering är till exempel forskningsbidrag, projektfinansiering och forskningsinfrastrukturfinansiering. Finansieringstyper är ofta finansiärspecifika.</target>
</trans-unit>
<trans-unit id="fundingCountByIdentifiedTopic" datatype="html">
<source>Hankkeiden jakautuminen tunnistetun aiheen mukaan</source>
<target>Fördelning av projekt efter identifierat ämne</target>
<source>Rahoitusmyöntöjen jakautuminen tunnistetun aiheen mukaan</source>
<target state="new">Fördelning av projekt efter identifierat ämne</target>
</trans-unit>
<trans-unit id="identifiedTopic" datatype="html">
<source>Tunnistettu aihe</source>
Expand Down Expand Up @@ -3019,8 +3019,8 @@
<target>Searching for a missing research data</target>
</trans-unit>
<trans-unit id="searchForMissingFunding" datatype="html">
<source>Puuttuvan rahoitusmyönnön hakeminen</source>
<target>Searching for a missing project</target>
<source>Puuttuvan hankkeen hakeminen</source>
<target state="new">Searching for a missing project</target>
</trans-unit>
<trans-unit id="searchForPublicationWithName" datatype="html">
<source>Hae omalla nimelläsi tai julkaisun nimellä</source>
Expand All @@ -3031,8 +3031,8 @@
<target>Search for research data under the name of the author or organization </target>
</trans-unit>
<trans-unit id="searchForFundingWithName" datatype="html">
<source>Hae rahoitusmyönnön tai vastuullisen tutkijan nimellä</source>
<target>Search for a project with project name or principal investigator name</target>
<source>Hae hankkeen tai vastuullisen tutkijan nimellä</source>
<target state="new">Search for a project with project name or principal investigator name</target>
</trans-unit>
<trans-unit id="dataSourceIsResearchFi" datatype="html">
<source>Tietolähteenä käytetään Tiedejatutkimus.fi-palvelua</source>
Expand Down Expand Up @@ -3973,10 +3973,6 @@
<source>Hankkeet</source>
<target>Projekt</target>
</trans-unit>
<trans-unit id="6312855125143647093" datatype="html">
<source>Hankkeet uudistuvat. Aiempien hankkeiden tiedot löytyvät nyt ‘Myönnetty rahoitus‘ -osiosta.</source>
<target>Projekten förnyas. Information från tidigare projekt kan nu hittas i avsnittet ‘Beviljade finansiering’.</target>
</trans-unit>
<trans-unit id="fundingType" datatype="html">
<source>Rahoitusmuoto</source>
<target>Finansieringsmetoden</target>
Expand Down Expand Up @@ -4251,7 +4247,7 @@
</trans-unit>
<trans-unit id="projectSource" datatype="html">
<source>Hanketiedon lähde</source>
<target>Hanketiedon lähde</target>
<target>Projektinformationens källa</target>
</trans-unit>
<trans-unit id="spAbbreviation" datatype="html">
<source>Lyhenne</source>
Expand Down Expand Up @@ -4377,6 +4373,22 @@
<source>Lue lisää</source>
<target state="new">Läs mera</target>
</trans-unit>
<trans-unit id="spSortsProject" datatype="html">
<source>Project</source>
<target state="new">Projekt</target>
</trans-unit>
<trans-unit id="spSortsAcronym" datatype="html">
<source>Acronym</source>
<target state="new">Akronym</target>
</trans-unit>
<trans-unit id="spSortsOrganization" datatype="html">
<source>Organization</source>
<target state="new">Organisation</target>
</trans-unit>
<trans-unit id="spSortsStartYear" datatype="html">
<source>Starting year</source>
<target state="new">Startår</target>
</trans-unit>
</body>
</file>
</xliff>
12 changes: 12 additions & 0 deletions src/i18n/messages.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3282,6 +3282,18 @@
<trans-unit id="spReadMore" datatype="html">
<source>Lue lisää</source>
</trans-unit>
<trans-unit id="spSortsAcronym" datatype="html">
<source>Lyhenne</source>
</trans-unit>
<trans-unit id="spSortsOrganization" datatype="html">
<source>Organisaatio</source>
</trans-unit>
<trans-unit id="spSortsProject" datatype="html">
<source>Hanke</source>
</trans-unit>
<trans-unit id="spSortsStartYear" datatype="html">
<source>Aloitusvuosi</source>
</trans-unit>
</body>
</file>
</xliff>
Loading