From ce075c7c48a04ac707062fdefeeaa523cd26d636 Mon Sep 17 00:00:00 2001 From: Osma Suominen Date: Thu, 30 Jan 2025 13:08:31 +0200 Subject: [PATCH 1/6] remove yso-meta translations (shouldn't be part of Skosmos codebase) --- resource/translations/messages.en.json | 5 +---- resource/translations/messages.fi.json | 5 +---- resource/translations/messages.sv.json | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/resource/translations/messages.en.json b/resource/translations/messages.en.json index 5e0d1fc76..887e28318 100644 --- a/resource/translations/messages.en.json +++ b/resource/translations/messages.en.json @@ -36,9 +36,6 @@ "Group index": "Group index", "Group-nav": "Groups", "Hier-nav": "Hierarchy", - "http://www.yso.fi/onto/yso-meta/Concept": "General concept", - "http://www.yso.fi/onto/yso-meta/Hierarchy": "Hierarchy", - "http://www.yso.fi/onto/yso-meta/Individual": "Individual", "Leave this field blank": "Leave this field blank", "Limit search": "Limit search", "Loading": "Loading", @@ -223,4 +220,4 @@ "Download this concept": "Download this concept", "Concept %term% in vocabulary %vocab%": "Concept %term% in vocabulary %vocab%", "More information about this term": "More information about this term" -} \ No newline at end of file +} diff --git a/resource/translations/messages.fi.json b/resource/translations/messages.fi.json index cfdeef130..bfb5048ad 100644 --- a/resource/translations/messages.fi.json +++ b/resource/translations/messages.fi.json @@ -50,9 +50,6 @@ "Hier-nav": "Hierarkia", "Hierarchical listing of vocabulary concepts": "Hierarkian mukainen lista k\u00e4sitteist\u00e4", "Hierarchical listing of vocabulary concepts and groupings": "Hierarkian mukainen lista k\u00e4sitteist\u00e4 ja ryhmist\u00e4", - "http://www.yso.fi/onto/yso-meta/Concept": "Yleiskäsite", - "http://www.yso.fi/onto/yso-meta/Hierarchy": "Hierarkisoiva käsite", - "http://www.yso.fi/onto/yso-meta/Individual": "Yksilöivä käsite", "Information": "Tietoja", "Interface language": "K\u00e4ytt\u00f6kieli", "Leave this field blank": "J\u00e4t\u00e4 t\u00e4m\u00e4 kentt\u00e4 tyhj\u00e4ksi", @@ -222,4 +219,4 @@ "wgs84:long": "Pituusaste", "wgs84:long_help": "Pituusaste WGS 84 -j\u00e4rjestelm\u00e4n mukaan desimaaliasteina.", "zxx-x-taxon": "Tieteellinen nimi" -} \ No newline at end of file +} diff --git a/resource/translations/messages.sv.json b/resource/translations/messages.sv.json index 6d2bc7039..d709001bd 100644 --- a/resource/translations/messages.sv.json +++ b/resource/translations/messages.sv.json @@ -50,9 +50,6 @@ "Hier-nav": "Hierarki", "Hierarchical listing of vocabulary concepts": "Hierarkisk lista \u00f6ver begrepp", "Hierarchical listing of vocabulary concepts and groupings": "Hierarkisk lista av begrepp och grupper", - "http://www.yso.fi/onto/yso-meta/Concept": "Allmänbegrepp", - "http://www.yso.fi/onto/yso-meta/Hierarchy": "Hierarki", - "http://www.yso.fi/onto/yso-meta/Individual": "Identifierande begrepp", "Information": "Information", "Interface language": "Gr\u00e4nssnittsspr\u00e5k", "Leave this field blank": "Leave this field blank", @@ -222,4 +219,4 @@ "wgs84:long": "Longitud", "wgs84:long_help": "Longitud som decimalgrader enligt WGS 84-systemet.", "zxx-x-taxon": "Vetenskapligt namn" -} \ No newline at end of file +} From eb307090d552befbc630b030b6f3967c345e48f1 Mon Sep 17 00:00:00 2001 From: Osma Suominen Date: Thu, 30 Jan 2025 13:09:51 +0200 Subject: [PATCH 2/6] sync with translations pulled from Lokalise (fix unicode encoding) --- resource/translations/messages.en.json | 2 +- resource/translations/messages.fi.json | 4 ++-- resource/translations/messages.sv.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resource/translations/messages.en.json b/resource/translations/messages.en.json index 887e28318..548eda5ec 100644 --- a/resource/translations/messages.en.json +++ b/resource/translations/messages.en.json @@ -220,4 +220,4 @@ "Download this concept": "Download this concept", "Concept %term% in vocabulary %vocab%": "Concept %term% in vocabulary %vocab%", "More information about this term": "More information about this term" -} +} \ No newline at end of file diff --git a/resource/translations/messages.fi.json b/resource/translations/messages.fi.json index bfb5048ad..c2449a226 100644 --- a/resource/translations/messages.fi.json +++ b/resource/translations/messages.fi.json @@ -42,7 +42,7 @@ "Error: Term \"%term%\" not found in vocabulary!": "Virhe: Termi\u00e4 \"%term%\" ei l\u00f6ydy sanastosta!", "Feedback": "Palaute", "Feedback has been sent!": "Palaute on l\u00e4hetetty!", - "Go to the concept page": "Mene käsitesivulle", + "Go to the concept page": "Mene k\u00e4sitesivulle", "Group index": "Ryhm\u00e4hakemisto", "Group-nav": "Ryhm\u00e4t", "Help": "Ohje", @@ -219,4 +219,4 @@ "wgs84:long": "Pituusaste", "wgs84:long_help": "Pituusaste WGS 84 -j\u00e4rjestelm\u00e4n mukaan desimaaliasteina.", "zxx-x-taxon": "Tieteellinen nimi" -} +} \ No newline at end of file diff --git a/resource/translations/messages.sv.json b/resource/translations/messages.sv.json index d709001bd..7a81f1b3e 100644 --- a/resource/translations/messages.sv.json +++ b/resource/translations/messages.sv.json @@ -42,7 +42,7 @@ "Error: Term \"%term%\" not found in vocabulary!": "Fel: Termen \"%term\" finns inte i vokabul\u00e4ren!", "Feedback": "Respons", "Feedback has been sent!": "Respons har skickats!", - "Go to the concept page": "Gå till begreppsidan", + "Go to the concept page": "G\u00e5 till begreppsidan", "Group index": "Gruppindex", "Group-nav": "Gruppindex", "Help": "Hj\u00e4lp", @@ -219,4 +219,4 @@ "wgs84:long": "Longitud", "wgs84:long_help": "Longitud som decimalgrader enligt WGS 84-systemet.", "zxx-x-taxon": "Vetenskapligt namn" -} +} \ No newline at end of file From fa7fe98f80c9ae1939d4e346902d3139a7a73130 Mon Sep 17 00:00:00 2001 From: Osma Suominen Date: Thu, 30 Jan 2025 14:30:11 +0200 Subject: [PATCH 3/6] sync fi and sv locales against Lokalise --- resource/translations/messages.fi.json | 2 +- resource/translations/messages.sv.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resource/translations/messages.fi.json b/resource/translations/messages.fi.json index c2449a226..d9747b84a 100644 --- a/resource/translations/messages.fi.json +++ b/resource/translations/messages.fi.json @@ -73,13 +73,13 @@ "Resource counts by type": "Resurssien lukum\u00e4\u00e4r\u00e4 tyypeitt\u00e4in", "Retry": "Yrit\u00e4 uudelleen", "Search": "Hae", - "Search...": "Hae...", "Search from selected vocabularies": "Hae valituista sanastoista", "Search from vocabulary": "Hae sanastosta", "Search language: any": "kaikilla kielill\u00e4", "Search options": "Rajaus", "Search options tab": "Hakuvalintojen v\u00e4lilehti", "Search results": "Hakutulokset", + "Search...": "Hae...", "Select a vocabulary": "Voit valita halutessasi sanaston", "Send feedback": "L\u00e4het\u00e4 palaute", "Sidebar listing: list and traverse vocabulary contents by a criterion": "Sivupalkin lista: listaa ja selaa k\u00e4sitteit\u00e4 eri kriteerien mukaan", diff --git a/resource/translations/messages.sv.json b/resource/translations/messages.sv.json index 7a81f1b3e..974050620 100644 --- a/resource/translations/messages.sv.json +++ b/resource/translations/messages.sv.json @@ -70,16 +70,16 @@ "Not to a specific vocabulary": "Ingen specifik vokabul\u00e4r", "Prefer using": "Anv\u00e4nd termen", "Preferred terms": "Huvudtermer", - "Resource counts by type": "Antal resurs enligt typ", + "Resource counts by type": "Antal resurser enligt typ", "Retry": "F\u00f6rs\u00f6k igen", "Search": "S\u00f6k", - "Search...": "S\u00f6k...", "Search from selected vocabularies": "S\u00f6k i utvalda vokabul\u00e4rer", "Search from vocabulary": "S\u00f6k i vokabul\u00e4r", "Search language: any": "p\u00e5 alla spr\u00e5k", "Search options": "S\u00f6kalternativ", "Search options tab": "Flik f\u00f6r s\u00f6kval", "Search results": "S\u00f6kresultat", + "Search...": "S\u00f6k...", "Select a vocabulary": "Du kan v\u00e4lja en vokabul\u00e4r", "Send feedback": "S\u00e4nd respons", "Sidebar listing: list and traverse vocabulary contents by a criterion": "Sidof\u00e4ltlista: ordna och bl\u00e4ddra begrepp efter kriterier", From dcd2becdf7883dd82bdd037ba36ad09eb45f6a37 Mon Sep 17 00:00:00 2001 From: Osma Suominen Date: Thu, 30 Jan 2025 15:44:20 +0200 Subject: [PATCH 4/6] fix spelling error --- resource/translations/messages.sv.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/translations/messages.sv.json b/resource/translations/messages.sv.json index 974050620..5e3313d90 100644 --- a/resource/translations/messages.sv.json +++ b/resource/translations/messages.sv.json @@ -42,7 +42,7 @@ "Error: Term \"%term%\" not found in vocabulary!": "Fel: Termen \"%term\" finns inte i vokabul\u00e4ren!", "Feedback": "Respons", "Feedback has been sent!": "Respons har skickats!", - "Go to the concept page": "G\u00e5 till begreppsidan", + "Go to the concept page": "G\u00e5 till begreppssidan", "Group index": "Gruppindex", "Group-nav": "Gruppindex", "Help": "Hj\u00e4lp", From defe223679ce5417e33da28a0359828f4a372d83 Mon Sep 17 00:00:00 2001 From: Osma Suominen Date: Thu, 30 Jan 2025 15:56:06 +0200 Subject: [PATCH 5/6] sync with Lokalise --- resource/translations/messages.se.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/translations/messages.se.json b/resource/translations/messages.se.json index 28365aaab..d5d56974e 100644 --- a/resource/translations/messages.se.json +++ b/resource/translations/messages.se.json @@ -69,13 +69,13 @@ "Resource counts by type": "Resurssaid lohkomearri tiippaid mielde", "Retry": "Iskka o\u0111\u0111asit", "Search": "Oza", - "Search...": "Oza...", "Search from selected vocabularies": "Oza v\u00e1lljejuvvon s\u00e1tner\u00e1juin", "Search from vocabulary": "Oza s\u00e1tner\u00e1jus", "Search language: any": "Buot gielat", "Search options": "R\u00e1ddjen", "Search options tab": "Ohcanv\u00e1lljemiid siidu", "Search results": "Ohcanbohtosat", + "Search...": "Oza...", "Select a vocabulary": "Don s\u00e1ht\u00e1t v\u00e1lljet s\u00e1tner\u00e1ju", "Send feedback": "S\u00e1dde m\u00e1hcahaga", "Sidebar listing: list and traverse vocabulary contents by a criterion": "Siidobielkk\u00e1 listu: ordne ja bl\u00e1\u0111e doahpagiid sierra kriteraid mielde. ", From 3eff98ff52ccaec0861a787ffa53aff8b74d516c Mon Sep 17 00:00:00 2001 From: Osma Suominen Date: Thu, 30 Jan 2025 16:04:48 +0200 Subject: [PATCH 6/6] fix cypress test that broke due to changed translation for aria tag --- tests/cypress/template/sidebar-alpha.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cypress/template/sidebar-alpha.cy.js b/tests/cypress/template/sidebar-alpha.cy.js index 81e4bbaf5..9cc17b533 100644 --- a/tests/cypress/template/sidebar-alpha.cy.js +++ b/tests/cypress/template/sidebar-alpha.cy.js @@ -124,7 +124,7 @@ describe('Alphabetical index', () => { cy.visit('/yso/en/') cy.get('#tab-alphabetical .list-group-item > a').should('have.attr', 'aria-label', 'Go to the concept page') cy.visit('/yso/sv/') - cy.get('#tab-alphabetical .list-group-item > a').should('have.attr', 'aria-label', 'Gå till begreppsidan') + cy.get('#tab-alphabetical .list-group-item > a').should('have.attr', 'aria-label', 'Gå till begreppssidan') cy.visit('/yso/fi/') cy.get('#tab-alphabetical .list-group-item > a').should('have.attr', 'aria-label', 'Mene käsitesivulle') })