contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge branch 'develop' into feature/search

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-09-11 17:32:49 +02:00
commit 902a479e3b
113 changed files with 2977 additions and 3515 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/UI/BigComponents/FilterPage.svelte
View file

@ -60,7 +60,7 @@
<Tr t={Translations.t.general.menu.filter} />
</div>
<div class="ml-2 flex gap-x-2 self-end self-end text-sm">
<div class="ml-2 flex gap-x-2 text-sm">
<button class="small as-link" class:disabled={allEnabled} on:click={() => enableAll(true)}>
<Tr t={Translations.t.general.filterPanel.enableAll} />
</button>

1
src/UI/BigComponents/Filterview.svelte
View file

@ -7,7 +7,6 @@
import ToSvelte from "../Base/ToSvelte.svelte"
import Checkbox from "../Base/Checkbox.svelte"
import FilterConfig from "../../Models/ThemeConfig/FilterConfig"
import If from "../Base/If.svelte"
import Dropdown from "../Base/Dropdown.svelte"
import { ImmutableStore, Store, UIEventSource } from "../../Logic/UIEventSource"
import FilterviewWithFields from "./FilterviewWithFields.svelte"

7
src/UI/BigComponents/MenuDrawer.svelte
View file

@ -2,7 +2,7 @@
// All the relevant links
import ThemeViewState from "../../Models/ThemeViewState"
import Translations from "../i18n/Translations"
import { CogIcon, EyeIcon, HeartIcon } from "@rgossiaux/svelte-heroicons/solid"
import { CogIcon, EyeIcon, HeartIcon, TranslateIcon } from "@rgossiaux/svelte-heroicons/solid"
import Page from "../Base/Page.svelte"
import PrivacyPolicy from "./PrivacyPolicy.svelte"
import Tr from "../Base/Tr.svelte"
@ -268,6 +268,11 @@
<Tr t={Translations.t.general.attribution.openIssueTracker} />
</a>
<a class="flex" href="https://hosted.weblate.org/projects/mapcomplete/" target="_blank">
<TranslateIcon class="h-6 w-6"/>
<Tr t={Translations.t.translations.activateButton} />
</a>
<a class="flex" href="https://en.osm.town/@MapComplete" target="_blank">
<Mastodon class="h-6 w-6" />
<Tr t={Translations.t.general.attribution.followOnMastodon} />

37
src/UI/Favourites/Favourites.svelte
View file

@ -22,7 +22,7 @@
JSON.stringify(contents),
"mapcomplete-favourites-" + new Date().toISOString() + ".geojson",
{
mimetype: "application/vnd.geo+json",
mimetype: "application/vnd.geo+json"
}
)
}
@ -33,7 +33,7 @@
gpx,
"mapcomplete-favourites-" + new Date().toISOString() + ".gpx",
{
mimetype: "{gpx=application/gpx+xml}",
mimetype: "{gpx=application/gpx+xml}"
}
)
}
@ -46,23 +46,28 @@
</LoginButton>
</div>
<div class="flex flex-col" on:keypress={(e) => console.log("Got keypress", e)}>
<Tr t={Translations.t.favouritePoi.intro.Subs({ length: $favourites?.length ?? 0 })} />
<Tr t={Translations.t.favouritePoi.introPrivacy} />
<div class="flex flex-col">
{#if $favourites.length === 0}
<Tr t={Translations.t.favouritePoi.noneYet} />
{:else}
<Tr t={Translations.t.favouritePoi.intro.Subs({ length: $favourites?.length ?? 0 })} />
<Tr t={Translations.t.favouritePoi.introPrivacy} />
{/if}
{#each $favourites as feature (feature.properties.id)}
<FavouriteSummary {feature} {state} />
{/each}
<div class="mt-8 flex">
<button on:click={() => downloadGeojson()}>
<ArrowDownTray class="h-6 w-6" />
<Tr t={Translations.t.favouritePoi.downloadGeojson} />
</button>
<button on:click={() => downloadGPX()}>
<ArrowDownTray class="h-6 w-6" />
<Tr t={Translations.t.favouritePoi.downloadGpx} />
</button>
</div>
{#if $favourites.length > 0}
<div class="mt-8 flex">
<button on:click={() => downloadGeojson()}>
<ArrowDownTray class="h-6 w-6" />
<Tr t={Translations.t.favouritePoi.downloadGeojson} />
</button>
<button on:click={() => downloadGPX()}>
<ArrowDownTray class="h-6 w-6" />
<Tr t={Translations.t.favouritePoi.downloadGpx} />
</button>
</div>
{/if}
</div>
</LoginToggle>

2
src/assets/contributors.json
View file

@ -1,7 +1,7 @@
{
"contributors": [
{
"commits": 8118,
"commits": 8127,
"contributor": "Pieter Vander Vennet"
},
{

1
src/assets/language_in_country.json
View file

@ -503,6 +503,7 @@
"pl"
],
"PS": [
"ar",
"ar"
],
"PT": [

42
src/assets/translators.json
View file

@ -1,11 +1,11 @@
{
"contributors": [
{
"commits": 478,
"commits": 479,
"contributor": "Pieter Vander Vennet"
},
{
"commits": 368,
"commits": 385,
"contributor": "kjon"
},
{
@ -36,6 +36,10 @@
"commits": 44,
"contributor": "Supaplex"
},
{
"commits": 36,
"contributor": "Jiří Podhorecký"
},
{
"commits": 36,
"contributor": "Lucas"
@ -45,17 +49,13 @@
"contributor": "Iago"
},
{
"commits": 34,
"contributor": "Jiří Podhorecký"
"commits": 33,
"contributor": "gallegonovato"
},
{
"commits": 32,
"contributor": "Babos Gábor"
},
{
"commits": 30,
"contributor": "gallegonovato"
},
{
"commits": 29,
"contributor": "Artem"
@ -70,11 +70,11 @@
},
{
"commits": 23,
"contributor": "Marco"
"contributor": "Štefan Baebler"
},
{
"commits": 21,
"contributor": "Štefan Baebler"
"commits": 23,
"contributor": "Marco"
},
{
"commits": 18,
@ -168,6 +168,10 @@
"commits": 10,
"contributor": "Irina"
},
{
"commits": 9,
"contributor": "Krzysztof Chorzempa"
},
{
"commits": 9,
"contributor": "Lasse Liehu"
@ -196,10 +200,6 @@
"commits": 8,
"contributor": "nilocram"
},
{
"commits": 8,
"contributor": "Krzysztof Chorzempa"
},
{
"commits": 8,
"contributor": "Vinicius"
@ -328,6 +328,10 @@
"commits": 4,
"contributor": "Jan Zabel"
},
{
"commits": 3,
"contributor": "Thomas"
},
{
"commits": 3,
"contributor": "Paolo Mauri"
@ -400,10 +404,6 @@
"commits": 3,
"contributor": "SiegbjornSitumeang"
},
{
"commits": 2,
"contributor": "Thomas"
},
{
"commits": 2,
"contributor": "Beardhatcode"
@ -524,6 +524,10 @@
"commits": 2,
"contributor": "Leo Alcaraz"
},
{
"commits": 1,
"contributor": "tiptoptom"
},
{
"commits": 1,
"contributor": "aTarom"