From 033f4f2a9b542bdb58bf2a913cf436d917d108c9 Mon Sep 17 00:00:00 2001 From: a-ill Date: Sun, 16 Jul 2023 14:22:48 +0300 Subject: [PATCH] Update --- Server/app/svelte/public/js/communes.js | 2 +- Server/app/svelte/public/js/coops.js | 2 +- Server/app/svelte/public/js/groups.js | 2 +- Server/app/svelte/public/js/parties.js | 2 +- Server/app/svelte/public/locales/en/communes-component.json | 3 ++- .../app/svelte/public/locales/en/cooperatives-component.json | 3 ++- Server/app/svelte/public/locales/en/groups-component.json | 3 ++- Server/app/svelte/public/locales/en/parties-component.json | 3 ++- Server/app/svelte/public/locales/ru/communes-component.json | 3 ++- .../app/svelte/public/locales/ru/cooperatives-component.json | 3 ++- Server/app/svelte/public/locales/ru/groups-component.json | 3 ++- Server/app/svelte/public/locales/ru/parties-component.json | 3 ++- Server/public/js/communes.js | 2 +- Server/public/js/coops.js | 2 +- Server/public/js/groups.js | 2 +- Server/public/js/parties.js | 2 +- Server/public/locales/en/communes-component.json | 3 ++- Server/public/locales/en/cooperatives-component.json | 3 ++- Server/public/locales/en/groups-component.json | 3 ++- Server/public/locales/en/parties-component.json | 3 ++- Server/public/locales/ru/communes-component.json | 3 ++- Server/public/locales/ru/cooperatives-component.json | 3 ++- Server/public/locales/ru/groups-component.json | 3 ++- Server/public/locales/ru/parties-component.json | 3 ++- 24 files changed, 40 insertions(+), 24 deletions(-) diff --git a/Server/app/svelte/public/js/communes.js b/Server/app/svelte/public/js/communes.js index 62e8611..248912d 100644 --- a/Server/app/svelte/public/js/communes.js +++ b/Server/app/svelte/public/js/communes.js @@ -42,7 +42,7 @@ export let communesMarkersLayer = L.layerGroup() export function addMarkersCommunes(map,content) { for (let g of communes) { let coordinates - let text = "Commune
" + let text = ""+content["Commune"]+"
" for (let field in g) { let fieldText = content[field] + ": " if (field=="contact") { diff --git a/Server/app/svelte/public/js/coops.js b/Server/app/svelte/public/js/coops.js index ab76235..1ece495 100644 --- a/Server/app/svelte/public/js/coops.js +++ b/Server/app/svelte/public/js/coops.js @@ -39,7 +39,7 @@ export let coopsMarkersLayer = L.layerGroup() export function addMarkersCoops(map,content) { for (let g of coops) { let coordinates - let text = "Cooperative
" + let text = ""+content["Cooperative"]+"
" for (let field in g) { let fieldText if (field!="logo") { diff --git a/Server/app/svelte/public/js/groups.js b/Server/app/svelte/public/js/groups.js index 18a1d57..b88b237 100644 --- a/Server/app/svelte/public/js/groups.js +++ b/Server/app/svelte/public/js/groups.js @@ -60,7 +60,7 @@ let contactGeneral =["https://discord.gg/4BUau4AZre","DiscordInviteLink"] function addMarkersToLayer(g,layer,content) { let coordinates - let text = "Group
" + let text = ""+content["Group"]+"
" for (let field in g) { let fieldText = content[field] + ": " if (field=="contact") { diff --git a/Server/app/svelte/public/js/parties.js b/Server/app/svelte/public/js/parties.js index 0302db1..a4bb166 100644 --- a/Server/app/svelte/public/js/parties.js +++ b/Server/app/svelte/public/js/parties.js @@ -25,7 +25,7 @@ export let partiesMarkersLayer = L.layerGroup() export function addMarkersParties(map,content) { for (let g of parties) { let coordinates - let text = "Party
" + let text = ""+content["Party"]+"
" for (let field in g) { let fieldText if (field!="logo") { diff --git a/Server/app/svelte/public/locales/en/communes-component.json b/Server/app/svelte/public/locales/en/communes-component.json index 38004fe..e9c522f 100644 --- a/Server/app/svelte/public/locales/en/communes-component.json +++ b/Server/app/svelte/public/locales/en/communes-component.json @@ -9,5 +9,6 @@ "contact": "Contact", "forming": "forming", "WhatsAppInviteLink": "WhatsApp invite link", - "DiscordInviteLink": "Discord invite link" + "DiscordInviteLink": "Discord invite link", + "Commune": "Commune" } \ No newline at end of file diff --git a/Server/app/svelte/public/locales/en/cooperatives-component.json b/Server/app/svelte/public/locales/en/cooperatives-component.json index 55cd22d..b246fd4 100644 --- a/Server/app/svelte/public/locales/en/cooperatives-component.json +++ b/Server/app/svelte/public/locales/en/cooperatives-component.json @@ -17,6 +17,7 @@ "DiscordInviteLink": "Discord invite link", "descriptionChironHealth": "Chiron Health is a health platform providing courses and services on the topics of nutrition, exercise, sleep and mental wellbeing.", "herbalTeas": "herbal teas", - "kuuskDescription": "Kuusk is an online store that sells herbal teas from exclusively local wild plants, as well as an online gathering course." + "kuuskDescription": "Kuusk is an online store that sells herbal teas from exclusively local wild plants, as well as an online gathering course.", + "Cooperative": "Cooperative" } \ No newline at end of file diff --git a/Server/app/svelte/public/locales/en/groups-component.json b/Server/app/svelte/public/locales/en/groups-component.json index cc3b368..18e5fb4 100644 --- a/Server/app/svelte/public/locales/en/groups-component.json +++ b/Server/app/svelte/public/locales/en/groups-component.json @@ -7,5 +7,6 @@ "members": "Members", "contact": "Contact", "DiscordInviteLink": "Discord invite link", - "WhatsAppInviteLink": "WhatsApp invite link" + "WhatsAppInviteLink": "WhatsApp invite link", + "Group": "Group" } \ No newline at end of file diff --git a/Server/app/svelte/public/locales/en/parties-component.json b/Server/app/svelte/public/locales/en/parties-component.json index 22f9515..317e43c 100644 --- a/Server/app/svelte/public/locales/en/parties-component.json +++ b/Server/app/svelte/public/locales/en/parties-component.json @@ -7,5 +7,6 @@ "members": "Members", "link": "Link", "description": "Description", - "descriptionRoots": "We are a left libertarian organization based in Ireland. We have a focus on rebuilding the country's infrastructure, sense of governance, housing, agricultural industries and youth affairs." + "descriptionRoots": "We are a left libertarian organization based in Ireland. We have a focus on rebuilding the country's infrastructure, sense of governance, housing, agricultural industries and youth affairs.", + "Party": "Party" } \ No newline at end of file diff --git a/Server/app/svelte/public/locales/ru/communes-component.json b/Server/app/svelte/public/locales/ru/communes-component.json index 28b8ae9..d8e3064 100644 --- a/Server/app/svelte/public/locales/ru/communes-component.json +++ b/Server/app/svelte/public/locales/ru/communes-component.json @@ -8,5 +8,6 @@ "contact": "Контакт", "forming": "формируется", "WhatsAppInviteLink": "WhatsApp ссылка", - "DiscordInviteLink": "Discord ссылка" + "DiscordInviteLink": "Discord ссылка", + "Commune": "Коммуна" } \ No newline at end of file diff --git a/Server/app/svelte/public/locales/ru/cooperatives-component.json b/Server/app/svelte/public/locales/ru/cooperatives-component.json index 3847769..c04de71 100644 --- a/Server/app/svelte/public/locales/ru/cooperatives-component.json +++ b/Server/app/svelte/public/locales/ru/cooperatives-component.json @@ -17,5 +17,6 @@ "DiscordInviteLink": "Discord ссылка", "descriptionChironHealth": "Chiron Health — это платформа о здоровье, предлагающая курсы и услуги по вопросам питания, физических упражнений, сна и психического благополучия", "herbalTeas": "травяные чаи", - "kuuskDescription": "Kuusk — интернет-магазин, в котором продаются травяные чаи исключительно из местных дикорастущих растений, а также онлайн-курс по собирательству." + "kuuskDescription": "Kuusk — интернет-магазин, в котором продаются травяные чаи исключительно из местных дикорастущих растений, а также онлайн-курс по собирательству.", + "Cooperative": "Кооператив" } \ No newline at end of file diff --git a/Server/app/svelte/public/locales/ru/groups-component.json b/Server/app/svelte/public/locales/ru/groups-component.json index 2f966af..4d0d9ff 100644 --- a/Server/app/svelte/public/locales/ru/groups-component.json +++ b/Server/app/svelte/public/locales/ru/groups-component.json @@ -6,5 +6,6 @@ "members": "Участники", "contact": "Контакт", "DiscordInviteLink": "Discord ссылка", - "WhatsAppInviteLink": "WhatsApp ссылка" + "WhatsAppInviteLink": "WhatsApp ссылка", + "Group": "Группа" } \ No newline at end of file diff --git a/Server/app/svelte/public/locales/ru/parties-component.json b/Server/app/svelte/public/locales/ru/parties-component.json index 6ed9247..9a3d3fd 100644 --- a/Server/app/svelte/public/locales/ru/parties-component.json +++ b/Server/app/svelte/public/locales/ru/parties-component.json @@ -8,5 +8,6 @@ "link": "Ссылка", "description": "Описание", "ireland": "Ирландия", - "descriptionRoots": "Мы — левая либертарная организация, базирующаяся в Ирландии. Мы уделяем особое внимание восстановлению инфраструктуры страны, самоуправлению, жилищному строительству, сельскохозяйственной промышленности и делам молодежи." + "descriptionRoots": "Мы — левая либертарная организация, базирующаяся в Ирландии. Мы уделяем особое внимание восстановлению инфраструктуры страны, самоуправлению, жилищному строительству, сельскохозяйственной промышленности и делам молодежи.", + "Party": "Партия" } \ No newline at end of file diff --git a/Server/public/js/communes.js b/Server/public/js/communes.js index 62e8611..248912d 100644 --- a/Server/public/js/communes.js +++ b/Server/public/js/communes.js @@ -42,7 +42,7 @@ export let communesMarkersLayer = L.layerGroup() export function addMarkersCommunes(map,content) { for (let g of communes) { let coordinates - let text = "Commune
" + let text = ""+content["Commune"]+"
" for (let field in g) { let fieldText = content[field] + ": " if (field=="contact") { diff --git a/Server/public/js/coops.js b/Server/public/js/coops.js index ab76235..1ece495 100644 --- a/Server/public/js/coops.js +++ b/Server/public/js/coops.js @@ -39,7 +39,7 @@ export let coopsMarkersLayer = L.layerGroup() export function addMarkersCoops(map,content) { for (let g of coops) { let coordinates - let text = "Cooperative
" + let text = ""+content["Cooperative"]+"
" for (let field in g) { let fieldText if (field!="logo") { diff --git a/Server/public/js/groups.js b/Server/public/js/groups.js index 18a1d57..b88b237 100644 --- a/Server/public/js/groups.js +++ b/Server/public/js/groups.js @@ -60,7 +60,7 @@ let contactGeneral =["https://discord.gg/4BUau4AZre","DiscordInviteLink"] function addMarkersToLayer(g,layer,content) { let coordinates - let text = "Group
" + let text = ""+content["Group"]+"
" for (let field in g) { let fieldText = content[field] + ": " if (field=="contact") { diff --git a/Server/public/js/parties.js b/Server/public/js/parties.js index 0302db1..a4bb166 100644 --- a/Server/public/js/parties.js +++ b/Server/public/js/parties.js @@ -25,7 +25,7 @@ export let partiesMarkersLayer = L.layerGroup() export function addMarkersParties(map,content) { for (let g of parties) { let coordinates - let text = "Party
" + let text = ""+content["Party"]+"
" for (let field in g) { let fieldText if (field!="logo") { diff --git a/Server/public/locales/en/communes-component.json b/Server/public/locales/en/communes-component.json index 38004fe..e9c522f 100644 --- a/Server/public/locales/en/communes-component.json +++ b/Server/public/locales/en/communes-component.json @@ -9,5 +9,6 @@ "contact": "Contact", "forming": "forming", "WhatsAppInviteLink": "WhatsApp invite link", - "DiscordInviteLink": "Discord invite link" + "DiscordInviteLink": "Discord invite link", + "Commune": "Commune" } \ No newline at end of file diff --git a/Server/public/locales/en/cooperatives-component.json b/Server/public/locales/en/cooperatives-component.json index 55cd22d..b246fd4 100644 --- a/Server/public/locales/en/cooperatives-component.json +++ b/Server/public/locales/en/cooperatives-component.json @@ -17,6 +17,7 @@ "DiscordInviteLink": "Discord invite link", "descriptionChironHealth": "Chiron Health is a health platform providing courses and services on the topics of nutrition, exercise, sleep and mental wellbeing.", "herbalTeas": "herbal teas", - "kuuskDescription": "Kuusk is an online store that sells herbal teas from exclusively local wild plants, as well as an online gathering course." + "kuuskDescription": "Kuusk is an online store that sells herbal teas from exclusively local wild plants, as well as an online gathering course.", + "Cooperative": "Cooperative" } \ No newline at end of file diff --git a/Server/public/locales/en/groups-component.json b/Server/public/locales/en/groups-component.json index cc3b368..18e5fb4 100644 --- a/Server/public/locales/en/groups-component.json +++ b/Server/public/locales/en/groups-component.json @@ -7,5 +7,6 @@ "members": "Members", "contact": "Contact", "DiscordInviteLink": "Discord invite link", - "WhatsAppInviteLink": "WhatsApp invite link" + "WhatsAppInviteLink": "WhatsApp invite link", + "Group": "Group" } \ No newline at end of file diff --git a/Server/public/locales/en/parties-component.json b/Server/public/locales/en/parties-component.json index 22f9515..317e43c 100644 --- a/Server/public/locales/en/parties-component.json +++ b/Server/public/locales/en/parties-component.json @@ -7,5 +7,6 @@ "members": "Members", "link": "Link", "description": "Description", - "descriptionRoots": "We are a left libertarian organization based in Ireland. We have a focus on rebuilding the country's infrastructure, sense of governance, housing, agricultural industries and youth affairs." + "descriptionRoots": "We are a left libertarian organization based in Ireland. We have a focus on rebuilding the country's infrastructure, sense of governance, housing, agricultural industries and youth affairs.", + "Party": "Party" } \ No newline at end of file diff --git a/Server/public/locales/ru/communes-component.json b/Server/public/locales/ru/communes-component.json index 28b8ae9..d8e3064 100644 --- a/Server/public/locales/ru/communes-component.json +++ b/Server/public/locales/ru/communes-component.json @@ -8,5 +8,6 @@ "contact": "Контакт", "forming": "формируется", "WhatsAppInviteLink": "WhatsApp ссылка", - "DiscordInviteLink": "Discord ссылка" + "DiscordInviteLink": "Discord ссылка", + "Commune": "Коммуна" } \ No newline at end of file diff --git a/Server/public/locales/ru/cooperatives-component.json b/Server/public/locales/ru/cooperatives-component.json index 3847769..c04de71 100644 --- a/Server/public/locales/ru/cooperatives-component.json +++ b/Server/public/locales/ru/cooperatives-component.json @@ -17,5 +17,6 @@ "DiscordInviteLink": "Discord ссылка", "descriptionChironHealth": "Chiron Health — это платформа о здоровье, предлагающая курсы и услуги по вопросам питания, физических упражнений, сна и психического благополучия", "herbalTeas": "травяные чаи", - "kuuskDescription": "Kuusk — интернет-магазин, в котором продаются травяные чаи исключительно из местных дикорастущих растений, а также онлайн-курс по собирательству." + "kuuskDescription": "Kuusk — интернет-магазин, в котором продаются травяные чаи исключительно из местных дикорастущих растений, а также онлайн-курс по собирательству.", + "Cooperative": "Кооператив" } \ No newline at end of file diff --git a/Server/public/locales/ru/groups-component.json b/Server/public/locales/ru/groups-component.json index 2f966af..4d0d9ff 100644 --- a/Server/public/locales/ru/groups-component.json +++ b/Server/public/locales/ru/groups-component.json @@ -6,5 +6,6 @@ "members": "Участники", "contact": "Контакт", "DiscordInviteLink": "Discord ссылка", - "WhatsAppInviteLink": "WhatsApp ссылка" + "WhatsAppInviteLink": "WhatsApp ссылка", + "Group": "Группа" } \ No newline at end of file diff --git a/Server/public/locales/ru/parties-component.json b/Server/public/locales/ru/parties-component.json index 6ed9247..9a3d3fd 100644 --- a/Server/public/locales/ru/parties-component.json +++ b/Server/public/locales/ru/parties-component.json @@ -8,5 +8,6 @@ "link": "Ссылка", "description": "Описание", "ireland": "Ирландия", - "descriptionRoots": "Мы — левая либертарная организация, базирующаяся в Ирландии. Мы уделяем особое внимание восстановлению инфраструктуры страны, самоуправлению, жилищному строительству, сельскохозяйственной промышленности и делам молодежи." + "descriptionRoots": "Мы — левая либертарная организация, базирующаяся в Ирландии. Мы уделяем особое внимание восстановлению инфраструктуры страны, самоуправлению, жилищному строительству, сельскохозяйственной промышленности и делам молодежи.", + "Party": "Партия" } \ No newline at end of file