Compare commits

...

871 commits

Author SHA1 Message Date
Yohan Boniface
a3a520dec4 3.0.5
Some checks failed
Release Charts / release (push) Has been cancelled
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
2025-04-25 17:45:37 +02:00
Yohan Boniface
4b4f9bbc5c i18n 2025-04-25 17:40:47 +02:00
Yohan Boniface
279717e630 chore: fix badge visibility in filter tab in browser panel
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-25 17:29:18 +02:00
Yohan Boniface
39e4e2a33c
fix: make sure DataLayer rank is always set (#2682) 2025-04-25 17:20:10 +02:00
Yohan Boniface
e5dbca21b0 fix: make sure DataLayer rank is always set
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-25 17:12:17 +02:00
Yohan Boniface
1ecddc1c02
chore: use details/summary for datalayers boxes in browser (#2680)
![image](https://github.com/user-attachments/assets/978e2f05-b7f3-4648-afec-92a24a88226a)
2025-04-25 16:29:06 +02:00
Yohan Boniface
8658e7eba7 chore: use details/summary for datalayers boxes in browser 2025-04-25 16:20:37 +02:00
Yohan Boniface
6ac3685172
fix: fix error when saving and deleting heatmap layer (#2681) 2025-04-25 15:57:17 +02:00
Yohan Boniface
1085861d42 chore: add --maxfail to py.test in make test command
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-25 15:56:20 +02:00
Yohan Boniface
fab0c8f9ea fix: fix error when saving and deleting heatmap layer
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-25 15:47:33 +02:00
Yohan Boniface
858768896e
fix: loading remote data should not make the map dirty (#2679)
See the second commit for the logic change.
2025-04-25 15:35:38 +02:00
Yohan Boniface
bffbeb5230
fix: allow to save/undo/sync drag'n'drop of datalayers (#2677)
This also:
- introduces a new DataLayerManager
- removes the _umap_options coming from the geojson form the server
- removes all backup related functions (now we have undo/redo)

fix #2674
2025-04-25 15:35:23 +02:00
Yohan Boniface
f01a74f19f i18n 2025-04-25 11:29:43 +02:00
Yohan Boniface
00228ccf92 fix: loading remote data should not make the map dirty 2025-04-25 11:25:54 +02:00
Yohan Boniface
6c8046456a chore: remove unused isDirty flags 2025-04-25 09:44:49 +02:00
Yohan Boniface
626b669d89 fixup: fix tests 2025-04-25 07:09:31 +02:00
Yohan Boniface
5af41b4528 fix: allow to save/undo/sync drag'n'drop of datalayers
This also:
- introduces a new DataLayerManager
- removes the _umap_options coming from the geojson form the server
- removes all backup related functions (now we have undo/redo)

Co-authored-by: David Larlet <david@larlet.fr>
2025-04-24 18:38:02 +02:00
Yohan Boniface
1a9c325f16
fix: setting center and zoom manually should set dirty status (#2676)
Some checks failed
Release Charts / release (push) Has been cancelled
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
2025-04-23 18:51:36 +02:00
Yohan Boniface
19d16ac01b fix: setting center and zoom manually should set dirty status
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-23 18:00:48 +02:00
Yohan Boniface
efaa765b82
chore: cleaning core utils and removing DomUtil/DomEvent from modules (#2671) 2025-04-23 17:51:45 +02:00
Yohan Boniface
92ca581fb6
fix: allow to save a remote data with unloaded data (#2657)
When loading remote data fails, the layer is in state "unloaded", and
thus it was not possible to save it.
This "isLoaded" check is made for non remote layer so that we don't save
it by mistake with no data.

Also, let's allow to edit non loaded layers, this check was there when
settings was not on db, so not all loaded at map init, again not to
override with incomplete metadata.
2025-04-23 17:49:12 +02:00
Yohan Boniface
6687cd53ba
feat: add a back button in rules form (#2673)
To go back in rules list.

fix #2631


![image](https://github.com/user-attachments/assets/d0ad67fe-90c1-45c5-8bca-5ac30ef8366a)
2025-04-23 17:43:22 +02:00
Yohan Boniface
4997ee8860
feat: naive support for GeometryCollection as Feature geometry (#2658)
Currently, we just skip those, but sometimes togeojson produces this
output from a KML.
This will create one feature per geometry, while in an ideal world this
should be a multi, but we lack reliable geometry tools to merge the
geometries without risking to create mistakes.
So let's say it's a first improvement.
2025-04-23 17:43:05 +02:00
Yohan Boniface
a708316604
fix: make rules reordering syncable, savable and undoable (#2672) 2025-04-23 17:42:47 +02:00
Yohan Boniface
71d92aa610
fix: show an error message if saving layer failed (#2670)
This could occur when server is down or there is no network.
2025-04-23 17:40:19 +02:00
Yohan Boniface
41752bd0c6
fix: do not display "saved" message if some request failed (#2669) 2025-04-23 17:39:59 +02:00
Yohan Boniface
5b6138a210
chore: move pure Leaflet controls to modules (#2668)
pure == inheriting from Leaflet itself, not from some plugin (which
aren't ESM ready…)
2025-04-23 17:39:33 +02:00
Yohan Boniface
07363fa5fe chore: remove unused DomEvent.once 2025-04-23 16:52:55 +02:00
Yohan Boniface
7991d6cdbe chore: remove DomUtil.after/before 2025-04-23 16:50:13 +02:00
Yohan Boniface
60ac4b35f2 chore: remove most of DomUtil/DomEvent from browser.js 2025-04-23 16:24:15 +02:00
Yohan Boniface
bf2e9dc175 chore: remove call to DomUtil.createIcon in umap.js 2025-04-23 11:33:12 +02:00
Yohan Boniface
67ed6d5b44 feat: add a back button in rules form
To go back in rules list.

fix #2631
2025-04-23 10:55:39 +02:00
Yohan Boniface
fad182c5f3 fix: make rules reordering syncable, savable and undoable 2025-04-23 10:19:19 +02:00
Yohan Boniface
3f5d282477 chore: remove DomUtil and DomEvent dependency from rules.js 2025-04-23 10:14:22 +02:00
Yohan Boniface
49496348d2 chore: remove unused L.DomUtil.createLink method 2025-04-23 09:21:35 +02:00
Yohan Boniface
f8b13639aa fix: show an error message if saving layer failed
This could occur when server is down or there is no network.
2025-04-23 09:02:25 +02:00
Yohan Boniface
4c71710641 fix: do not display "saved" message if some request failed 2025-04-23 08:58:17 +02:00
Yohan Boniface
92d5c47844 chore: move pure Leaflet controls to modules
pure == inheriting from Leaflet itself, not from some plugin
(which aren't ESM ready…)
2025-04-22 20:14:06 +02:00
Yohan Boniface
05493d8a48
chore: bump uvicorn from 0.34.1 to 0.34.2 (#2664)
Some checks failed
Release Charts / release (push) Has been cancelled
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
2025-04-22 15:06:34 +02:00
Yohan Boniface
fd8f403a69
chore: bump mkdocs-material from 9.6.11 to 9.6.12 (#2665) 2025-04-22 15:06:19 +02:00
Yohan Boniface
a6412c9539
chore: bump ruff from 0.11.4 to 0.11.6 (#2666) 2025-04-22 15:06:01 +02:00
Yohan Boniface
fe65a5351b
chore: bump moto[s3] from 5.1.3 to 5.1.4 (#2667) 2025-04-22 15:05:44 +02:00
dependabot[bot]
2ede25f541
chore: bump moto[s3] from 5.1.3 to 5.1.4
Bumps [moto[s3]](https://github.com/getmoto/moto) from 5.1.3 to 5.1.4.
- [Release notes](https://github.com/getmoto/moto/releases)
- [Changelog](https://github.com/getmoto/moto/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getmoto/moto/compare/5.1.3...5.1.4)

---
updated-dependencies:
- dependency-name: moto[s3]
  dependency-version: 5.1.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-21 17:46:08 +00:00
dependabot[bot]
b7acdcfd93
chore: bump ruff from 0.11.4 to 0.11.6
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.11.4 to 0.11.6.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.11.4...0.11.6)

---
updated-dependencies:
- dependency-name: ruff
  dependency-version: 0.11.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-21 17:39:19 +00:00
dependabot[bot]
a3d2330661
chore: bump mkdocs-material from 9.6.11 to 9.6.12
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.6.11 to 9.6.12.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.6.11...9.6.12)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-version: 9.6.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-21 17:33:21 +00:00
dependabot[bot]
20ae374173
chore: bump uvicorn from 0.34.1 to 0.34.2
Bumps [uvicorn](https://github.com/encode/uvicorn) from 0.34.1 to 0.34.2.
- [Release notes](https://github.com/encode/uvicorn/releases)
- [Changelog](https://github.com/encode/uvicorn/blob/master/docs/release-notes.md)
- [Commits](https://github.com/encode/uvicorn/compare/0.34.1...0.34.2)

---
updated-dependencies:
- dependency-name: uvicorn
  dependency-version: 0.34.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-21 17:29:12 +00:00
David Larlet
162473da9d
chore: more design system elements (#2661)
Some checks failed
Release Charts / release (push) Has been cancelled
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
2025-04-18 10:03:12 -04:00
David Larlet
78d333c217
chore: more design system elements 2025-04-17 17:29:43 -04:00
Yohan Boniface
b0fe95dbd9 feat: naive support for GeometryCollection as Feature geometry
Currently, we just skip those, but sometimes togeojson produces this
output from a KML.
This will create one feature per geometry, while in an ideal world this
should be a multi, but we lack reliable geometry tools to merge the
geometries without risking to create mistakes.
So let's say it's a first improvement.
2025-04-16 18:28:23 +02:00
Yohan Boniface
23b82975f5 chore: bump togeojson
Some checks failed
Release Charts / release (push) Has been cancelled
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
2025-04-16 17:30:17 +02:00
Yohan Boniface
169be73488 fix: allow to save a remote data with unloaded data
When loading remote data fails, the layer is in state "unloaded",
and thus it was not possible to save it.
This "isLoaded" check is made for non remote layer so that we don't
save it by mistake with no data.

Also, let's allow to edit non loaded layers, this check was there
when settings was not on db, so not all loaded at map init, again
not to override with incomplete metadata.
2025-04-16 16:00:26 +02:00
Yohan Boniface
6945a5e867
feat: pass CSRF_TRUSTED_ORIGINS env to settings (#2656)
Some checks are pending
Release Charts / release (push) Waiting to run
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Allow to manage djangos CSRF_TRUSTED_ORIGINS by environment variables.

Closes #2655
2025-04-16 12:34:49 +02:00
Oliver Lippert
2ed890202e
code formatting 2025-04-16 12:25:17 +02:00
Oliver Lippert
cc7685ca3f
pass CSRF_TRUSTED_ORIGINS env to settings
fixes https://github.com/umap-project/umap/issues/2655
2025-04-16 12:23:09 +02:00
David Larlet
23688b6444
feat: implement a design system for UI consistency (#2654)
Some checks are pending
Release Charts / release (push) Waiting to run
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2025-04-15 08:19:31 -04:00
David Larlet
d3c0947fa5
feat: implement a design system for UI consistency 2025-04-14 23:20:55 -04:00
Yohan Boniface
a135e5c3e1
chore: bump pytest-django from 4.10.0 to 4.11.1 (#2653)
Some checks are pending
Release Charts / release (push) Waiting to run
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2025-04-14 19:50:30 +02:00
Yohan Boniface
2ad46046f8
chore: bump uvicorn from 0.34.0 to 0.34.1 (#2651) 2025-04-14 19:50:14 +02:00
Yohan Boniface
5271d7c19d
chore: bump pydantic from 2.11.2 to 2.11.3 (#2652) 2025-04-14 19:36:42 +02:00
Yohan Boniface
a535c86f6b
chore: bump mkdocs-material from 9.6.10 to 9.6.11 (#2649) 2025-04-14 19:36:16 +02:00
Yohan Boniface
9aa1f58dc8
chore: bump pillow from 11.1.0 to 11.2.1 (#2650)
Bumps [pillow](https://github.com/python-pillow/Pillow) from 11.1.0 to
11.2.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/python-pillow/Pillow/releases">pillow's
releases</a>.</em></p>
<blockquote>
<h2>11.2.1</h2>
<p><a
href="https://pillow.readthedocs.io/en/stable/releasenotes/11.2.1.html">https://pillow.readthedocs.io/en/stable/releasenotes/11.2.1.html</a></p>
<h2>Deprecations</h2>
<ul>
<li>Moved get_child_images() to ImageFile <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8689">#8689</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
</ul>
<h2>Documentation</h2>
<ul>
<li>Add 11.2.1 release notes <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8885">#8885</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Added avif to config settings <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8875">#8875</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Added release notes for <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8330">#8330</a>
<a
href="https://redirect.github.com/python-pillow/Pillow/issues/8853">#8853</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Added release notes for <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8781">#8781</a>
and <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8837">#8837</a>
<a
href="https://redirect.github.com/python-pillow/Pillow/issues/8843">#8843</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Added media_white_point to ImageCms documentation <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8829">#8829</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Removed FIXME <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8825">#8825</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Updated comment <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8822">#8822</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Added release notes for <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8807">#8807</a>
<a
href="https://redirect.github.com/python-pillow/Pillow/issues/8824">#8824</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>DXT3 images are read in RGBA mode <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8817">#8817</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>JPEG comments are from the COM marker <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8788">#8788</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Update Sphinx to 8.2 to remove nitpick ignore <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8763">#8763</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Updated AffineTransform docstring to mention it uses the inverse
matrix <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8735">#8735</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Added MozJPEG documentation <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8699">#8699</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Added Sphinx configuration key <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8691">#8691</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Updated macOS tested Pillow versions <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8654">#8654</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
</ul>
<h2>Dependencies</h2>
<ul>
<li>Updated xz to 5.8.1 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8868">#8868</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Updated harfbuzz to 11.0.1 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8870">#8870</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Update scientific-python/upload-nightly-action action to v0.6.2 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8865">#8865</a>
[@<a href="https://github.com/apps/renovate">renovate[bot]</a>]</li>
<li>Updated xz to 5.8.0 in macOS and Linux wheels, but not on
manylinux2014 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8836">#8836</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Update dependency cibuildwheel to v2.23.2 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8832">#8832</a>
[@<a href="https://github.com/apps/renovate">renovate[bot]</a>]</li>
<li>Updated harfbuzz to 11.0.0 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8830">#8830</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Update dependency cibuildwheel to v2.23.1 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8818">#8818</a>
[@<a href="https://github.com/apps/renovate">renovate[bot]</a>]</li>
<li>Updated Ghostscript to 10.5.0 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8814">#8814</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Updated libtiff to 4.7.0 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8812">#8812</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>[pre-commit.ci] pre-commit autoupdate <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8795">#8795</a>
[@<a
href="https://github.com/apps/pre-commit-ci">pre-commit-ci[bot]</a>]</li>
<li>Updated harfbuzz to 10.4.0 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8770">#8770</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Update dependency mypy to v1.15.0 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8791">#8791</a>
[@<a href="https://github.com/apps/renovate">renovate[bot]</a>]</li>
<li>Updated libpng to 1.6.47 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8764">#8764</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Updated lcms2 to 2.17 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8742">#8742</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Update dependency cibuildwheel to v2.23.0 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8785">#8785</a>
[@<a href="https://github.com/apps/renovate">renovate[bot]</a>]</li>
<li>Updated zlib-ng to 2.2.4 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8745">#8745</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Updated libimagequant to 4.3.4 on Windows <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8744">#8744</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>[pre-commit.ci] pre-commit autoupdate <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8729">#8729</a>
[@<a
href="https://github.com/apps/pre-commit-ci">pre-commit-ci[bot]</a>]</li>
<li>Updated harfbuzz to 10.2.0 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8688">#8688</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Updated xz to 5.6.4 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8711">#8711</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Updated libpng to 1.6.46 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8712">#8712</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Updated libimagequant to 4.3.4 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8710">#8710</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
<li>Updated libpng to 1.6.45 <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8670">#8670</a>
[<a
href="https://github.com/radarhere"><code>@​radarhere</code></a>]</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst">pillow's
changelog</a>.</em></p>
<blockquote>
<h1>Changelog (Pillow)</h1>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="339bc5db93"><code>339bc5d</code></a>
11.2.1 version bump</li>
<li><a
href="857b8846ea"><code>857b884</code></a>
Merge pull request <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8885">#8885</a>
from radarhere/releasenotes</li>
<li><a
href="7a0092f207"><code>7a0092f</code></a>
Remove incomplete 11.2.0 release, bill as 11.2.1 instead</li>
<li><a
href="d52c2db317"><code>d52c2db</code></a>
Do not include libavif in wheels</li>
<li><a
href="8dafc38371"><code>8dafc38</code></a>
Added 11.2.1 release notes</li>
<li><a
href="07d7800248"><code>07d7800</code></a>
Removed release notes update</li>
<li><a
href="04909483a7"><code>0490948</code></a>
Remove GPL v2 license (<a
href="https://redirect.github.com/python-pillow/Pillow/issues/8884">#8884</a>)</li>
<li><a
href="774d0aedce"><code>774d0ae</code></a>
Merge pull request <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8868">#8868</a>
from radarhere/xz_upgrade</li>
<li><a
href="d1e27fc86c"><code>d1e27fc</code></a>
Merge pull request <a
href="https://redirect.github.com/python-pillow/Pillow/issues/8870">#8870</a>
from radarhere/harfbuzz_upgrade</li>
<li><a
href="c8d98d56a0"><code>c8d98d5</code></a>
Added avif to config settings (<a
href="https://redirect.github.com/python-pillow/Pillow/issues/8875">#8875</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/python-pillow/Pillow/compare/11.1.0...11.2.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pillow&package-manager=pip&previous-version=11.1.0&new-version=11.2.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2025-04-14 19:36:00 +02:00
dependabot[bot]
102104f818
chore: bump pytest-django from 4.10.0 to 4.11.1
Bumps [pytest-django](https://github.com/pytest-dev/pytest-django) from 4.10.0 to 4.11.1.
- [Release notes](https://github.com/pytest-dev/pytest-django/releases)
- [Changelog](https://github.com/pytest-dev/pytest-django/blob/main/docs/changelog.rst)
- [Commits](https://github.com/pytest-dev/pytest-django/compare/v4.10.0...v4.11.1)

---
updated-dependencies:
- dependency-name: pytest-django
  dependency-version: 4.11.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-14 17:30:01 +00:00
dependabot[bot]
35e5a4bda6
chore: bump pydantic from 2.11.2 to 2.11.3
Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.11.2 to 2.11.3.
- [Release notes](https://github.com/pydantic/pydantic/releases)
- [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md)
- [Commits](https://github.com/pydantic/pydantic/compare/v2.11.2...v2.11.3)

---
updated-dependencies:
- dependency-name: pydantic
  dependency-version: 2.11.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-14 17:29:38 +00:00
dependabot[bot]
6bae315efe
chore: bump uvicorn from 0.34.0 to 0.34.1
Bumps [uvicorn](https://github.com/encode/uvicorn) from 0.34.0 to 0.34.1.
- [Release notes](https://github.com/encode/uvicorn/releases)
- [Changelog](https://github.com/encode/uvicorn/blob/master/docs/release-notes.md)
- [Commits](https://github.com/encode/uvicorn/compare/0.34.0...0.34.1)

---
updated-dependencies:
- dependency-name: uvicorn
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-14 17:29:19 +00:00
dependabot[bot]
93120d91d6
chore: bump pillow from 11.1.0 to 11.2.1
Bumps [pillow](https://github.com/python-pillow/Pillow) from 11.1.0 to 11.2.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/11.1.0...11.2.1)

---
updated-dependencies:
- dependency-name: pillow
  dependency-version: 11.2.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-14 17:29:05 +00:00
dependabot[bot]
f037973a03
chore: bump mkdocs-material from 9.6.10 to 9.6.11
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.6.10 to 9.6.11.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.6.10...9.6.11)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-version: 9.6.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-14 17:28:43 +00:00
Yohan Boniface
c4614354ae 3.0.4 2025-04-14 17:57:12 +02:00
Yohan Boniface
9ed466ea9b
chore: update colors (#2647) 2025-04-14 17:55:19 +02:00
Yohan Boniface
168cc0c996 i18n 2025-04-14 17:49:09 +02:00
Yohan Boniface
ae4e7eb3e2 chore: update colors
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-14 17:45:11 +02:00
Yohan Boniface
3670b7dca6
Adapt chart to match La Suite's expectations (#2646)
- env vars and config files can be loaded from existing secrets
- chart is deployed on a helm repository

to make the helm repository work with github pages, create an empty
orphaned branch called gh-pages, and under settings>pages>source select
deploy from branch and use gh-pages
2025-04-14 17:36:31 +02:00
David Larlet
1c3cf9a7c5
chore: switch helm chart job to master branch 2025-04-14 11:31:06 -04:00
Yohan Boniface
ada44fc0fc
fix: remove "hide home button" shown twice in map settings (#2645) 2025-04-14 17:30:52 +02:00
Yohan Boniface
ac6964c9f4 fix: remove "hide home button" shown twice in map settings
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-14 16:30:38 +02:00
David Larlet
82dcd90405
fix: do not show "back to home" button in iframes (#2644) 2025-04-14 10:21:21 -04:00
Yohan Boniface
d9e983aed4 fix: do not show "back to home" button in iframes
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-14 16:12:35 +02:00
Yohan Boniface
071a8c539d 3.0.3
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
2025-04-11 18:09:14 +02:00
Yohan Boniface
ec8fa87b41 i18n 2025-04-11 17:33:22 +02:00
Yohan Boniface
ef072f0a8e
feat: allow to hide the back to home button (#2638) 2025-04-11 17:30:15 +02:00
Yohan Boniface
33f407fd60
feat: hidden download button in browser when embedControl=false (#2640)
cf #2629
2025-04-11 17:27:02 +02:00
David Larlet
324c5cf6bf feat: allow to hide the back to home button
Co-authored-by: Yohan Boniface <yohanboniface@free.fr>
2025-04-11 17:22:09 +02:00
Yohan Boniface
e53cdcb04e feat: hidden download button in browser when embedControl=false
cf #2629

Co-authored-by: David Larlet <david@larlet.fr>
2025-04-11 17:15:39 +02:00
David Larlet
5e3170891a
feat: allow to hide the layer switcher from bottom bar (#2639) 2025-04-11 10:58:54 -04:00
David Larlet
495286c261
feat: allow to hide the layer switcher from bottom bar 2025-04-11 10:44:01 -04:00
Yohan Boniface
15972bab3d
document that nginx needs to be added in Docker stack to serve statics (#2636) 2025-04-11 16:19:47 +02:00
Yohan Boniface
bd91934544
fix: do not try to remove a feature not yet added (#2637)
cf #2625

This happens while drawing a line or polygon and then hitting escape
while the path is not yet valid.
2025-04-11 16:19:29 +02:00
Yohan Boniface
581140e08a
fix: do not try to remove a feature not yet added
cf #2625

This happens while drawing a line or polygon and then hitting escape
while the path is not yet valid.
2025-04-11 10:02:31 -04:00
David Larlet
10f87c0b6e
fix: display search category on list page (#2635) 2025-04-11 08:24:07 -04:00
Yohan Boniface
0ec4e74f8f wip: add nginx in docker-compose.yml 2025-04-11 11:31:54 +02:00
Yohan Boniface
89033e04a2 chore: add a deploy overview doc page 2025-04-11 10:09:24 +02:00
David Larlet
38f4fd5bb3
fix: display search category on list page 2025-04-10 17:13:33 -04:00
Yohan Boniface
985d91a9c7
fix: display back help button in switch fields (#2634)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
cf #2615

Before:

![image](https://github.com/user-attachments/assets/bac68a6b-6c74-4f10-8d3c-26536dc1ecad)

After:

![image](https://github.com/user-attachments/assets/43c4a0b3-a892-423a-8c20-b7c6304f3182)
2025-04-10 21:46:27 +02:00
Yohan Boniface
7348f0bf4f fix: display back help button in switch fields
cf #2615
2025-04-10 20:24:35 +02:00
Yohan Boniface
dc35e7df6d
fix: fix pictogram categories always hidden (#2630)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
2025-04-09 17:17:29 +02:00
Yohan Boniface
d9378a484d fix: fix pictogram categories always hidden 2025-04-09 16:06:20 +02:00
Yohan Boniface
cfcdfb9ed8
chore: add missing margin-bottom in importers (#2627) 2025-04-09 15:59:00 +02:00
Yohan Boniface
0b8c7ee381
chore: redirect to user dashboard after map delete (#2626)
If user is authenticated.

We do not display alert messages on the home page.
2025-04-09 15:45:11 +02:00
Yohan Boniface
36e9433cf9
Apply suggestions from code review
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
2025-04-09 15:44:36 +02:00
Yohan Boniface
425f66b181
fix: fix text overflow on search results (#2628)
Before:
![Screenshot From 2025-04-09
09-41-21](https://github.com/user-attachments/assets/727ead82-7bb7-4cdb-b676-994f84ed8eaf)

After:
![Screenshot From 2025-04-09
09-40-58](https://github.com/user-attachments/assets/e778ba59-a255-4230-9531-cdba67c444cc)

(Please don't ask :p )
2025-04-09 15:42:57 +02:00
Yohan Boniface
18f0b6e2a7 chore: rename variable to make it more explicit 2025-04-09 11:27:29 +02:00
Yohan Boniface
50f23b4e02 fix: fix text overflow on search results 2025-04-09 09:41:37 +02:00
Yohan Boniface
36d58993a0 chore: add missing margin-bottom in importers 2025-04-09 09:32:54 +02:00
Yohan Boniface
5f2e104eec
feat: use Last-Modified header from remote data when available (#2624)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
fix #2589
2025-04-09 09:09:40 +02:00
Yohan Boniface
5c38bc7970 chore: redirect to user dashboard after map delete
If user is authenticated.

We do not display alert messages on the home page.
2025-04-09 08:54:44 +02:00
Yohan Boniface
dcce3ad054
Update umap/static/umap/js/modules/umap.js
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
2025-04-08 18:13:05 +02:00
Yohan Boniface
88ddb1cab3 3.0.2
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2025-04-08 17:23:15 +02:00
Yohan Boniface
dd7540596c
fix: give priority to small usernames on autocomplete (#2604)
Basically, when the search is "joe" we first try to search for an exact
account named "joe", and fallback to normal flow when nothing matches.

fix #2591
2025-04-08 17:21:14 +02:00
Yohan Boniface
2baeaace24 feat: use Last-Modified header from remote data when available
fix #2589
2025-04-08 17:03:06 +02:00
Yohan Boniface
14663bc56e fixup: order users autocomplete by username length
cf #2591
2025-04-08 15:47:06 +02:00
Yohan Boniface
fea0f02b80
fix: fix min-height of select in caption bar (#2622)
Before:
![Screenshot From 2025-04-08
15-26-28](https://github.com/user-attachments/assets/372d3410-a360-4ff3-a6f2-d7c18a3f26e3)

After:
![Screenshot From 2025-04-08
15-27-44](https://github.com/user-attachments/assets/defb737e-aed3-40b0-91b6-5b8c38675e55)
2025-04-08 15:37:56 +02:00
Yohan Boniface
85ba05f4b7
fix: fix result tools buttons background color (#2620) 2025-04-08 15:32:58 +02:00
Yohan Boniface
7b582a8ec1
fix: properly call endEdit for markers (#2617)
fix #2607
2025-04-08 15:32:09 +02:00
Yohan Boniface
3c70fc4267
fix: fix categorized layer crashing with null value (#2621)
Do not call toString on a null value
2025-04-08 15:31:51 +02:00
Yohan Boniface
b5d12282e0
fix: fix copiable input CSS (#2616)
Before:
![Screenshot From 2025-04-08
10-02-15](https://github.com/user-attachments/assets/49fd5f63-ac98-40bd-a7bc-befd24920f07)

After:
![Screenshot From 2025-04-08
10-21-33](https://github.com/user-attachments/assets/ce62ef66-6ad7-45dd-a37c-c0fb20d71e13)
2025-04-08 15:30:20 +02:00
Yohan Boniface
672d92152e fix: fix min-height of select in caption bar 2025-04-08 15:27:10 +02:00
Yohan Boniface
5b5102f909 fix: fix categorized layer crashing with null value
Do not call toString on a null value
2025-04-08 15:21:27 +02:00
Yohan Boniface
0a154daa6f fix: fix result tools buttons background color 2025-04-08 12:14:22 +02:00
Yohan Boniface
c38ec2c18d fix: fix copiable input CSS 2025-04-08 11:46:31 +02:00
Yohan Boniface
1e204ac16c fix: properly call endEdit for markers
fix #2607
2025-04-08 11:05:54 +02:00
Yohan Boniface
e2fed5a19d
chore: bump hatch from 1.14.0 to 1.14.1 (#2614) 2025-04-08 10:43:37 +02:00
Yohan Boniface
061b5fc60e
chore: bump pydantic from 2.11.1 to 2.11.2 (#2612) 2025-04-08 10:23:13 +02:00
dependabot[bot]
8c9d4e5777
chore: bump pydantic from 2.11.1 to 2.11.2
Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.11.1 to 2.11.2.
- [Release notes](https://github.com/pydantic/pydantic/releases)
- [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md)
- [Commits](https://github.com/pydantic/pydantic/compare/v2.11.1...v2.11.2)

---
updated-dependencies:
- dependency-name: pydantic
  dependency-version: 2.11.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-08 07:43:11 +00:00
dependabot[bot]
efde6899bd
chore: bump hatch from 1.14.0 to 1.14.1
Bumps [hatch](https://github.com/pypa/hatch) from 1.14.0 to 1.14.1.
- [Release notes](https://github.com/pypa/hatch/releases)
- [Commits](https://github.com/pypa/hatch/compare/hatch-v1.14.0...hatch-v1.14.1)

---
updated-dependencies:
- dependency-name: hatch
  dependency-version: 1.14.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-08 07:42:51 +00:00
Yohan Boniface
38e862c04a
chore: bump moto[s3] from 5.1.1 to 5.1.3 (#2610)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2025-04-08 09:42:12 +02:00
Yohan Boniface
2d0325f1fb
chore: bump ruff from 0.11.2 to 0.11.4 (#2611) 2025-04-08 09:41:39 +02:00
Yohan Boniface
b8ab86b075
chore: bump django-storages[s3] from 1.14.5 to 1.14.6 (#2613) 2025-04-08 09:41:11 +02:00
dependabot[bot]
7e774bc3aa
chore: bump django-storages[s3] from 1.14.5 to 1.14.6
Bumps [django-storages[s3]](https://github.com/jschneier/django-storages) from 1.14.5 to 1.14.6.
- [Changelog](https://github.com/jschneier/django-storages/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/jschneier/django-storages/compare/1.14.5...1.14.6)

---
updated-dependencies:
- dependency-name: django-storages[s3]
  dependency-version: 1.14.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-07 18:35:07 +00:00
dependabot[bot]
f4e3e679a9
chore: bump ruff from 0.11.2 to 0.11.4
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.11.2 to 0.11.4.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.11.2...0.11.4)

---
updated-dependencies:
- dependency-name: ruff
  dependency-version: 0.11.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-07 18:30:12 +00:00
dependabot[bot]
6d391a51be
chore: bump moto[s3] from 5.1.1 to 5.1.3
Bumps [moto[s3]](https://github.com/getmoto/moto) from 5.1.1 to 5.1.3.
- [Release notes](https://github.com/getmoto/moto/releases)
- [Changelog](https://github.com/getmoto/moto/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getmoto/moto/compare/5.1.1...5.1.3)

---
updated-dependencies:
- dependency-name: moto[s3]
  dependency-version: 5.1.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-07 18:28:07 +00:00
Yohan Boniface
aa43d4efa8 3.0.1
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2025-04-07 20:01:53 +02:00
Yohan Boniface
4679742b96
fix: fix showLabel wrongly using MultiChoices (#2609) 2025-04-07 20:01:05 +02:00
Yohan Boniface
53329d19fd fix: fix showLabel wrongly using MultiChoices
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-07 19:53:20 +02:00
Yohan Boniface
c09c2c20ee 3.0.0 2025-04-07 18:55:50 +02:00
Yohan Boniface
c0c55075b7 chore: rename WEBSOCKET_ENABLED in REALTIME_ENABLED
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-07 18:55:18 +02:00
Yohan Boniface
3670c47af9 i18n 2025-04-07 18:32:05 +02:00
Yohan Boniface
f1f18ed518
Remove confirm delete for features and datalayers (#2603)
Now that we have granular undo, I'd say we can simplify the delete
process.
2025-04-07 18:24:25 +02:00
Yohan Boniface
5e47a59d07
chore: refine main search form (#2608)
![image](https://github.com/user-attachments/assets/dd73a323-6f80-4b5b-8691-79a3f92f3723)
2025-04-07 18:23:52 +02:00
Yohan Boniface
a59b0110fc
chore: refine undo/redo buttons (#2605)
![image](https://github.com/user-attachments/assets/884b3a8c-ff4e-48e2-9bdf-16d31fb7512a)
2025-04-07 18:23:37 +02:00
Yohan Boniface
e1272ec6cd fix: do not cut kbd in tooltip
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-07 18:23:08 +02:00
Yohan Boniface
55babfde34
chore: refine map list card CSS (#2606) 2025-04-07 18:17:26 +02:00
Yohan Boniface
82b8564520 chore: refine undo/redo buttons
Co-authored-by: David Larlet <david@larlet.fr>
Co-authored-by: Aurélie Jallut <aurelie.jallut@beta.gouv.fr>
2025-04-07 18:16:37 +02:00
Yohan Boniface
5070a5e5b4 chore: refine main search form
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-07 18:11:49 +02:00
Yohan Boniface
06baeb718e fix: fix Textarea trying to clear this.input
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-07 18:09:35 +02:00
Yohan Boniface
f186d3266c chore: refine map list card CSS
Co-authored-by: David Larlet <david@larlet.fr>
Co-authored-by: Aurélie Jallut <aurelie.jallut@beta.gouv.fr>
2025-04-07 16:34:09 +02:00
Yohan Boniface
f4ae51ae7e fix: give priority to small usernames when query is small
Basically, when the search is "joe" we first try to search for
an exact account named "joe", and fallback to normal flow when
nothing matches.

fix #2591
2025-04-07 15:24:44 +02:00
Yohan Boniface
49bba24b90 feat: remove confirm for feature delete 2025-04-07 10:48:34 +02:00
Yohan Boniface
a2749ce805 feat: remove confirm for datalayer delete
Now that we have granular undo, no needs for this I'd say.
2025-04-07 10:35:39 +02:00
Yohan Boniface
190cac3105 i18n
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
2025-04-04 18:54:51 +02:00
Yohan Boniface
50e354cb18
fix: explicit batch instead of blindly on add data (#2601) 2025-04-04 18:54:31 +02:00
Yohan Boniface
34e4955891
fix: use the multichoices for ttl in remote data form (#2599) 2025-04-04 18:49:23 +02:00
Yohan Boniface
91c3b098df wip: return data in DataLayer.importRaw 2025-04-04 18:45:31 +02:00
Yohan Boniface
2967c023f3
fix: do not add auto zoom and center in undo stack (#2602) 2025-04-04 18:23:31 +02:00
David Larlet
862f19ee43 fix: use the multichoices for ttl in remote data form 2025-04-04 18:22:51 +02:00
David Larlet
fd8915355e
fix: do not export layer ids in umap backup (#2600) 2025-04-04 11:54:30 -04:00
David Larlet
02d3e19450
fix: do not add auto zoom and center in undo stack
Co-authored-by: Yohan Boniface <yohanboniface@free.fr>
2025-04-04 11:54:00 -04:00
David Larlet
b342480f3b
fix: explicit batch instead of blindly on add data
Co-authored-by: Yohan Boniface <yohanboniface@free.fr>
2025-04-04 11:45:26 -04:00
David Larlet
c5c352cfac
fix: do not export layer ids in umap backup 2025-04-04 11:26:10 -04:00
David Larlet
d6f591b365
fix: remote data loading on import from umap backup (#2598) 2025-04-04 11:15:23 -04:00
David Larlet
90bbc72320
fix: restore width and height for default marker icon
Co-authored-by: Yohan Boniface <yohanboniface@free.fr>
2025-04-04 11:15:03 -04:00
David Larlet
b05e6ec28c
fix: remote data loading on import from umap backup 2025-04-04 11:05:33 -04:00
David Larlet
0e56e71e87
fix: Minimize the default svg icon for marker
Co-authored-by: Yohan Boniface <yohanboniface@free.fr>
2025-04-04 10:28:43 -04:00
Yohan Boniface
5c51a7a735
feat: add keyboard shortcut for redo (ctrl+shift+z) (#2596)
I've reworked a bit the shortcut handling, as it was only dealing with
ctrl/meta only ones (no shift).
2025-04-04 16:25:04 +02:00
Yohan Boniface
563aee81e1 feat: add keyboard shortcut for redo (ctrl+shift+z) 2025-04-04 16:14:04 +02:00
Yohan Boniface
3720ccff01
feat: add minimal "raw" icon shape (#2597)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Basically, it means "no shape".


![image](https://github.com/user-attachments/assets/7ddaf76a-2128-49fc-8664-754b09d2b9ef)

It's a 48x48 max square (but if image is smaller it will stay smaller),
popup and tooltip always centered.

Let's see how this will be used and add more controls if needed later
(like size, center position…).

Also I've added a small border to the default white round icon, so it's
visible even on a white background.

(Not sure why the flower size is 47.8 instead of 48, cf screenshot,
sounds like a Leaflet rounding issue…)

cf #125
2025-04-04 16:08:04 +02:00
Yohan Boniface
9e5c985d6c feat: add minimal "raw" icon shape 2025-04-04 12:02:46 +02:00
Yohan Boniface
32b9217bd2
feat: add Map.tags and allow to edit from client (#2530)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
cf #2283

Note: this PR uses ArrayField, which is Postgres only, so this would
officially remove the support of spatialite as it is. I'm not sure at
all uMap still works with spatialite, so maybe that the opportunity to
either add spatialite in the CI and make sure we support it, or remove
it and only target Postgres/PostGIS.
2025-04-03 18:52:17 +02:00
Yohan Boniface
4fd57e0c11 chore: remove tag icons for now
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-03 18:29:39 +02:00
Yohan Boniface
54420568af chore: refine map fragment card CSS
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-03 18:20:50 +02:00
Yohan Boniface
8c90535105 chore: better CSS for tags in maps list
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-03 17:51:37 +02:00
Yohan Boniface
80a969917a chore: simplify search form CSS and HTML
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-03 17:51:20 +02:00
Yohan Boniface
6582e85f18
Update the Dockerfile to expose websockets (#2576)
The Dockerfile now uses ASGI by default (via uvicorn).
2025-04-03 17:16:56 +02:00
Yohan Boniface
023645a160 wip: make Redis service optional in Docker image
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-03 17:12:12 +02:00
Yohan Boniface
e24695b68c wip: display tags in maps list 2025-04-03 14:51:04 +02:00
Yohan Boniface
db72bfad8d wip: sort tags by label, not by value 2025-04-03 11:10:36 +02:00
Yohan Boniface
738af24dfc chore: fix tags related test 2025-04-03 11:10:36 +02:00
Yohan Boniface
06f963c07f chore: align search form elements
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-03 11:10:36 +02:00
Yohan Boniface
c6ed896a6d feat: associate icons to tags
Co-authored-by: David Larlet <david@larlet.fr>
2025-04-03 11:10:36 +02:00
Yohan Boniface
1344fe6b46 feat: basic filtering by tags 2025-04-03 11:10:36 +02:00
Yohan Boniface
39f38a9cdf feat: add Map.tags and allow to edit from client
cf #2283
2025-04-03 11:10:33 +02:00
Yohan Boniface
e2f154f62e
feat: add atomic undo redo (#2570)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Todo:

- [ ] undo/sync a version restore
- [x] add test for scenario where two peers create a layer and one click
on save (both should be saved)
- [x] undo/sync of conditional rules
- [x] undo/sync of filter management from table editor
2025-04-03 10:32:47 +02:00
Yohan Boniface
7196ffe101
chore: bump mkdocs-material from 9.6.9 to 9.6.10 (#2593) 2025-04-03 08:55:19 +02:00
Yohan Boniface
99ea09e79e
chore: bump pydantic from 2.10.6 to 2.11.1 (#2594) 2025-04-03 08:55:01 +02:00
Yohan Boniface
b3f587ccf3
chore: bump django from 5.1.7 to 5.1.8 (#2595) 2025-04-03 08:49:20 +02:00
dependabot[bot]
64cf408233
chore: bump django from 5.1.7 to 5.1.8
Bumps [django](https://github.com/django/django) from 5.1.7 to 5.1.8.
- [Commits](https://github.com/django/django/compare/5.1.7...5.1.8)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-02 20:41:42 +00:00
dependabot[bot]
e26e8edc8a
chore: bump pydantic from 2.10.6 to 2.11.1
Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.10.6 to 2.11.1.
- [Release notes](https://github.com/pydantic/pydantic/releases)
- [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md)
- [Commits](https://github.com/pydantic/pydantic/compare/v2.10.6...v2.11.1)

---
updated-dependencies:
- dependency-name: pydantic
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-31 17:38:06 +00:00
dependabot[bot]
1b8e217768
chore: bump mkdocs-material from 9.6.9 to 9.6.10
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.6.9 to 9.6.10.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.6.9...9.6.10)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-31 17:38:01 +00:00
Yohan Boniface
5259cab027 chore: remove saving.js import added by mistake during rebase 2025-03-28 18:00:14 +01:00
Yohan Boniface
7ede27bf0f chore: top edit bar responsiveness
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-28 18:00:14 +01:00
Yohan Boniface
5807cfbbcd wip: move undo/redo buttons to the left
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-28 18:00:14 +01:00
Yohan Boniface
e41ad4e069 wip: allow to sync version restore
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-28 18:00:14 +01:00
Yohan Boniface
c933df585c wip: add test to make sure saving also save remote dirty datalayers 2025-03-28 18:00:14 +01:00
Yohan Boniface
50f2c08ecb wip: do not call document during JS unittests 2025-03-28 18:00:14 +01:00
Yohan Boniface
d61e045903 wip: allow to sync/undo filter added/removed from table editor 2025-03-28 18:00:14 +01:00
Yohan Boniface
6b2038e83e wip: permissions does not inherit from ServerStored anymore 2025-03-28 18:00:14 +01:00
Yohan Boniface
0389e9a185 wip: allow to undo/sync rules
When editing Rule(s), we are not editing the map data itself, but a
sort of proxy objects. This was done mainly because map.properties.rules
is an array of object, and at this time Leaflet.FormBuilder did not know
how to edit an array (something like properties.rules.0.condition).
Now that we integrated FormBuilder, it still does not know how to do this
but we could teach it, or find another way (real Proxy or use reference
to the original object in the Rule).
2025-03-28 18:00:14 +01:00
Yohan Boniface
a2e864ad73 wip: uncreated map should always appear as dirty 2025-03-28 18:00:14 +01:00
Yohan Boniface
d0fb85d552 wip: DataLayer does not inherit anymore from ServerStored 2025-03-28 18:00:14 +01:00
Yohan Boniface
fa83764c8b wip: allow DataLayer.clear to be sync and undone 2025-03-28 18:00:14 +01:00
Yohan Boniface
d438a007e4 wip: uMap does not inherit anymore from ServerStored
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-28 18:00:14 +01:00
Yohan Boniface
be52e7ca2f wip: remove not effective code
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-28 18:00:14 +01:00
Yohan Boniface
172de0e2d0 wip: add permissions related fields in schema
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-28 18:00:14 +01:00
Yohan Boniface
77da6425c2 wip: allow to mark an operation as not undoable
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-28 18:00:14 +01:00
Yohan Boniface
093ed061c1 wip: tests pass
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-28 18:00:14 +01:00
Yohan Boniface
5cb7cb2738 fixup: make sure to toggle remote client state at save too
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-28 18:00:14 +01:00
Yohan Boniface
dfdfae0080 wip: derive the dirty status from the undoManager
This should pave the way for removing the SaveManager.

Co-authored-by: David Larlet <david@larlet.fr>
2025-03-28 18:00:14 +01:00
Yohan Boniface
4fd066387d Update the tests and remove cancel edits
Co-authored-by: Alexis Métaireau <alexis@notmyidea.org>
2025-03-28 18:00:14 +01:00
fa3ba46ca8 Add integration test for batch undo/redo 2025-03-28 18:00:14 +01:00
Yohan Boniface
cb46a5f875 Batch operations
Co-authored-by: Alexis Métaireau <alexis@notmyidea.org>
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-28 18:00:14 +01:00
Yohan Boniface
cc2625bfac wip: undo redo
Co-authored-by: Alexis Métaireau <alexis@notmyidea.org>
2025-03-28 18:00:14 +01:00
Yohan Boniface
8292608365 chore: fix HLC comparison
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
This change was made by biome, but it breaks unittests, not
sure why but let's revert for now.
2025-03-28 17:59:35 +01:00
Yohan Boniface
ae8cbf39ad
feat: display maps list as a grid now (#2590)
![image](https://github.com/user-attachments/assets/db9eafd1-b4ea-48a1-a359-3e55d0011f4b)
2025-03-28 16:15:51 +01:00
Yohan Boniface
7c5d821ec8
feat: layers selector in bottom bar (#2579) 2025-03-28 16:15:20 +01:00
Yohan Boniface
4e9e828c8f feat: display maps list as a grid now
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-28 16:05:11 +01:00
Yohan Boniface
79d60d0995 fix: update datalayers switcher when datalayer visibility changes
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-28 15:56:28 +01:00
Yohan Boniface
75457b6d5c
fix: do not fail when trying to read metadata of a missing geojson (#2592)
Some geojson have been removed by mistake time ago (cf #1003), when
someone tries to load a map referencing them, it was until recently just
showing an error message, but since recently we try to get the metadata
from it, and this will crash.
2025-03-28 15:28:13 +01:00
Yohan Boniface
8538db278d
feat: add titles in the text formatting dialog (#2584)
![image](https://github.com/user-attachments/assets/c90549b6-6081-4b1d-8b90-49c1df42ded2)

fix #813
2025-03-28 15:27:30 +01:00
Yohan Boniface
ba9e8ffe9b
chore: apply Biome check (#2588)
This is mostly imports ordering but there are a couple of subtleties 🐉 

There are still 9 errors before we can automatize the check with the CI!
2025-03-28 15:26:52 +01:00
Yohan Boniface
dcf5f1a763
fix: make sure umap.properties.slideshow is defined (#2583) 2025-03-28 15:25:19 +01:00
Yohan Boniface
41264e740f fix: do not fail when trying to read metadata of a missing geojson
Some geojson have been removed by mistake time ago (cf #1003), when someone
tries to load a map referencing them, it was until recently just
showing an error message, but since recently we try to get the
metadata from it, and this will crash.
2025-03-28 12:58:07 +01:00
Yohan Boniface
953b37a181 fixup: fix tests 2025-03-27 13:14:20 +01:00
Yohan Boniface
9eaf33c118 wip: only show layer selector if there are at least two layers 2025-03-27 13:11:24 +01:00
David Larlet
f2cde6af4e fixup: positionning of caption bar elements 2025-03-27 13:11:24 +01:00
Yohan Boniface
a4abecbd2c fixup: only show datalayers with inCaption=true in switcher 2025-03-27 13:11:24 +01:00
Yohan Boniface
254a2018f5 chore: use toggle to switch visibility in datalayer switcher 2025-03-27 13:11:24 +01:00
Yohan Boniface
3df52e002d wip 2025-03-27 13:11:24 +01:00
David Larlet
82208d618a
chore: apply Biome check 2025-03-26 14:37:56 -04:00
Yohan Boniface
64c7fe1ec9 fix: fix icon and button for version restore
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-26 18:05:01 +01:00
Yohan Boniface
e993aa7dbc chore: bump eslint ecmaVersion from 2020 to 2021 2025-03-26 11:30:08 +01:00
Yohan Boniface
be83eddbd0
chore: bump ruff from 0.11.0 to 0.11.2 (#2587)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
2025-03-25 13:04:07 +01:00
dependabot[bot]
4df201107e
chore: bump ruff from 0.11.0 to 0.11.2
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.11.0 to 0.11.2.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.11.0...0.11.2)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-24 17:42:02 +00:00
Yohan Boniface
60f16cbc76
chore: remove old JS tests (#2585)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Those are not run since more than one year, so let's trash.

fix #2260
2025-03-20 11:50:48 +01:00
Yohan Boniface
2fa88c36f8
chore: bump ruff from 0.9.10 to 0.11.0 (#2582)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2025-03-19 08:22:32 +01:00
Yohan Boniface
47c5c0a2f0 chore: remove old JS tests
Those are not ran since more than one year, so let's trash.

fix #2260
2025-03-19 08:16:38 +01:00
Yohan Boniface
ecca66ccc2 feat: add titles in the text formatting dialog
fix #813
2025-03-19 08:14:33 +01:00
Yohan Boniface
360ca100ba fix: make sure umap.properties.slideshow is defined 2025-03-18 07:35:10 +01:00
dependabot[bot]
e548ec60f1
chore: bump ruff from 0.9.10 to 0.11.0
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.9.10 to 0.11.0.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.9.10...0.11.0)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-18 05:58:20 +00:00
Yohan Boniface
190acbfaf0
chore: bump mkdocs-material from 9.6.7 to 9.6.9 (#2580)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
2025-03-18 06:57:13 +01:00
Yohan Boniface
1370b1a0e8
chore: bump psycopg from 3.2.5 to 3.2.6 (#2581)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2025-03-17 21:27:56 +01:00
dependabot[bot]
aa75b323c8
chore: bump psycopg from 3.2.5 to 3.2.6
Bumps [psycopg](https://github.com/psycopg/psycopg) from 3.2.5 to 3.2.6.
- [Changelog](https://github.com/psycopg/psycopg/blob/master/docs/news.rst)
- [Commits](https://github.com/psycopg/psycopg/compare/3.2.5...3.2.6)

---
updated-dependencies:
- dependency-name: psycopg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-17 18:07:46 +00:00
dependabot[bot]
1c00545095
chore: bump mkdocs-material from 9.6.7 to 9.6.9
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.6.7 to 9.6.9.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.6.7...9.6.9)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-17 18:07:38 +00:00
Yohan Boniface
54a3aae912
chore: order importers by name instead of id (#2578) 2025-03-17 16:46:22 +01:00
Yohan Boniface
9d4069d9ae chore: order importers by name instead of id
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-17 16:44:23 +01:00
Yohan Boniface
167bab70c5
feat: add experimental BAN importer (#2565)
This importer takes a CSV as input, sends it to the BAN API, and then
paste it into the import textarea, so it can be imported as usual.



https://github.com/user-attachments/assets/c13f8580-5c09-4b35-b092-baac664a57a1
2025-03-17 16:39:55 +01:00
Yohan Boniface
d3ed46356d feat: add experimental BAN importer
This importer takes a CSV as input, sends it to the BAN API, and
then paste it into the import textarea, so it can be imported as usual.

Co-authored-by: David Larlet <david@larlet.fr>
2025-03-17 16:20:57 +01:00
d72debdeb2
Docs: Add documentation for local docker development 2025-03-14 15:29:25 +01:00
33525a1837
Docs: Remove old references to websocket configuration 2025-03-14 15:29:25 +01:00
3e0a6b8f10
Update the Dockerfile to expose websockets
The Dockerfile now uses ASGI by default (via uvicorn) and embeds a
redis server that is used for the synchronization.
2025-03-14 15:29:17 +01:00
Yohan Boniface
dd5add96b4
fix: iconUrl field was broken on older browsers (#2575)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
fix #2554
2025-03-14 15:07:14 +01:00
Yohan Boniface
f26536bff3 fix: iconUrl field was broken on older browsers
fix #2554
2025-03-14 14:50:47 +01:00
Yohan Boniface
1b058ce862
fixup: hide home button in edit mode (#2562)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
The button is already on the edit bar.

Would be nicer to have a css transition (like for the bar itself), but
at least with this change it is not duplicated.
2025-03-13 16:52:41 +01:00
Yohan Boniface
a46430c420
fix: import iconUrl as absolute when possible (#2563)
This will only cover the cases where the icon is set at the map or at
the layer level, not the one of the marker itself.

cf #2552
2025-03-13 16:52:19 +01:00
Yohan Boniface
05e3f5ce3d
fix: use real redraw for datalayer, instead of hide/show (#2568)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
The problem we've tried to fix is, during sync:
- peer A is editing a feature
- peer B changes the datalayer of this feature
- edit panel is closed for peer A
2025-03-12 17:41:18 +01:00
Yohan Boniface
c417e94698
fix(sync): fix tilelayer change not synced (#2569) 2025-03-12 17:39:19 +01:00
Yohan Boniface
e53d208d7c
fix: cast value to string before calling trim (#2567)
fix #2566
2025-03-12 17:36:42 +01:00
Yohan Boniface
e20648104b fix: fix tilelayer change not synced
Co-authored-by: Alexis Métaireau <alexis@notmyidea.org>
2025-03-12 13:01:26 +01:00
Yohan Boniface
0c9d5325ba fix: use real redraw for datalayer, instead of hide/show
The problem we've tried to fix is, during sync:
- peer A is editing a feature
- peer B changes the datalayer of this feature
- edit panel is closed for peer A

Co-authored-by: Alexis Métaireau <alexis@notmyidea.org>
2025-03-12 12:23:54 +01:00
Yohan Boniface
90be14ae89 fix: cast value to string before calling trim
fix #2566
2025-03-11 21:43:21 +01:00
Yohan Boniface
003b25d5e0 fix: import iconUrl as absolute when possible
This will only cover the cases where the icon is set at the map or
at the layer level, not the one of the marker itself.

cf #2552
2025-03-11 16:20:58 +01:00
Yohan Boniface
ef80396784 fixup: hide home button in edit mode
The button is already on the edit bar.

Would be nicer to have a css transition, but at least with this
change it is not duplicated.
2025-03-11 15:32:01 +01:00
Yohan Boniface
d85fc648b1
feat: add new "Back to home" icon (#2551)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
![image](https://github.com/user-attachments/assets/415a7e36-fb34-459e-8890-cd3c6830512b)
2025-03-10 22:31:42 +01:00
Yohan Boniface
b037915aae
chore: bump django-storages[s3] from 1.14.4 to 1.14.5 (#2560) 2025-03-10 22:06:29 +01:00
Yohan Boniface
17bbbe38bd
chore: new icon, colors and title for search buttons (#2556)
![image](https://github.com/user-attachments/assets/eca715dd-9450-4602-9e76-e8835d228df4)
2025-03-10 22:05:39 +01:00
Yohan Boniface
6cbe8cb9ad
chore: bump pytest from 8.3.4 to 8.3.5 (#2559) 2025-03-10 22:04:29 +01:00
dependabot[bot]
28741a9c94
chore: bump pytest from 8.3.4 to 8.3.5
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.4 to 8.3.5.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/8.3.4...8.3.5)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-10 20:37:28 +00:00
Yohan Boniface
1ae1a6c51b
chore: bump moto[s3] from 5.0.28 to 5.1.1 (#2557) 2025-03-10 21:36:17 +01:00
Yohan Boniface
d5fb5b02c0
chore: bump ruff from 0.9.9 to 0.9.10 (#2558) 2025-03-10 21:35:58 +01:00
Yohan Boniface
4be64ae918
chore: bump mkdocs-material from 9.6.4 to 9.6.7 (#2561) 2025-03-10 21:35:40 +01:00
dependabot[bot]
85e9bcfa7c
chore: bump mkdocs-material from 9.6.4 to 9.6.7
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.6.4 to 9.6.7.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.6.4...9.6.7)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-10 18:14:57 +00:00
dependabot[bot]
3cf0be5244
chore: bump django-storages[s3] from 1.14.4 to 1.14.5
Bumps [django-storages[s3]](https://github.com/jschneier/django-storages) from 1.14.4 to 1.14.5.
- [Changelog](https://github.com/jschneier/django-storages/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/jschneier/django-storages/compare/1.14.4...1.14.5)

---
updated-dependencies:
- dependency-name: django-storages[s3]
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-10 18:14:52 +00:00
dependabot[bot]
5ebb840b94
chore: bump ruff from 0.9.9 to 0.9.10
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.9.9 to 0.9.10.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.9.9...0.9.10)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-10 18:14:38 +00:00
dependabot[bot]
9e9369f14b
chore: bump moto[s3] from 5.0.28 to 5.1.1
Bumps [moto[s3]](https://github.com/getmoto/moto) from 5.0.28 to 5.1.1.
- [Release notes](https://github.com/getmoto/moto/releases)
- [Changelog](https://github.com/getmoto/moto/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getmoto/moto/compare/5.0.28...5.1.1)

---
updated-dependencies:
- dependency-name: moto[s3]
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-10 18:14:26 +00:00
Yohan Boniface
bfb17788a4 chore: new icon, colors and title for search buttons 2025-03-10 19:06:39 +01:00
Yohan Boniface
3b195e562a
feat: add more users counts in /stats/ (#2555)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2025-03-10 16:56:29 +01:00
Yohan Boniface
8599199afa feat: add more users counts in /stats/
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-10 16:38:53 +01:00
Yohan Boniface
7a2bf9fc4c fixup: let the importer deal with getting the OSM url in search
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-07 17:58:56 +01:00
Yohan Boniface
b3e39bf654 fixup: square buttons in search results
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-07 17:40:16 +01:00
Yohan Boniface
89e2a01d60 fixup: do not close panel when clicking on search edit buttons
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-07 17:39:42 +01:00
Yohan Boniface
0def3292e1 fix: only display search edit tools in edit mode
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-07 17:26:46 +01:00
Yohan Boniface
beae551367 feat: add new "Back to home" icon
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-07 17:20:35 +01:00
Yohan Boniface
4ccd1e6799 changelog 2025-03-07 16:31:14 +01:00
Yohan Boniface
d4885f386a i18n 2025-03-07 16:24:11 +01:00
Yohan Boniface
869db90b28 chore: update oauth provider deprecation message
Mention that it's important to logout and login again to have the
new provider replace the old one in the session
2025-03-07 16:17:26 +01:00
David Larlet
33cbe1ab71
a11y: turn embeded maps into inert elements (#2533)
One of the side-effects is to make the content of the map un-focusable
but we also loose the ability to interact with the map itself.
2025-03-07 10:10:29 -05:00
Yohan Boniface
8bad104803
chore: refactor search UX (#2545)
This is just the UI part of #419


![image](https://github.com/user-attachments/assets/88c76b9f-b1cd-48fa-b20e-caf1c044dbf8)
2025-03-07 16:05:01 +01:00
David Larlet
1fd34be300
chore: bump django from 5.1.6 to 5.1.7 (#2546)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Bumps [django](https://github.com/django/django) from 5.1.6 to 5.1.7.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="691e945530"><code>691e945</code></a>
[5.1.x] Bumped version for 5.1.7 release.</li>
<li><a
href="8dbb44d342"><code>8dbb44d</code></a>
[5.1.x] Fixed CVE-2025-26699 -- Mitigated potential DoS in wordwrap
template ...</li>
<li><a
href="d7dc1f6db0"><code>d7dc1f6</code></a>
[5.1.x] Fixed typo in docs/ref/checks.txt.</li>
<li><a
href="dbd94e7ac9"><code>dbd94e7</code></a>
[5.1.x] Fixed <a
href="https://redirect.github.com/django/django/issues/36227">#36227</a>
-- Fixed outdated PostgreSQL documentation links.</li>
<li><a
href="cc405e1546"><code>cc405e1</code></a>
[5.1.x] Fixed <a
href="https://redirect.github.com/django/django/issues/36128">#36128</a>
-- Clarified auto-generated unique constraint on m2m thr...</li>
<li><a
href="03ace756ea"><code>03ace75</code></a>
[5.1.x] Fixed <a
href="https://redirect.github.com/django/django/issues/36217">#36217</a>
-- Restored pre_save/post_save signal emission via LogEn...</li>
<li><a
href="76a9f12b60"><code>76a9f12</code></a>
[5.1.x] Added some heading labels to to docs/topics/cache.txt.</li>
<li><a
href="558c616c95"><code>558c616</code></a>
[5.1.x] Added stub release notes and release date for 5.1.7, 5.0.13, and
4.2.20.</li>
<li><a
href="11243cc8f3"><code>11243cc</code></a>
[5.1.x] Added security guideline on reasonable size limitations when
renderin...</li>
<li><a
href="b80288a16d"><code>b80288a</code></a>
[5.1.x] Added security reporting guidelines.</li>
<li>Additional commits viewable in <a
href="https://github.com/django/django/compare/5.1.6...5.1.7">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=django&package-manager=pip&previous-version=5.1.6&new-version=5.1.7)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/umap-project/umap/network/alerts).

</details>
2025-03-06 18:32:52 -05:00
dependabot[bot]
6d324cdb13
chore: bump django from 5.1.6 to 5.1.7
Bumps [django](https://github.com/django/django) from 5.1.6 to 5.1.7.
- [Commits](https://github.com/django/django/compare/5.1.6...5.1.7)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-06 22:58:33 +00:00
Yohan Boniface
782386bad4 feat: display a target on hover on search results
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-06 18:51:58 +01:00
Yohan Boniface
ae5bc9746c feat: allow to import full geometries from search results
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-06 17:03:13 +01:00
Yohan Boniface
a044bfd672 chore: refactor search UX
cf #419
2025-03-06 15:48:51 +01:00
Yohan Boniface
188a0d6e98 chore: bump Leaflet.Photon
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
To display state in results, cf #419
2025-03-06 09:38:51 +01:00
Yohan Boniface
b7cce7079d
chore: bump social-auth-app-django from 5.4.2 to 5.4.3 (#2518)
Some checks are pending
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
2025-03-05 17:50:16 +01:00
dependabot[bot]
0394f1f45d
chore: bump social-auth-app-django from 5.4.2 to 5.4.3
Bumps [social-auth-app-django](https://github.com/python-social-auth/social-app-django) from 5.4.2 to 5.4.3.
- [Release notes](https://github.com/python-social-auth/social-app-django/releases)
- [Changelog](https://github.com/python-social-auth/social-app-django/blob/master/CHANGELOG.md)
- [Commits](https://github.com/python-social-auth/social-app-django/compare/5.4.2...5.4.3)

---
updated-dependencies:
- dependency-name: social-auth-app-django
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-05 16:23:20 +00:00
Yohan Boniface
0d6326a7aa
chore: bump social-auth-core from 4.5.4 to 4.5.6 (#2517)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2025-03-05 17:22:07 +01:00
Yohan Boniface
9414d6220c
chore: bump psycopg from 3.2.4 to 3.2.5 (#2536)
Bumps [psycopg](https://github.com/psycopg/psycopg) from 3.2.4 to 3.2.5.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/psycopg/psycopg/blob/master/docs/news.rst">psycopg's
changelog</a>.</em></p>
<blockquote>
<p>.. currentmodule:: psycopg</p>
<p>.. index::
single: Release notes
single: News</p>
<h1><code>psycopg</code> release notes</h1>
<h2>Future releases</h2>
<p>Python 3.3.0 (unreleased)
^^^^^^^^^^^^^^^^^^^^^^^^^</p>
<ul>
<li>Drop support for Python 3.8.</li>
</ul>
<h2>Current release</h2>
<p>Psycopg 3.2.5
^^^^^^^^^^^^^</p>
<ul>
<li>3x faster UUID loading thanks to C implementation
(🎟️<code>[#447](https://github.com/psycopg/psycopg/issues/447),
[#998](https://github.com/psycopg/psycopg/issues/998)</code>).</li>
</ul>
<p>Psycopg 3.2.4
^^^^^^^^^^^^^</p>
<ul>
<li>Don't lose notifies received whilst the
<code>~Connection.notifies()</code> iterator
is not running
(🎫<code>[#962](https://github.com/psycopg/psycopg/issues/962)</code>).</li>
<li>Make sure that the notifies callback is called during the use of the
<code>~Connection.notifies()</code> generator
(🎫<code>[#972](https://github.com/psycopg/psycopg/issues/972)</code>).</li>
<li>Raise the correct error returned by the database (such as
<code>!AdminShutdown</code>
or <code>!IdleInTransactionSessionTimeout</code>) instead of a generic
<code>OperationalError</code> when a server error causes a client
disconnection

(🎫<code>[#988](https://github.com/psycopg/psycopg/issues/988)</code>).</li>
<li>Build macOS dependencies from sources instead using the Homebrew
versions
in order to avoid problems with <code>MACOSX_DEPLOYMENT_TARGET</code>
(🎫<code>[#858](https://github.com/psycopg/psycopg/issues/858)</code>).</li>
<li>Bump libpq to 17.2 in Linux and macOS binary packages.</li>
<li>Bump libpq to 16.4 in Windows binary packages, using the <code>vcpkg
library</code>__

(🎫<code>[#966](https://github.com/psycopg/psycopg/issues/966)</code>).</li>
</ul>
<p>.. __: <a
href="https://vcpkg.io/en/package/libpq">https://vcpkg.io/en/package/libpq</a></p>
<p>Psycopg 3.2.3
^^^^^^^^^^^^^</p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="664b2a12d6"><code>664b2a1</code></a>
chore: bump psycopg package version to 3.2.5</li>
<li><a
href="cd6589bf35"><code>cd6589b</code></a>
chore: bump build libraries</li>
<li><a
href="68f8603ec6"><code>68f8603</code></a>
Merge branch 'cython-uuid-3.2' into maint-3.2</li>
<li><a
href="dd1cefc3ee"><code>dd1cefc</code></a>
docs: mention UUID speedup in release news</li>
<li><a
href="7f950cb843"><code>7f950cb</code></a>
chore(c): remove C UUIDDumper and UUIDBinaryDumper</li>
<li><a
href="393e162fc3"><code>393e162</code></a>
perf(uuid): speed up UUID creation using a writable subclass</li>
<li><a
href="57a3889949"><code>57a3889</code></a>
perf(c): use PyObject_CallFunctionObjArgs in UUIDBinaryLoader</li>
<li><a
href="88f73fedd2"><code>88f73fe</code></a>
perf(c): use PyObject_CallFunctionObjArgs in UUIDLoader</li>
<li><a
href="3a9ade78e7"><code>3a9ade7</code></a>
test(c): test UUID.<strong>slots</strong></li>
<li><a
href="811cb51123"><code>811cb51</code></a>
perf(c): Use hex_to_int_map in UUIDLoader</li>
<li>Additional commits viewable in <a
href="https://github.com/psycopg/psycopg/compare/3.2.4...3.2.5">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=psycopg&package-manager=pip&previous-version=3.2.4&new-version=3.2.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2025-03-05 17:21:51 +01:00
Yohan Boniface
5d1f5de551
feat: expose active sessions in stats endpoint (#2544) 2025-03-05 16:41:44 +01:00
Yohan Boniface
1981f73212 feat: expose active sessions in stats endpoint 2025-03-05 10:02:42 +01:00
Yohan Boniface
9974852975 2.9.2
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2025-03-04 15:56:23 +01:00
Yohan Boniface
fb2fd217ab
fix: be defensive when getting the backend name from the session (#2540)
Seems that in some situation it is not defined.

We have this error in Sentry, but I'm not able to reproduce myself to
get a better context:


https://umap.sentry.io/issues/6351694806/?alert_rule_id=14960738&alert_timestamp=1741028858715&alert_type=email&environment=osmfr&notification_uuid=2c437997-d14d-4e0f-a62f-55bd19739ad2&project=4506656504020992&referrer=alert_email
2025-03-04 15:51:05 +01:00
Yohan Boniface
86d60f0b8e
fix: measure/drawing tooltip was misplaced (#2541)
Broken since 70f87d8636

fix #2539

Before:


![image](https://github.com/user-attachments/assets/5e68628c-a9f7-422a-b4b9-dd5daf0d77cd)


After:


![image](https://github.com/user-attachments/assets/c1857ab2-a8d1-43eb-a3d0-11bb24286bd6)
2025-03-04 15:48:04 +01:00
Yohan Boniface
3297296d59 fix: measure/drawing tooltip was misplaced
Since 70f87d8636

fix #2539
2025-03-04 11:52:06 +01:00
Yohan Boniface
470fc14d6d fix: be defensive when getting the backend name from the session
Seems that in some situation it is not defined.
2025-03-04 11:20:49 +01:00
Yohan Boniface
c0f7e9d50d 2.9.1
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2025-03-03 18:40:47 +01:00
Yohan Boniface
34259f6234 i18n 2025-03-03 18:39:08 +01:00
Yohan Boniface
fc7ed42e2e
chore: be more persuasive in deprecating twitter login backend (#2538)
- always redirect user from map to their profile page when they used a
deprecated backend to log in
- change the Twitter image to make clear it is to be removed
2025-03-03 18:35:48 +01:00
David Larlet
74504df64a
chore: bump isort from 6.0.0 to 6.0.1 (#2535) 2025-03-03 12:26:54 -05:00
David Larlet
9e91a4537d
chore: bump ruff from 0.9.6 to 0.9.9 (#2537)
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.9.6 to 0.9.9.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/astral-sh/ruff/releases">ruff's
releases</a>.</em></p>
<blockquote>
<h2>0.9.9</h2>
<h2>Release Notes</h2>
<h3>Preview features</h3>
<ul>
<li>Fix caching of unsupported-syntax errors (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16425">#16425</a>)</li>
</ul>
<h3>Bug fixes</h3>
<ul>
<li>Only show unsupported-syntax errors in editors when preview mode is
enabled (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16429">#16429</a>)</li>
</ul>
<h2>Contributors</h2>
<ul>
<li><a
href="https://github.com/InSyncWithFoo"><code>@​InSyncWithFoo</code></a></li>
<li><a
href="https://github.com/MichaReiser"><code>@​MichaReiser</code></a></li>
<li><a
href="https://github.com/dhruvmanila"><code>@​dhruvmanila</code></a></li>
<li><a href="https://github.com/ntBre"><code>@​ntBre</code></a></li>
</ul>
<h2>Install ruff 0.9.9</h2>
<h3>Install prebuilt binaries via shell script</h3>
<pre lang="sh"><code>curl --proto '=https' --tlsv1.2 -LsSf
https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-installer.sh
| sh
</code></pre>
<h3>Install prebuilt binaries via powershell script</h3>
<pre lang="sh"><code>powershell -ExecutionPolicy ByPass -c &quot;irm
https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-installer.ps1
| iex&quot;
</code></pre>
<h2>Download ruff 0.9.9</h2>
<table>
<thead>
<tr>
<th>File</th>
<th>Platform</th>
<th>Checksum</th>
</tr>
</thead>
<tbody>
<tr>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-aarch64-apple-darwin.tar.gz">ruff-aarch64-apple-darwin.tar.gz</a></td>
<td>Apple Silicon macOS</td>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-aarch64-apple-darwin.tar.gz.sha256">checksum</a></td>
</tr>
<tr>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-x86_64-apple-darwin.tar.gz">ruff-x86_64-apple-darwin.tar.gz</a></td>
<td>Intel macOS</td>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-x86_64-apple-darwin.tar.gz.sha256">checksum</a></td>
</tr>
<tr>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-aarch64-pc-windows-msvc.zip">ruff-aarch64-pc-windows-msvc.zip</a></td>
<td>ARM64 Windows</td>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-aarch64-pc-windows-msvc.zip.sha256">checksum</a></td>
</tr>
<tr>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-i686-pc-windows-msvc.zip">ruff-i686-pc-windows-msvc.zip</a></td>
<td>x86 Windows</td>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-i686-pc-windows-msvc.zip.sha256">checksum</a></td>
</tr>
<tr>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-x86_64-pc-windows-msvc.zip">ruff-x86_64-pc-windows-msvc.zip</a></td>
<td>x64 Windows</td>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-x86_64-pc-windows-msvc.zip.sha256">checksum</a></td>
</tr>
<tr>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-aarch64-unknown-linux-gnu.tar.gz">ruff-aarch64-unknown-linux-gnu.tar.gz</a></td>
<td>ARM64 Linux</td>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-aarch64-unknown-linux-gnu.tar.gz.sha256">checksum</a></td>
</tr>
<tr>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-i686-unknown-linux-gnu.tar.gz">ruff-i686-unknown-linux-gnu.tar.gz</a></td>
<td>x86 Linux</td>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-i686-unknown-linux-gnu.tar.gz.sha256">checksum</a></td>
</tr>
<tr>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-powerpc64-unknown-linux-gnu.tar.gz">ruff-powerpc64-unknown-linux-gnu.tar.gz</a></td>
<td>PPC64 Linux</td>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-powerpc64-unknown-linux-gnu.tar.gz.sha256">checksum</a></td>
</tr>
<tr>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-powerpc64le-unknown-linux-gnu.tar.gz">ruff-powerpc64le-unknown-linux-gnu.tar.gz</a></td>
<td>PPC64LE Linux</td>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-powerpc64le-unknown-linux-gnu.tar.gz.sha256">checksum</a></td>
</tr>
<tr>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-s390x-unknown-linux-gnu.tar.gz">ruff-s390x-unknown-linux-gnu.tar.gz</a></td>
<td>S390x Linux</td>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-s390x-unknown-linux-gnu.tar.gz.sha256">checksum</a></td>
</tr>
<tr>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-x86_64-unknown-linux-gnu.tar.gz">ruff-x86_64-unknown-linux-gnu.tar.gz</a></td>
<td>x64 Linux</td>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-x86_64-unknown-linux-gnu.tar.gz.sha256">checksum</a></td>
</tr>
<tr>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-armv7-unknown-linux-gnueabihf.tar.gz">ruff-armv7-unknown-linux-gnueabihf.tar.gz</a></td>
<td>ARMv7 Linux</td>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-armv7-unknown-linux-gnueabihf.tar.gz.sha256">checksum</a></td>
</tr>
<tr>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-aarch64-unknown-linux-musl.tar.gz">ruff-aarch64-unknown-linux-musl.tar.gz</a></td>
<td>ARM64 MUSL Linux</td>
<td><a
href="https://github.com/astral-sh/ruff/releases/download/0.9.9/ruff-aarch64-unknown-linux-musl.tar.gz.sha256">checksum</a></td>
</tr>
</tbody>
</table>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md">ruff's
changelog</a>.</em></p>
<blockquote>
<h2>0.9.9</h2>
<h3>Preview features</h3>
<ul>
<li>Fix caching of unsupported-syntax errors (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16425">#16425</a>)</li>
</ul>
<h3>Bug fixes</h3>
<ul>
<li>Only show unsupported-syntax errors in editors when preview mode is
enabled (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16429">#16429</a>)</li>
</ul>
<h2>0.9.8</h2>
<h3>Preview features</h3>
<ul>
<li>Start detecting version-related syntax errors in the parser (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16090">#16090</a>)</li>
</ul>
<h3>Rule changes</h3>
<ul>
<li>[<code>pylint</code>] Mark fix unsafe (<code>PLW1507</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16343">#16343</a>)</li>
<li>[<code>pylint</code>] Catch <code>case np.nan</code>/<code>case
math.nan</code> in <code>match</code> statements (<code>PLW0177</code>)
(<a
href="https://redirect.github.com/astral-sh/ruff/pull/16378">#16378</a>)</li>
<li>[<code>ruff</code>] Add more Pydantic models variants to the list of
default copy semantics (<code>RUF012</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16291">#16291</a>)</li>
</ul>
<h3>Server</h3>
<ul>
<li>Avoid indexing the project if <code>configurationPreference</code>
is <code>editorOnly</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16381">#16381</a>)</li>
<li>Avoid unnecessary info at non-trace server log level (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16389">#16389</a>)</li>
<li>Expand <code>ruff.configuration</code> to allow inline config (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16296">#16296</a>)</li>
<li>Notify users for invalid client settings (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16361">#16361</a>)</li>
</ul>
<h3>Configuration</h3>
<ul>
<li>Add <code>per-file-target-version</code> option (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16257">#16257</a>)</li>
</ul>
<h3>Bug fixes</h3>
<ul>
<li>[<code>refurb</code>] Do not consider docstring(s)
(<code>FURB156</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16391">#16391</a>)</li>
<li>[<code>flake8-self</code>] Ignore attribute accesses on
instance-like variables (<code>SLF001</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16149">#16149</a>)</li>
<li>[<code>pylint</code>] Fix false positives, add missing methods, and
support positional-only parameters (<code>PLE0302</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16263">#16263</a>)</li>
<li>[<code>flake8-pyi</code>] Mark <code>PYI030</code> fix unsafe when
comments are deleted (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16322">#16322</a>)</li>
</ul>
<h3>Documentation</h3>
<ul>
<li>Fix example for <code>S611</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16316">#16316</a>)</li>
<li>Normalize inconsistent markdown headings in docstrings (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16364">#16364</a>)</li>
<li>Document MSRV policy (<a
href="https://redirect.github.com/astral-sh/ruff/pull/16384">#16384</a>)</li>
</ul>
<h2>0.9.7</h2>
<h3>Preview features</h3>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="091d0af2ab"><code>091d0af</code></a>
Bump version to Ruff 0.9.9 (<a
href="https://redirect.github.com/astral-sh/ruff/issues/16434">#16434</a>)</li>
<li><a
href="3d72138740"><code>3d72138</code></a>
Check <code>LinterSettings::preview</code> for version-related syntax
errors (<a
href="https://redirect.github.com/astral-sh/ruff/issues/16429">#16429</a>)</li>
<li><a
href="4a23756024"><code>4a23756</code></a>
Avoid caching files with unsupported syntax errors (<a
href="https://redirect.github.com/astral-sh/ruff/issues/16425">#16425</a>)</li>
<li><a
href="af62f7932b"><code>af62f79</code></a>
Prioritize &quot;bug&quot; label for changelog sections (<a
href="https://redirect.github.com/astral-sh/ruff/issues/16433">#16433</a>)</li>
<li><a
href="0ced8d053c"><code>0ced8d0</code></a>
[<code>flake8-copyright</code>] Add links to applicable options
(<code>CPY001</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/issues/16421">#16421</a>)</li>
<li><a
href="a8e171f82c"><code>a8e171f</code></a>
Fix string-length limit in documentation for PYI054 (<a
href="https://redirect.github.com/astral-sh/ruff/issues/16432">#16432</a>)</li>
<li><a
href="cf83584abb"><code>cf83584</code></a>
Show version-related syntax errors in the playground (<a
href="https://redirect.github.com/astral-sh/ruff/issues/16419">#16419</a>)</li>
<li><a
href="764aa0e6a1"><code>764aa0e</code></a>
Allow passing <code>ParseOptions</code> to inline tests (<a
href="https://redirect.github.com/astral-sh/ruff/issues/16357">#16357</a>)</li>
<li><a
href="568cf88c6c"><code>568cf88</code></a>
Bump version to 0.9.8 (<a
href="https://redirect.github.com/astral-sh/ruff/issues/16414">#16414</a>)</li>
<li><a
href="040071bbc5"><code>040071b</code></a>
[red-knot] Ignore surrounding whitespace when looking for `&lt;!--
snapshot-diag...</li>
<li>Additional commits viewable in <a
href="https://github.com/astral-sh/ruff/compare/0.9.6...0.9.9">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=ruff&package-manager=pip&previous-version=0.9.6&new-version=0.9.9)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2025-03-03 12:26:28 -05:00
Yohan Boniface
284ca8fd9c chore: be more persuasive in deprecating twitter login backend
- always redirect user from map to their profile page when they
  used a deprecated backend to log in
- change the Twitter image to make clear it is to be removed

Co-authored-by: David Larlet <david@larlet.fr>
2025-03-03 18:24:23 +01:00
dependabot[bot]
1dc468c350
chore: bump ruff from 0.9.6 to 0.9.9
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.9.6 to 0.9.9.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.9.6...0.9.9)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-03 17:19:47 +00:00
dependabot[bot]
434de70c02
chore: bump psycopg from 3.2.4 to 3.2.5
Bumps [psycopg](https://github.com/psycopg/psycopg) from 3.2.4 to 3.2.5.
- [Changelog](https://github.com/psycopg/psycopg/blob/master/docs/news.rst)
- [Commits](https://github.com/psycopg/psycopg/compare/3.2.4...3.2.5)

---
updated-dependencies:
- dependency-name: psycopg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-03 17:19:37 +00:00
dependabot[bot]
e9389723e8
chore: bump isort from 6.0.0 to 6.0.1
Bumps [isort](https://github.com/PyCQA/isort) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/PyCQA/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](https://github.com/PyCQA/isort/compare/6.0.0...6.0.1)

---
updated-dependencies:
- dependency-name: isort
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-03 17:19:32 +00:00
Yohan Boniface
2cf3a4e6a3 fix: honour error status in alerts
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-03 16:48:44 +01:00
Yohan Boniface
bc1eaa05c9 chore: use a French quote in translation
To prevent escape from Django, as we then use it in a textContent
property for alerts.

Co-authored-by: David Larlet <david@larlet.fr>
2025-03-03 16:47:48 +01:00
Yohan Boniface
420647906d doc: fix setting name for DEPRECATED_AUTHENTICATION_BACKENDS
Co-authored-by: David Larlet <david@larlet.fr>
2025-03-03 16:47:09 +01:00
Yohan Boniface
ce024d57fd 2.9.0
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2025-03-03 15:49:27 +01:00
David Larlet
5eab942f25
a11y: switch to better contrasted links (#2532)
And underline for external links otherwise the new green color is too
close to the text one to clearly identify links.
2025-03-03 09:36:50 -05:00
Yohan Boniface
9e791a0ab4
fix: feature edit status not disabled on hide (#2534) 2025-03-03 15:34:49 +01:00
Yohan Boniface
26fe653456 i18n 2025-03-03 15:13:03 +01:00
David Larlet
ea58f93940
a11y: update URLs and (underlined) styles for help 2025-03-03 09:10:37 -05:00
Yohan Boniface
436c083744 fix: feature edit status not disabled on hide 2025-03-03 15:09:34 +01:00
Yohan Boniface
ea00d4fc32 chore: remove _marked_for_deletion pattern
We think it's useless now that we use "editable:edited" event everywhere
(vs using the "editable:commit" which was triggered also after a delete,
when closing the edit panel)
2025-03-03 15:09:07 +01:00
David Larlet
742a23b668
a11y: set an aria-label for unlabelled search input (#2531) 2025-03-03 09:04:31 -05:00
David Larlet
abe49cc1ba
a11y: turn embeded maps into inert elements
One of the side-effects is to make the content of the map un-focusable but we also loose the ability to interact with the map itself.
2025-02-28 16:18:28 -05:00
David Larlet
4f5d37b676
a11y: switch to better contrasted links
And underline for external links otherwise the new green color is too close to the text one to clearly identify links.
2025-02-28 14:05:26 -05:00
David Larlet
949a266437
a11y: set an aria-label for unlabelled search input 2025-02-28 13:58:40 -05:00
Yohan Boniface
48daa0a77f fix: do not show tooltip with only spaces
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Co-authored-by: David Larlet <david@larlet.fr>
2025-02-27 19:28:38 +01:00
Yohan Boniface
ba20f5791c fix: shift-click on a path should toggle edit
This was broken in 4adc558560

Co-authored-by: David Larlet <david@larlet.fr>
2025-02-27 19:21:43 +01:00
Yohan Boniface
0fe2103b71 chore: bump Leaflet.Editable and DOMPurify 2025-02-27 17:12:02 +01:00
dependabot[bot]
c5eac8a8a9
chore: bump social-auth-core from 4.5.4 to 4.5.6
Bumps [social-auth-core](https://github.com/python-social-auth/social-core) from 4.5.4 to 4.5.6.
- [Release notes](https://github.com/python-social-auth/social-core/releases)
- [Changelog](https://github.com/python-social-auth/social-core/blob/master/CHANGELOG.md)
- [Commits](https://github.com/python-social-auth/social-core/compare/4.5.4...4.5.6)

---
updated-dependencies:
- dependency-name: social-auth-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-27 14:49:50 +00:00
Yohan Boniface
55d505e7d8
chore: bump rjsmin from 1.2.3 to 1.2.4 (#2519) 2025-02-27 15:48:37 +01:00
Yohan Boniface
14e90a1a0f
feat: add a quick link to layer's permalink (#2529)
This will open a new page with only this given layer shown.


![image](https://github.com/user-attachments/assets/4db637b9-03f4-4b05-9ce3-6656aba11786)
2025-02-27 15:36:45 +01:00
Yohan Boniface
e919c5f168
fix(sync): make datalayer upsert idempotent (#2528)
That fix does not really fix the original issue, but it makes it
impactless, and I think it's safer anyway to have upsert idempotent.

The pattern to reproduce is:
- peer A create a synced map, add a datalayer, save it
- peer B loads the map, click on edit
- at this time, peer B have twice the datalayer data, once from the
server AND once from the sync

So a better fix would be to make that peer B send a meaningfull HLC to
peer A I guess.
For this we may save the last HLC is the map properties, or maybe try to
merge the "reference_version" and the HLC.
2025-02-27 15:32:09 +01:00
Yohan Boniface
b1076dcb7b
fix: make sure we sync a line when hitting esc while drawing (#2526)
I first tried to handle this on Leaflet.Editable side, to make it fire
the "editable:edited" event we use to trigger the sync, but deciding
what to do with a feature on escape needs some decisions that seems hard
to implement in a generic way in Leaflet.Editable.
We call stopDrawing, which then calls cancelDrawing, so here one need to
decide if cancelDrawing should keep the already drawn line (but cancel
the point being drawn) or cancel everything.
This is why I end up making this change in uMap itself.
2025-02-27 15:26:54 +01:00
Yohan Boniface
69ca89a6ba
fix: prevent client to open two websocket connections (#2524)
To reproduce:
- create a map
- saved it
- change the "syncEnabled" setting to on
- save again
- open another tab with this map
- switch on edit mode

In this case, the second client will try to authenticate:
- once switch on edit mode
- and once receiving the operation message from peer A about the
syncEnabled (which calls render, which calls initSyncEngine in in this
case)

I think we want to keep render to call initSyncEngine, so if a map owner
switch off the syncEnabled setting, this will (should) disconnect the
other peers.
2025-02-27 15:20:16 +01:00
Yohan Boniface
df0faa75aa feat: add a quick link to layer's permalink
This will open a new page with only this given layer shown.
2025-02-26 15:38:48 +01:00
Yohan Boniface
fc6ea191cc
chore: do not try to disconnect ws if not connected (#2527)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
cf https://umap.sentry.io/issues/6331841272/
2025-02-26 15:18:34 +01:00
Yohan Boniface
b400ade44b fix(sync): make datalayer upsert idempotent
That fix does not really fix the original issue, but it make it impactless.

The pattern is:
- peer A create a synced map, add a datalayer, save it
- peer B loads the map, click on edit
- at this time, peer B have twice the datalayer data, once from the server
  AND once from the sync

So a better fix would be to make that peer B send a meaningfull HLC to
peer A I guess.
For this we may save the last HLC is the map properties, or maybe try
to merge the "reference_version" and the HLC.
2025-02-26 11:55:21 +01:00
Yohan Boniface
dc35039af8 chore: do not try to disconnect ws if not connected
cf https://umap.sentry.io/issues/6331841272/
2025-02-26 09:41:03 +01:00
Yohan Boniface
9858fc2190 fix: make sure we sync a line when hitting esc while drawing
I first tried to handle this on Leaflet.Editable side, to make
it fire the "editable:edited" event we use to trigger the sync,
but deciding what to do with a feature on escape needs some
decisions that seems hard to implement in a generic way in
Leaflet.Editable.
We call stopDrawing, which then calls cancelDrawing, so here
one need to decide if cancelDrawing should keep the already
drawn line (but cancel the point being drawn) or cancel
everything.
This is why I end up making this change in uMap itself.
2025-02-25 17:17:49 +01:00
Yohan Boniface
5ddd973eae fix: prevent client to open two websocket connections
To reproduce:
- create a map
- saved it
- change the "syncEnabled" setting to on
- save again
- open another tab with this map
- switch on edit mode

In this case, the second client will try to authenticate:
- once switch on edit mode
- and once receiving the operation message from peer A about the
  syncEnabled (which calls render, which calls initSyncEngine in
  in this case)

I think we want to keep render to call initSyncEngine, so if a map
owner switch off the syncEnabled setting, this will (should) disconnect
the other peers.
2025-02-25 08:33:14 +01:00
Yohan Boniface
6e40388f7d
chore: use template for map advanced buttons (and fix icons) (#2523)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Before:


![image](https://github.com/user-attachments/assets/fc8dd27f-aa03-4eaf-ba21-e041b0548e51)

After:


![image](https://github.com/user-attachments/assets/2b9b15ca-542b-4114-b57c-c88189a7260a)
2025-02-25 08:25:24 +01:00
Yohan Boniface
ab571925ff chore: use template for layer advanced buttons 2025-02-24 17:19:46 +01:00
Yohan Boniface
a70e608e42 chore: use template for map advanced buttons 2025-02-24 17:05:54 +01:00
dependabot[bot]
d342336930
chore: bump rjsmin from 1.2.3 to 1.2.4
Bumps [rjsmin](https://github.com/ndparker/rjsmin) from 1.2.3 to 1.2.4.
- [Changelog](https://github.com/ndparker/rjsmin/blob/master/CHANGES)
- [Commits](https://github.com/ndparker/rjsmin/compare/1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: rjsmin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-24 14:09:11 +00:00
Yohan Boniface
4c76f8dbde
chore: bump dompurify from 3.1.7 to 3.2.4 (#2521)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2025-02-24 15:08:22 +01:00
Yohan Boniface
b417d71fb7
chore: bump rcssmin from 1.2.0 to 1.2.1 (#2515) 2025-02-24 15:07:55 +01:00
dependabot[bot]
be267504da
chore: bump dompurify from 3.1.7 to 3.2.4
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.1.7 to 3.2.4.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/3.1.7...3.2.4)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-24 13:23:19 +00:00
Yohan Boniface
0e12efbca6
chore: bump mkdocs-material from 9.6.3 to 9.6.4 (#2516) 2025-02-24 14:22:12 +01:00
dependabot[bot]
0dfe1ac29a
chore: bump mkdocs-material from 9.6.3 to 9.6.4
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.6.3 to 9.6.4.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.6.3...9.6.4)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-17 17:50:05 +00:00
dependabot[bot]
256613512b
chore: bump rcssmin from 1.2.0 to 1.2.1
Bumps [rcssmin](https://github.com/ndparker/rcssmin) from 1.2.0 to 1.2.1.
- [Changelog](https://github.com/ndparker/rcssmin/blob/master/CHANGES)
- [Commits](https://github.com/ndparker/rcssmin/compare/1.2.0...1.2.1)

---
updated-dependencies:
- dependency-name: rcssmin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-17 17:49:57 +00:00
Yohan Boniface
fcac4df30b
chore: use our contexmenu class for inplace toolbar (#2510)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
And remove Leaflet.Toolbar dependency.
This also teach ContextMenu how to display icons instead of text and how
to render in horizontal orientation instead of vertical.

Before:

![image](https://github.com/user-attachments/assets/196b17c4-ec6c-4023-b5bf-32033caf4408)

After:


![image](https://github.com/user-attachments/assets/29ad8628-01a6-4028-a99a-bc679c5db18d)

We've lost the bottom tip in the process, should I add this to the
ContextMenu class ?

Also, the automatic border for the focused button is a bit noisy imho,
not sure how to deal with that.
2025-02-14 17:25:13 +01:00
Yohan Boniface
b107de3421
fix(sync): wait for websocket full connection (#2503)
Websocket has now a "connect" method, which is a promise, that yields
"onconnect", so the engine can wait for it before proceding.
2025-02-14 17:22:57 +01:00
Yohan Boniface
b86db00e88
fix(sync): try to reconnect after network error when getting token (#2502)
Otherwise, if the token request fail, the process will be stopped and we
will never try to reconnect.
2025-02-14 17:22:41 +01:00
Yohan Boniface
244e637acc
chore: sync save state (#2487)
When a peer save the map, other peers in dirty state should not need to
save the map anymore.

That implementation uses the lastKnownHLC as a reference, but it changes
all dirty states at once. Another impementation could be to have each
object sync its dirty state, but in this case we do not have a HLC per
object as reference, and it also creates more messages.

ping @almet if you're around and wanna have a fresh look. :)
2025-02-14 17:17:59 +01:00
Yohan Boniface
c00de1a457
fix: use default value from schema for non inheritable fields (#2513)
Eg. moreControl
2025-02-14 17:17:15 +01:00
Yohan Boniface
48b4d61cd0 chore: add an hover on dark context menu buttons
Co-authored-by: David Larlet <david@larlet.fr>
2025-02-14 17:16:35 +01:00
Yohan Boniface
b90328f65e
feat: make vertex icons bigger (and round) (#2506)
Before:
![Screenshot From 2025-02-11
13-59-40](https://github.com/user-attachments/assets/013998f1-d9f7-4129-95b8-0ab969eee018)

After:
![Screenshot From 2025-02-11
13-59-12](https://github.com/user-attachments/assets/7d279db3-3fe2-41cb-bdc4-9255f625895d)

(Size unchanged on mobile)

cf #673
2025-02-14 16:52:54 +01:00
Yohan Boniface
2089d3b0c6 fix: use default value from schema for non inheritable fields
Eg. moreControl

Co-authored-by: David Larlet <david@larlet.fr>
2025-02-14 16:44:11 +01:00
Yohan Boniface
52b4244333 chore: add missing default values in schema 2025-02-14 16:03:15 +01:00
Yohan Boniface
1b3852d0e8 i18n 2025-02-14 16:03:05 +01:00
Yohan Boniface
20b1dd6f26 i18n
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2025-02-14 15:38:31 +01:00
Yohan Boniface
4adc558560 chore: use our contexmenu class for inplace toolbar
And remove Leaflet.Toolbar dependency.
This also teach ContextMenu how to display icons instead of
text and how to render in horizontal orientation instead of
vertical.
2025-02-12 14:59:43 +01:00
Yohan Boniface
fb6df6f955
feat: make the tooltip sticky in hover mode for paths (#2507)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Until now, it was displayed on the path (line or polygon) "center". So
when zoomed in, if the center is not on the screen, the tooltip will not
be visible.
2025-02-11 18:01:01 +01:00
Yohan Boniface
04966cc068 feat: make the tooltip sticky in hover mode for paths
Until now, it was displayed on the path (line or polygon)
"center". So when zoomed in, if the center is not on the
screen, the tooltip will not be visible.
2025-02-11 15:51:43 +01:00
Yohan Boniface
c71a6aafdb
fix: do not display an error for an empty CSV (#2505)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
fix #577
fix #2491
fix #1546
2025-02-11 15:00:16 +01:00
Yohan Boniface
9c418afe37
chore: run the CI even for PR not targetting master (and remove doc build twice) (#2504)
Replaces #2493
2025-02-11 14:59:31 +01:00
Yohan Boniface
008a996bea feat: make vertex icons bigger (and round) 2025-02-11 14:00:09 +01:00
Yohan Boniface
8e13a15645 fix: do not display an error for an empty CSV
fix #577
fix #2491
fix #1546
2025-02-11 13:45:40 +01:00
Yohan Boniface
de3be9bb97 chore: only build doc once in the CI
I've chosen to keep the one in the "lint" step, instead of a
dedicated step, so to prevent one more container to be built at
each run (did I say "to save trees" ?) :p
2025-02-11 13:32:59 +01:00
Yohan Boniface
6530aaa794 chore: do not run CI if no umap code files has been changed
Co-authored-by: David Larlet <david@larlet.fr>
2025-02-11 13:31:28 +01:00
Yohan Boniface
414cc805c2 fix(sync): wait for websocket full connection
Websocket has now a "connect" method, which is a promise,
that yields "onconnect", so the engine can wait for it before
proceding.
2025-02-11 13:26:27 +01:00
Yohan Boniface
1ce491a70c fix(sync): try to reconnect after network error when getting token 2025-02-11 13:03:06 +01:00
Yohan Boniface
4dd50690b1
chore: bump ruff from 0.9.3 to 0.9.6 (#2499) 2025-02-11 12:16:20 +01:00
Yohan Boniface
f0e87bab83
Fix broken showLabel=null (on hover) (#2490)
Broken since c27e675152
2025-02-11 12:14:52 +01:00
dependabot[bot]
238de28098
chore: bump ruff from 0.9.3 to 0.9.6
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.9.3 to 0.9.6.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.9.3...0.9.6)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-11 10:58:25 +00:00
Yohan Boniface
c5467e42d5
chore: bump mkdocs-material from 9.5.50 to 9.6.3 (#2496) 2025-02-11 11:57:17 +01:00
Yohan Boniface
14c388b063
chore: bump pytest-django from 4.9.0 to 4.10.0 (#2495) 2025-02-11 11:56:39 +01:00
Yohan Boniface
e3c5acd52b
chore: bump moto[s3] from 5.0.27 to 5.0.28 (#2498) 2025-02-11 11:56:08 +01:00
Yohan Boniface
c044afb43d
chore: bump django from 5.1.5 to 5.1.6 (#2497) 2025-02-11 11:55:36 +01:00
Yohan Boniface
c5417178c4 fix: "null" value was not honoured in showLabel field 2025-02-11 11:48:01 +01:00
dependabot[bot]
cfef25748b
chore: bump moto[s3] from 5.0.27 to 5.0.28
Bumps [moto[s3]](https://github.com/getmoto/moto) from 5.0.27 to 5.0.28.
- [Release notes](https://github.com/getmoto/moto/releases)
- [Changelog](https://github.com/getmoto/moto/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getmoto/moto/compare/5.0.27...5.0.28)

---
updated-dependencies:
- dependency-name: moto[s3]
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-10 17:06:37 +00:00
dependabot[bot]
6c835622c0
chore: bump django from 5.1.5 to 5.1.6
Bumps [django](https://github.com/django/django) from 5.1.5 to 5.1.6.
- [Commits](https://github.com/django/django/compare/5.1.5...5.1.6)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-10 17:06:31 +00:00
dependabot[bot]
62e23ac49b
chore: bump mkdocs-material from 9.5.50 to 9.6.3
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.50 to 9.6.3.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.5.50...9.6.3)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-10 17:06:26 +00:00
dependabot[bot]
a78cdd227e
chore: bump pytest-django from 4.9.0 to 4.10.0
Bumps [pytest-django](https://github.com/pytest-dev/pytest-django) from 4.9.0 to 4.10.0.
- [Release notes](https://github.com/pytest-dev/pytest-django/releases)
- [Changelog](https://github.com/pytest-dev/pytest-django/blob/main/docs/changelog.rst)
- [Commits](https://github.com/pytest-dev/pytest-django/compare/v4.9.0...v4.10.0)

---
updated-dependencies:
- dependency-name: pytest-django
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-10 17:06:20 +00:00
Yohan Boniface
aea422a247
feat: add title attribute to layers in browser (#2489)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Usefull when the layer title is truncated because too long.


![image](https://github.com/user-attachments/assets/267a4639-e929-4be9-8934-373afb24b6fe)


![image](https://github.com/user-attachments/assets/0c8953df-77a5-4b7f-93b3-92bf9d7894ff)
2025-02-10 17:17:55 +01:00
Yohan Boniface
46c319e5cf
chore: smaller star button and invert author and dates (#2488)
Also make created/modified lower case on caption.


![image](https://github.com/user-attachments/assets/72117435-d4ba-439d-a9c6-862bdee439a9)

cf #2424
cf #2442

cc @Aurelie-Jallut
2025-02-10 17:16:04 +01:00
Yohan Boniface
f105336d48
chore: read datalayer metadata from file if missing in DB (#2494)
When we introduced the DataLayer.settings property, we did not run a
migration for existing datalayers (because there are millions in the
French server).
Now that we simplified the `DataLayer.isLoaded()` logic in the client,
we want to be sure that created DataLayer on the client have full
metadata.
2025-02-10 16:59:49 +01:00
Yohan Boniface
9b01a4b77a chore: read datalayer metadata from file if missing in DB
When we introduced the DataLayer.settings property, we did not run
a migration for existing datalayers (because there are millions in the
French server).
Now that we simplified the `DataLayer.isLoaded()` logic in the client,
we want to be sure that created DataLayer on the client have full
metadata.

Co-authored-by: David Larlet <david@larlet.fr>
2025-02-10 16:56:15 +01:00
Yohan Boniface
e827e77bb9
chore: refactor layer.isLoaded() (#2492) 2025-02-10 16:39:15 +01:00
Yohan Boniface
a8e18c167c chore: no need to reset datalayer._needsFetch after a save
It is reset only after loading the layer data.

Co-authored-by: David Larlet <david@larlet.fr>
2025-02-10 16:30:00 +01:00
Yohan Boniface
175e27a535 chore: remove DataLayer._dataloaded in favor of isLoaded()
At the end, we only need two states: has this datalayer loaded the
data it should load ? yes / no.
Whether it local or remote data should not be a matter.
2025-02-10 15:44:41 +01:00
Yohan Boniface
ba0582deb1 chore: refactor layer.isLoaded() 2025-02-10 13:13:56 +01:00
Yohan Boniface
9fe744573c feat: add title attribute to layers in browser
Usefull when the layer title is truncated because too long.
2025-02-10 09:41:16 +01:00
Yohan Boniface
64068af393 fix: do not save "null" instead of null for showLabel 2025-02-07 21:56:02 +01:00
Yohan Boniface
6793a6bdc7 fix: do not modify schema while iterating on it 2025-02-07 21:50:11 +01:00
Yohan Boniface
c7681c0304 chore: smaller star button and invert author and dates
Also make created/modified lower case on caption.

cf #2424
cf #2442
2025-02-07 19:00:30 +01:00
Yohan Boniface
eca7ad4772 fixup: prevent to reload a datalayer after other peer has saved it
The scenario to reproduce is:
- peer A creates a datalayer
- peer B add a marker on that datalayer
- peer B saves the datalayer

Before this fix, after the save, peer A would get a new _referenceVersion
for this datalayer, and the render method would make a hide/show,
which would refetch the data from the server, duplicating it.
So forcing the _loaded to be true in this situation prevent this.

We may want to rework the "_loaded" pattern, maybe with the server
returning in a datalayer metadata the length of the data it get for
this given datalayer, so the client knows if it is worth getting
data for a layer when itself (the client) does not have any.

Co-authored-by: David Larlet <david@larlet.fr>
2025-02-07 17:58:27 +01:00
Yohan Boniface
a172c4abea fixup: do not try to sync saved state when not in sync mode
Co-authored-by: David Larlet <david@larlet.fr>
2025-02-07 17:53:48 +01:00
Yohan Boniface
b8db07a4ce chore: sync save state
When a peer save the map, other peers in dirty state should not need
to save the map anymore.

That implementation uses the lastKnownHLC as a reference, but it changes
all dirty states at once. Another impementation could be to have each
object sync its dirty state, but in this case we do not have a HLC per
object as reference, and it also creates more messages.

Co-authored-by: David Larlet <david@larlet.fr>
2025-02-07 16:47:45 +01:00
Yohan Boniface
815ff046ff chore: mention nginx mapping in asgi documentation
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
Co-authored-by: David Larlet <david@larlet.fr>
2025-02-07 16:25:34 +01:00
Yohan Boniface
76c13a61a6 fixup: do not show empty helpText for editors and owner fields 2025-02-07 15:35:49 +01:00
Yohan Boniface
ad51f674ef
fix: do not import empty features (#2485) 2025-02-07 15:26:42 +01:00
Yohan Boniface
8949d6fa71
fix: do not sync twice a point move (#2486) 2025-02-07 15:26:25 +01:00
Yohan Boniface
009b32c818 fix: do not sync twice a point move 2025-02-07 10:08:58 +01:00
Yohan Boniface
c5ee9fc283
chore: use editable-edited event to sync changes (#2478)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
This is more unified between markers and paths, and it allows paths to
be synced as soon as they have been drawn (instead of when closing the
edit panel, which created a race condition when changing its properties
that were then synced to other while the feature itself was not).
2025-02-07 09:12:45 +01:00
Yohan Boniface
9af74b0a4e fix: do not import empty features 2025-02-07 09:11:16 +01:00
David Larlet
fb03c6a39e
feat: Expose teams in users’ CSV export (#2484)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
2025-02-06 11:50:52 -05:00
David Larlet
2331f4103e
chore: add very minimal documentation for deploying uMap with ASGI (#2480)
This is just about ASGI, not the websockets and the sync itself.

We may merge it, or just keep it and amend it until we have the sync
official.
2025-02-06 11:29:00 -05:00
Yohan Boniface
a1372b5f4d
chore: move DrawToolbar and SettingsToolbar to bar.js module (#2482)
This also:
- change the "set center and zoom" to be a panel instead of a direct
action (including the "defaultView" setting
- refactor the "get started dialog"

This is a first step to remove our dependency to the unmaintained
Leaflet.Toolbar plugin.


![image](https://github.com/user-attachments/assets/d9a76df1-0392-45c8-9a2f-f1a2995754d1)


![image](https://github.com/user-attachments/assets/7f40e2f5-c816-4086-9a16-b792621948de)


![image](https://github.com/user-attachments/assets/a02fd480-c50b-4d2d-9919-ca483c1c8def)

The mockup on figma glues the edit toolbar to the edit panel, but I
didn't not implement this as I don't know how to make it work in
portrait/mobile view. This step is mainly a code refactor.
2025-02-06 17:28:43 +01:00
David Larlet
0cba3ab158
fix: Do not error when escape during marker creation (#2483) 2025-02-06 11:28:26 -05:00
David Larlet
17b8d73978
feat: Expose teams in users’ CSV export
Co-authored-by: Yohan Boniface <yohanboniface@free.fr>
2025-02-06 11:26:47 -05:00
David Larlet
519302b53d
fix: Do not error when escape during marker creation
Co-authored-by: Yohan Boniface <yohanboniface@free.fr>
2025-02-06 11:14:58 -05:00
David Larlet
cbe50a0112
fixup: back to original dark grey
Co-authored-by: Yohan Boniface <yohanboniface@free.fr>
2025-02-06 11:02:38 -05:00
David Larlet
b214f4109c
fixup: restore help contents and fix button icon
Co-authored-by: Yohan Boniface <yohanboniface@free.fr>
2025-02-06 10:28:05 -05:00
David Larlet
e8e06da149
fix: consistent border radius for edit bar
Co-authored-by: Yohan Boniface <yohanboniface@free.fr>
2025-02-06 10:05:55 -05:00
David Larlet
0451b4a882
chore: highlight bar buttons according to open panel
Co-authored-by: Yohan Boniface <yohanboniface@free.fr>
2025-02-06 10:02:32 -05:00
Yohan Boniface
99db1c82f4 chore: move DrawToolbar and SettingsToolbar to bar.js module
This also:
- change the "set center and zoom" to be a panel instead of
  a direct action (including the "defaultView" setting
- refactor the "get started dialog"

This is a first step to remove our dependency to the unmaintained
Leaflet.Toolbar plugin.
2025-02-06 12:26:58 +01:00
Yohan Boniface
fe011d89e2
chore: use logging.debug instead of print for sync debugging (#2481)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
2025-02-05 19:59:59 +01:00
Yohan Boniface
3e4601c7a3 chore: use logging.debug instead of print for sync debugging 2025-02-05 09:57:58 +01:00
Yohan Boniface
e2ed239d23 chore: add very minimal documentation for deploying uMap with ASGI 2025-02-04 18:42:38 +01:00
Yohan Boniface
b35740b029
fix: error after deleting a path that was previously moved (#2479)
Some checks are pending
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
When moving a path, this will put a once time listener on "moveend". If
we delete this feature, and move the map, we should not execute the
event callback.

A better fix would be to cancel the event listener on delete, but that
is much more work given how we deal with Leaflet events right now.
2025-02-04 18:00:09 +01:00
Yohan Boniface
c985cb3de5 fix: error after deleting a path that was previously moved
When moving a path, this will put a once time listener on "moveend".
If we delete this feature, and move the map, we should not execute the
event callback.

A better fix would be to cancel the event listener on delete, but that
is much more work given how we deal with Leaflet events right now.
2025-02-04 17:40:49 +01:00
Yohan Boniface
4a82f587fa
chore: bump isort from 5.13.2 to 6.0.0 (#2472) 2025-02-04 16:55:57 +01:00
dependabot[bot]
ed9ae0590b
chore: bump isort from 5.13.2 to 6.0.0
Bumps [isort](https://github.com/pycqa/isort) from 5.13.2 to 6.0.0.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pycqa/isort/compare/5.13.2...6.0.0)

---
updated-dependencies:
- dependency-name: isort
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-04 15:38:50 +00:00
Yohan Boniface
a48513fcd7
chore: make redis python dep optional (#2470) 2025-02-04 16:38:24 +01:00
Yohan Boniface
4da5d2682a
chore: bump pymdown-extensions from 10.14.1 to 10.14.3 (#2474) 2025-02-04 16:37:45 +01:00
Yohan Boniface
79352d8a82 chore: use editable-edited event to sync changes
This is more unified between markers and paths, and it allows paths to
be synced as soon as they have been drawn (instead of when closing the
edit panel, which created a race condition when changing its properties
that were then synced to other while the feature itself was not).
2025-02-04 16:36:14 +01:00
dependabot[bot]
22293c8a44
chore: bump pymdown-extensions from 10.14.1 to 10.14.3
Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 10.14.1 to 10.14.3.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases)
- [Commits](https://github.com/facelessuser/pymdown-extensions/compare/10.14.1...10.14.3)

---
updated-dependencies:
- dependency-name: pymdown-extensions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-04 15:26:06 +00:00
Yohan Boniface
0dee5b1a3a
chore: bump mkdocs-static-i18n from 1.2.3 to 1.3.0 (#2475) 2025-02-04 16:24:44 +01:00
Yohan Boniface
97dadf0101
chore: bump pytest-playwright from 0.6.2 to 0.7.0 (#2473) 2025-02-04 16:24:07 +01:00
Yohan Boniface
22ca072364
chore: bump factory-boy from 3.3.1 to 3.3.3 (#2476) 2025-02-04 16:23:11 +01:00
Yohan Boniface
17be255ed6
fix: center "Plus" button (#2477)
Before:


![image](https://github.com/user-attachments/assets/916c6fc1-188c-442b-b364-772191531eed)

After:


![image](https://github.com/user-attachments/assets/8b07b624-b1d2-40fe-b940-20ec51cfa050)
2025-02-04 16:02:20 +01:00
Yohan Boniface
9606bd864b fix: center "Plus" button 2025-02-04 11:45:28 +01:00
David Larlet
57fa820875
docs-users: add an article in French
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
2025-02-03 13:56:24 -05:00
dependabot[bot]
9b29a2efde
chore: bump factory-boy from 3.3.1 to 3.3.3
Bumps [factory-boy](https://github.com/FactoryBoy/factory_boy) from 3.3.1 to 3.3.3.
- [Changelog](https://github.com/FactoryBoy/factory_boy/blob/master/docs/changelog.rst)
- [Commits](https://github.com/FactoryBoy/factory_boy/compare/3.3.1...3.3.3)

---
updated-dependencies:
- dependency-name: factory-boy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-03 17:18:19 +00:00
dependabot[bot]
7d1e5c676c
chore: bump mkdocs-static-i18n from 1.2.3 to 1.3.0
Bumps [mkdocs-static-i18n](https://github.com/ultrabug/mkdocs-static-i18n) from 1.2.3 to 1.3.0.
- [Changelog](https://github.com/ultrabug/mkdocs-static-i18n/blob/main/docs/changelog.md)
- [Commits](https://github.com/ultrabug/mkdocs-static-i18n/compare/1.2.3...1.3.0)

---
updated-dependencies:
- dependency-name: mkdocs-static-i18n
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-03 17:18:16 +00:00
dependabot[bot]
d024a22328
chore: bump pytest-playwright from 0.6.2 to 0.7.0
Bumps [pytest-playwright](https://github.com/microsoft/playwright-pytest) from 0.6.2 to 0.7.0.
- [Release notes](https://github.com/microsoft/playwright-pytest/releases)
- [Commits](https://github.com/microsoft/playwright-pytest/compare/v0.6.2...v0.7.0)

---
updated-dependencies:
- dependency-name: pytest-playwright
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-03 17:18:06 +00:00
Yohan Boniface
cc2f4ef81f
doc: add minimal documentation for nginx proxy (#2469)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
2025-02-01 06:34:19 +01:00
Yohan Boniface
432a0a182d i18n
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
2025-01-31 19:05:22 +01:00
Yohan Boniface
545770dfb9 chore: make redis python dep optional 2025-01-31 18:55:55 +01:00
Yohan Boniface
c5478fa8d3 2.9.0b0 2025-01-31 18:44:01 +01:00
Yohan Boniface
74f81f9894 i18n 2025-01-31 18:37:18 +01:00
Yohan Boniface
3a2dd4023b doc: add minimal documentation for nginx proxy 2025-01-31 18:26:35 +01:00
Yohan Boniface
1f66377104 fix: show user URL in remote data loading error
Instead of the proxied one, which is less readable and actionable for
the user reading the alert message.
2025-01-31 18:25:20 +01:00
Yohan Boniface
a442e56cbc fixup: use correct delete function for DataLayer
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
2025-01-31 17:28:09 +01:00
Yohan Boniface
718cc919f8
fix: do not try to backup an undefined geojson (#2468)
This occurs when a remote data returns an invalid geojson.
2025-01-31 17:18:43 +01:00
Yohan Boniface
aa25398a62
feat: display a more descriptive alert on invalid geojson error (#2466) 2025-01-31 17:16:44 +01:00
Yohan Boniface
18ff0de872
fix: clear previous alert timeout when opening a new alert (#2467)
Otherwise, when an infinite alert replace an alert with a finite
duration, this first alert timeout will close the second alert.
2025-01-31 17:16:27 +01:00
Yohan Boniface
1d6e74e1d2
fix: only allow to set a map as sync when it is already saved (#2465) 2025-01-31 17:10:22 +01:00
Yohan Boniface
37ecea0799 feat: display a more descriptive alert on invalid geojson error
Co-authored-by: David Larlet <david@larlet.fr>
2025-01-31 17:08:35 +01:00
Yohan Boniface
e38e0f162c fix: do not try to backup an undefined geojson
This occurs when a remote data returns an invalid geojson.

Co-authored-by: David Larlet <david@larlet.fr>
2025-01-31 16:47:17 +01:00
Yohan Boniface
bcd69ccb47 fix: clear previous alert timeout when opening a new alert
Otherwise, when an infinite alert replace an alert with a finite duration,
this first alert timeout will close the second alert.

Co-authored-by: David Larlet <david@larlet.fr>
2025-01-31 16:42:38 +01:00
Yohan Boniface
2162aaf930 fix: only allow to set a map as sync when it is already saved 2025-01-31 15:45:55 +01:00
Yohan Boniface
3e9982c8cb
Sync show usernames (#2444)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
fix #2267
2025-01-31 06:56:46 +01:00
David Larlet
1eb1f320db
chore: iterate on tooltips design 2025-01-30 14:15:56 -05:00
Yohan Boniface
48f4daf419
fix: catch cluster error at zoom in certain situation (#2464)
Some checks are pending
Test & Docs / docs (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Eg. to reproduce: a map with a limitBounds that makes uMap immediately
zoom to fit the bbox.
2025-01-30 18:49:19 +01:00
Yohan Boniface
a18b240c65 fix: catch cluster error at zoom in certain situation
Eg. to reproduce: a map with a limitBounds that makes uMap immediately
zoom to fit the bbox.

Co-authored-by: David Larlet <david@larlet.fr>
2025-01-30 18:40:05 +01:00
David Larlet
e6db23d4d3
fix: better buttons positionning for the homepage (#2463) 2025-01-30 11:35:40 -05:00
Yohan Boniface
5ae83a571b
feat: add DEPRECATED_AUTHENTICATION_PROVIDERS setting (#2461)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
![image](https://github.com/user-attachments/assets/00a55dfa-2e41-40bf-a6aa-bf70903645e4)
2025-01-30 17:15:53 +01:00
Yohan Boniface
be1fa55e9b
fix: allow to set choices for a nullablechoices field (#2462)
fix #2380
2025-01-30 17:14:27 +01:00
David Larlet
ac607370d0
a11y: include site description within page titles (#2455)
This is not the same as the short `SITE_NAME` which is displayed as the
title of the (home)page for instance.

The plan is to set `SITE_DESCRIPTION` as `uMap OpenStreetMap` for the
OSM instance and `uMap agents publics` for the ANCT one.
2025-01-30 10:45:22 -05:00
David Larlet
44aa914658
a11y: include site description within page titles
This is not the same as the short SITE_NAME which is displayed as the title of the (home)page for instance.
2025-01-30 10:36:31 -05:00
David Larlet
0e5cdec97e
fix: better buttons positionning for the homepage 2025-01-30 10:16:09 -05:00
Yohan Boniface
c27e675152 fix: allow to set choices for a nullablechoices field
fix #2380
2025-01-30 14:55:11 +01:00
Yohan Boniface
ee1a87cdeb feat: add DEPRECATED_AUTHENTICATION_PROVIDERS setting 2025-01-30 11:04:02 +01:00
Yohan Boniface
96895feea0
fix: display current configured oauth as icon instead of text (#2375)
Before:


![image](https://github.com/user-attachments/assets/b71d78c0-2a11-4d2e-adf5-2f23ccfd6b2e)


After:


![image](https://github.com/user-attachments/assets/35d3494c-275a-42b6-b646-6e025b03d7c5)
2025-01-30 11:03:21 +01:00
Yohan Boniface
359b0b41ca chore: make djlint happy 2025-01-30 09:45:56 +01:00
Yohan Boniface
3aa42d6f0f
feat: soft delete datalayers (#2459)
When deleting a datalayer, it will now be moved to a state "deleted",
and it will only be deleted for real when running the command `umap
empty_trash`.

This is what we already do for the map itself, but until now if a user
deleted a only a datalayer by mistake (not the map itself) it could not
retrieve it.
2025-01-30 09:19:58 +01:00
Yohan Boniface
5ab11428a5
fix: correctly parse http link including another http link in the path (#2460)
Some checks are pending
Test & Docs / docs (push) Waiting to run
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
fix #2457

Thoughts @jschleic ?
2025-01-30 09:12:05 +01:00
Yohan Boniface
f0751ec5dd fix: correctly parse http link including another http link in the path
fix #2457
2025-01-29 20:23:43 +01:00
Yohan Boniface
fd8a1971f8 feat: soft delete datalayers
When deleting a datalayer, it will now be moved to a state "deleted", and
it will only be deleted for real when running the command `umap empty_trash`.

This is what we already do for the map itself, but until now if a user
deleted a only a datalayer by mistake (not the map itself) it could not retrieve
it.
2025-01-29 19:08:59 +01:00
Oscar Hemelaar
8f3f67588a
chore: deploy charts to repository under github pages 2025-01-29 16:22:25 +01:00
Oscar Hemelaar
e97b619da8
feat: allow configuring env and conf using existing secret
useful for when the secret is created out of band using a vault api for
example
2025-01-29 15:49:05 +01:00
Yohan Boniface
3b9a0c0951
chore: bump ruff from 0.9.2 to 0.9.3 (#2451)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
2025-01-27 19:05:20 +01:00
Yohan Boniface
a3baf82b7b chore(templates): use images for oauth providers list
Co-authored-by: David Larlet <david@larlet.fr>
2025-01-27 19:04:13 +01:00
Yohan Boniface
70f87d8636 feat: add "accent" mode for tooltip, and use it for peers list
Co-authored-by: David Larlet <david@larlet.fr>
2025-01-27 18:43:36 +01:00
Yohan Boniface
cb5e13b218
chore: bump django-environ from 0.11.2 to 0.12.0 (#2454) 2025-01-27 18:41:12 +01:00
Yohan Boniface
c42a2b7129
chore: bump psycopg from 3.2.3 to 3.2.4 (#2453) 2025-01-27 18:40:55 +01:00
Yohan Boniface
2482111d24
chore: bump pydantic from 2.10.5 to 2.10.6 (#2450) 2025-01-27 18:40:31 +01:00
Yohan Boniface
bcd21d3697
feat(forms): add a debounce for Input and Textarea fields (#2445)
fix #2415

I'm a bit afraid this will add more hiccup to the playwright tests,
tough :(
2025-01-27 18:40:11 +01:00
Yohan Boniface
b6b47cc0d0
chore: bump pymdown-extensions from 10.14 to 10.14.1 (#2452) 2025-01-27 18:39:50 +01:00
dependabot[bot]
cb4ea1b1d2
chore: bump django-environ from 0.11.2 to 0.12.0
Bumps [django-environ](https://github.com/joke2k/django-environ) from 0.11.2 to 0.12.0.
- [Release notes](https://github.com/joke2k/django-environ/releases)
- [Changelog](https://github.com/joke2k/django-environ/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/joke2k/django-environ/compare/v0.11.2...v0.12.0)

---
updated-dependencies:
- dependency-name: django-environ
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-27 17:32:18 +00:00
dependabot[bot]
99fff916d5
chore: bump psycopg from 3.2.3 to 3.2.4
Bumps [psycopg](https://github.com/psycopg/psycopg) from 3.2.3 to 3.2.4.
- [Changelog](https://github.com/psycopg/psycopg/blob/master/docs/news.rst)
- [Commits](https://github.com/psycopg/psycopg/compare/3.2.3...3.2.4)

---
updated-dependencies:
- dependency-name: psycopg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-27 17:31:06 +00:00
dependabot[bot]
151beb6d4c
chore: bump pymdown-extensions from 10.14 to 10.14.1
Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 10.14 to 10.14.1.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases)
- [Commits](https://github.com/facelessuser/pymdown-extensions/compare/10.14...10.14.1)

---
updated-dependencies:
- dependency-name: pymdown-extensions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-27 17:30:59 +00:00
dependabot[bot]
fe40effaaa
chore: bump ruff from 0.9.2 to 0.9.3
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.9.2 to 0.9.3.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.9.2...0.9.3)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-27 17:30:53 +00:00
dependabot[bot]
0e1fa6965d
chore: bump pydantic from 2.10.5 to 2.10.6
Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.10.5 to 2.10.6.
- [Release notes](https://github.com/pydantic/pydantic/releases)
- [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md)
- [Commits](https://github.com/pydantic/pydantic/compare/v2.10.5...v2.10.6)

---
updated-dependencies:
- dependency-name: pydantic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-27 17:30:34 +00:00
Yohan Boniface
49ea7ed4a5 feat(forms): add a debounce for Input and Textarea fields
fix #2415
2025-01-27 17:25:56 +01:00
Yohan Boniface
d20943a487
feat: move star button to caption (#2442)
fix #2282


![image](https://github.com/user-attachments/assets/45fda270-035b-4ec2-9ac1-3e2f2798663b)
![Screenshot From 2025-01-23
10-42-23](https://github.com/user-attachments/assets/ef323c82-bb12-41ef-97e6-b21dfeef01ba)
2025-01-27 17:18:28 +01:00
Yohan Boniface
250579eaa2 chore: better styling for star button in caption panel
Co-authored-by: David Larlet <david@larlet.fr>
2025-01-27 16:50:27 +01:00
Yohan Boniface
60918e6ca5
wip(sync): POC of using Redis for pubsub (#2426)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
## TODO

- [x] add expire to peers registry hash in redis, as for now when the
server closes the connection we have extra users (edit: we cleaned
manually, as HEXPIRE is not available in FOSS version of Redis)
- [x] make that the peer uuid is created by the client, so when it
reconnects, it uses the same, and does not create a new one
- [ ] see if we can use a connection_pool
- [x] use dynamic websocket_uri (that must include the map id)
- [x] integrate Redis in playwright tests
2025-01-27 15:58:30 +01:00
David Larlet
088f682247
fix(helm): reference secret-env by fullname instead release-name (#2406)
Related to helm Charts:
Currently the reference to secret is done by
```          
envFrom:
- secretRef:
  name: {{ .Release.Name }}-env
```

[Link](https://github.com/umap-project/umap/blob/master/charts/umap/templates/deployment.yaml#L67C1-L69C44)

but secret object is created like this:
```
metadata:
  name: {{ include "umap.fullname" . }}-env
```

[Link](https://github.com/umap-project/umap/blob/master/charts/umap/templates/secret-env.yaml#L4C3-L4C4)

Works as long as no Sub-Chart feature is used, when individual
configuration is stored within a git repo.
Then the subchart name is added to fullname. (And I think if custom
fullName is set)

To be safe, `{{ include "umap.fullname" . }}` is correct. 

Should be no breaking change, when it is working at the moment. (Because
then both return same value)
It is only a breaking change, if it is not working at the moment.
2025-01-27 09:56:29 -05:00
Yohan Boniface
d4afd5646f
feat: allow to define sortKey at layer level (#2449)
In some situation, we do not want the same sortKey for each layer.
2025-01-27 10:08:53 +01:00
Yohan Boniface
a2936d74de
Fix categorized layers colors palette not updating (#2447)
Some checks are pending
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
fix #2446 

A bunch of small commits, but real fixes are:
29d70552dd
and
d5efe6b8e2
and
8f2bbc6765
2025-01-26 22:21:39 +01:00
Yohan Boniface
485bd94531 feat: allow to define sortKey at layer level
In some situation, we do not want the same sortKey for each layer.
2025-01-26 22:20:19 +01:00
Yohan Boniface
8603774778 chore: do not use hx for non structural headings 2025-01-24 18:52:24 +01:00
Yohan Boniface
8f2bbc6765 fix: re-compute layer settings when type changed 2025-01-24 18:24:33 +01:00
Yohan Boniface
d5efe6b8e2 fix: get COLORS from Utils now that it has been moved there 2025-01-24 18:23:41 +01:00
Yohan Boniface
8111cf5522 fix: add a label for default colors scheme in categorized layer type 2025-01-24 18:22:33 +01:00
Yohan Boniface
609b251303 chore: use datalayer.allProperties() instead of private property 2025-01-24 18:21:29 +01:00
Yohan Boniface
29d70552dd fix: always index properties when feature properties as changed
We want the datalayer index properties to be updated when a user set
a property on the feature, as this property name may not yet be in the
index (which is used later for autocomplete, select…).
2025-01-24 18:19:57 +01:00
Yohan Boniface
1d47bfce0a chore: add redis port in Github workflow 2025-01-24 10:13:00 +01:00
Yohan Boniface
ea2bdba270
fix: display a more usefull message when error in remote data (#2443)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
fix #2379

![Screenshot From 2025-01-23
11-54-29](https://github.com/user-attachments/assets/b2000003-b9c3-404f-be91-0a9b13f512c2)
2025-01-24 09:09:14 +01:00
Yohan Boniface
22846acb99
fix: fix circle icon no longer hihlighted (#2440)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
fix #2429
2025-01-23 18:30:23 +01:00
Yohan Boniface
693e775ca8
fix: keep layer visibility after clicking on toggle all (#2439)
fix #2430

Not exactly sure how to make this DRY. What we want is to mark the layer
visibility as "controlled by user" as soon as they click on a
show/hide/showAll/hideAll button, so we do not try to infer the
visibility from the from/toZoom settings.
2025-01-23 18:29:37 +01:00
Yohan Boniface
62be6450bb feat(sync): show a very minimal list of connected peers
cf #2267

Co-authored-by: David Larlet <david@larlet.fr>
2025-01-23 18:27:47 +01:00
Yohan Boniface
3e3ce0b8f5 fix: better computation of tooltip bottom position
Co-authored-by: David Larlet <david@larlet.fr>
2025-01-23 18:08:04 +01:00
Yohan Boniface
b62085b7aa chore: add REDIS_HOST and REDIS_PORT env vars in CI 2025-01-23 18:02:28 +01:00
Yohan Boniface
222213ec87 fix(sync): add python redis package
Co-authored-by: David Larlet <david@larlet.fr>
2025-01-23 17:26:39 +01:00
Yohan Boniface
476c160fd5 wip(sync): clean stale username from redis
We wanted to use the HEXPIRE command, but discovered that this command
is only available since the Redis 7.4 version (the latest), and this version
does not have an OSI compliant licence, so it is generally not installable
through common packages managers. The OSS fork is Valkey, but it still does
not have the HEXPIRE command.

So we decide to clean those keys manually, and in order no do this clean
task at each websocket connection, we only do it when we are the first user
to connect to a given map.

Co-authored-by: David Larlet <david@larlet.fr>
2025-01-23 17:20:21 +01:00
Yohan Boniface
0d5e3047f4 wip(sync): only return peers with an active connection 2025-01-23 17:20:21 +01:00
Yohan Boniface
11fb29c456 wip(sync): log but do not crash when sending fail
This should be a race condition when sending to a closed websocket. Let's
log to track them.
2025-01-23 17:20:21 +01:00
Yohan Boniface
ef7c769abe wip(sync): remove a bit of server prints 2025-01-23 17:20:21 +01:00
Yohan Boniface
82342ea00f wip(sync): try a better pattern to unsubscribe to pubsub channels
When publishing a "STOP", this would unsubscribe every listener of the
channel.
2025-01-23 17:20:21 +01:00
Yohan Boniface
7e42331533 wip(sync): add Redis to CI and configure tests settings 2025-01-23 17:20:21 +01:00
Yohan Boniface
a07ee482ce wip(sync): use our async_live_server for websocket related PW tests
As now both http and ws are on the same domain, let's use one test server
able to serve both.

Co-authored-by: David Larlet <david@larlet.fr>
2025-01-23 17:20:20 +01:00
Yohan Boniface
1bf100d7a8 wip(sync): make the client set its peer id 2025-01-23 17:17:16 +01:00
Yohan Boniface
36d9e9bf06 wip(sync): use the correct URL for websocket
Co-authored-by: David Larlet <david@larlet.fr>
2025-01-23 17:17:16 +01:00
Yohan Boniface
acb2e967b8 wip(sync): POC of using Redis for pubsub
Co-authored-by: David Larlet <david@larlet.fr>
2025-01-23 17:17:16 +01:00
Yohan Boniface
ab7119e0a4 wip(sync): use Daphne as live_server for tests
Also clean dependencies.

We still use the channels live server for our tests, but do not use it
anymore for the actual websocket handling.
2025-01-23 17:17:13 +01:00
Yohan Boniface
460a0c9997 wip(sync): only open listen connections after authentication 2025-01-23 17:16:44 +01:00
Yohan Boniface
698c74b427 wip(sync): only save Peer after authentication 2025-01-23 17:16:44 +01:00
Yohan Boniface
a29eae138e wip(sync): websocket server with ASGI and PostgreSQL LISTEN/NOTIFY 2025-01-23 17:16:44 +01:00
Yohan Boniface
31546d6ff4 wip(sync): use django-channels to serve websockets
Co-authored-by: David Larlet <david@larlet.fr>
2025-01-23 17:16:44 +01:00
Yohan Boniface
83c3a41be5 fix: display a more usefull message when error in remote data
fix #2379
2025-01-23 12:04:25 +01:00
Yohan Boniface
48f9afdedd feat: move star button to caption
fix #2282
2025-01-23 11:25:09 +01:00
Yohan Boniface
8a207afaea
fix: do not consume ctrl-Z in textarea or input (#2441)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
fix #2422
2025-01-22 10:40:26 +01:00
Yohan Boniface
122d470e31 fix: do not consume ctrl-Z in textarea or input
fix #2422
2025-01-21 18:19:16 +01:00
Yohan Boniface
e7388f6cb0
chore: bump pymdown-extensions from 10.13 to 10.14 (#2435)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
2025-01-21 18:02:24 +01:00
Yohan Boniface
44dbf2f0df fix: fix circle icon no longer hihlighted
fix #2429
2025-01-21 11:46:57 +01:00
Yohan Boniface
f3b11b03bc fix: keep layer visibility after clicking on toggle all
fix #2430

Not exactly sure how to make this DRY. What we want is to mark the
layer visibility as "controlled by user" as soon as they click on a
show/hide/showAll/hideAll button, so we do not try to infer the
visibility from the from/toZoom settings.
2025-01-21 11:33:08 +01:00
dependabot[bot]
bb7cc86538
chore: bump pymdown-extensions from 10.13 to 10.14
Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 10.13 to 10.14.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases)
- [Commits](https://github.com/facelessuser/pymdown-extensions/compare/10.13...10.14)

---
updated-dependencies:
- dependency-name: pymdown-extensions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-21 09:53:57 +00:00
Yohan Boniface
30690bcb35
chore: bump mkdocs-material from 9.5.49 to 9.5.50 (#2433)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
2025-01-21 10:52:54 +01:00
dependabot[bot]
f7c9c469d1
chore: bump mkdocs-material from 9.5.49 to 9.5.50
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.49 to 9.5.50.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.5.49...9.5.50)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-20 21:33:09 +00:00
Yohan Boniface
3c38a5e55e
chore: bump moto[s3] from 5.0.25 to 5.0.27 (#2436)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
2025-01-20 22:32:28 +01:00
Yohan Boniface
4430bddcc9
chore: bump ruff from 0.9.1 to 0.9.2 (#2434) 2025-01-20 22:32:06 +01:00
dependabot[bot]
9ba5dda507
chore: bump ruff from 0.9.1 to 0.9.2
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.9.1 to 0.9.2.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.9.1...0.9.2)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-20 20:36:06 +00:00
dependabot[bot]
b15e333f6c
chore: bump moto[s3] from 5.0.25 to 5.0.27
Bumps [moto[s3]](https://github.com/getmoto/moto) from 5.0.25 to 5.0.27.
- [Release notes](https://github.com/getmoto/moto/releases)
- [Changelog](https://github.com/getmoto/moto/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getmoto/moto/compare/5.0.25...5.0.27)

---
updated-dependencies:
- dependency-name: moto[s3]
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-20 20:35:47 +00:00
Yohan Boniface
4ce8f6515d
fix: test failing due to unstable FS ordering between OS (#2438) 2025-01-20 21:34:28 +01:00
Yohan Boniface
dc5a3a6b62 fix: test failing due to unstable FS ordering between OS 2025-01-20 21:12:06 +01:00
David Larlet
2ff2ee29ed
chore: bump pillow from 11.0.0 to 11.1.0 (#2417)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
2025-01-16 10:01:25 -05:00
David Larlet
02afc783cf
chore: bump django from 5.1.4 to 5.1.5 (#2432) 2025-01-16 10:00:56 -05:00
dependabot[bot]
f3fc24addf
chore: bump django from 5.1.4 to 5.1.5
Bumps [django](https://github.com/django/django) from 5.1.4 to 5.1.5.
- [Commits](https://github.com/django/django/compare/5.1.4...5.1.5)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-16 14:52:18 +00:00
David Larlet
2beeda3c2f
chore: bump pydantic from 2.10.4 to 2.10.5 (#2427) 2025-01-16 09:51:48 -05:00
David Larlet
ac6e9a1021
chore: bump ruff from 0.8.4 to 0.9.1 (#2428) 2025-01-16 09:51:22 -05:00
dependabot[bot]
2428b0fd47
chore: bump ruff from 0.8.4 to 0.9.1
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.8.4 to 0.9.1.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.8.4...0.9.1)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-13 17:24:40 +00:00
dependabot[bot]
20a1cf0c55
chore: bump pydantic from 2.10.4 to 2.10.5
Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.10.4 to 2.10.5.
- [Release notes](https://github.com/pydantic/pydantic/releases)
- [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md)
- [Commits](https://github.com/pydantic/pydantic/compare/v2.10.4...v2.10.5)

---
updated-dependencies:
- dependency-name: pydantic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-13 17:24:27 +00:00
Yohan Boniface
f53d435dfd
chore: internalize FormBuilder (#2420)
Some checks failed
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
fix #2280 

That's a first step, which:
- internalize Formbuilder as a bunch of modules
- use Javascript classes instead of Leaflet ones
- remove dependencies to Leaflet (L.DomUtil…)
- replaces `L.FormBuilder` by `Form` (in theory generic, but not quite)
and `U.FormBuilder` by `MutatingForm` (knows about isDirty,
`inheritable` and such)

There is much more room for refactor, but let's do it step by step!
2025-01-11 14:29:55 +01:00
Yohan Boniface
07c29abbec chore(utils): use native events instead of array of callbacks for WithEvents
Co-authored-by: David Larlet <david@larlet.fr>
2025-01-10 16:44:48 +01:00
Yohan Boniface
86a8e17aec
fix(sync): handle sync of datalayer delete (#2416)
Some checks are pending
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
fix #2268

There is a tricky choice to do: the delete actually occurs in two
times, first the datalayer is hidden from the UI and set as "deleted"
(this can then be undone) then at next "save" it will totally removed.

When syncing, given we removed the "reset/undo" feature for now, and
because it was simpler, I decide to do both step in once.

When working on a proper "undo/redo", we may challenge this choice
again.
2025-01-10 16:34:47 +01:00
Yohan Boniface
75af1a4855 fix(sync): handle sync of datalayer delete
fix #2268

There is a tricky choice to do: the delete actually occurs in two
times, first the datalayer is hidden from the UI and set as "deleted"
(this can then be undone) then at next "save" it will totally removed.

When syncing, given we removed the "reset/undo" feature for now, and
because it was simpler, I decide to do both step in once.

When working on a proper "undo/redo", we may challenge this choice
again.
2025-01-10 16:33:46 +01:00
Yohan Boniface
0c52c35ae3 chore(tests): use name from data when defined in DataLayerFactory 2025-01-10 16:33:06 +01:00
Yohan Boniface
49cde00361
feat: display map's "created at" and "modified at" in the caption (#2424)
fix #2110 


![image](https://github.com/user-attachments/assets/a7db6197-4cc6-417e-b480-8e1434d73687)
2025-01-10 16:23:42 +01:00
Yohan Boniface
7072b5434a
fix: update map.modified_at when saving a datalayer (#2423)
fix #2421
2025-01-10 15:51:39 +01:00
Yohan Boniface
e7fe92c070 feat: display map's "created at" and "modified at" in the caption 2025-01-10 15:49:05 +01:00
Yohan Boniface
92b7be3ad9 fix: update map.modified_at when saving a datalayer
fix #2421
2025-01-10 12:01:13 +01:00
Yohan Boniface
0ba69e41d0 wip(forms): use events instead of callback 2025-01-09 13:02:04 +01:00
Yohan Boniface
fb4fecd337 chore(tests): fix sync tests 2025-01-09 13:00:59 +01:00
Yohan Boniface
b6c8d64c47 chore(forms): remove duplicate NullableBoolean field 2025-01-08 16:15:27 +01:00
Yohan Boniface
63e84d94c4 chore(forms): refactor icon preview of IconURL field 2025-01-08 16:14:36 +01:00
Yohan Boniface
176b8bdbcc wip(forms): refactor forms templating 2025-01-07 18:08:48 +01:00
Yohan Boniface
e0fadea749 chore: remove Leaflet dependency from form modules 2025-01-07 18:07:14 +01:00
Yohan Boniface
b88a0cc49f wip: internalize FormBuilder and move to module 2025-01-07 18:07:14 +01:00
dependabot[bot]
910995291d
chore: bump pillow from 11.0.0 to 11.1.0
Bumps [pillow](https://github.com/python-pillow/Pillow) from 11.0.0 to 11.1.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/11.0.0...11.1.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-06 17:33:24 +00:00
Yohan Boniface
a7325dcb02
chore: bump mkdocs-material from 9.5.48 to 9.5.49 (#2411)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
2025-01-03 16:45:14 +01:00
Yohan Boniface
f69a3e18b7
chore: bump moto[s3] from 5.0.24 to 5.0.25 (#2410) 2025-01-03 16:44:54 +01:00
Yohan Boniface
c482a84abb
chore: bump pydantic from 2.10.3 to 2.10.4 (#2408) 2025-01-03 16:44:37 +01:00
Yohan Boniface
d79686cb31
chore: bump djlint from 1.36.3 to 1.36.4 (#2409) 2025-01-03 16:44:18 +01:00
Yohan Boniface
ebae9a8cd0
fix(sync): do not try to reconnect after end edit (#2412)
Some checks failed
Test & Docs / docs (push) Has been cancelled
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
We now set the "closeRequested" on the receiver itself, otherwise there
is a race condition between the reconnect (which create a new transport)
and the onclose checking closeRequest on an old transport.
2025-01-01 11:31:32 +01:00
Yohan Boniface
4164db357e
fix(sync): deactivate cancel and hide button when sync is active (#2413)
fix #2265

Let's reactivate when we have a proper undo-redo (cf #1107)
2025-01-01 11:31:14 +01:00
Yohan Boniface
ddeebd758c fix(sync): deactivate cancel and hide button when sync is active
cf #2265

Let's reactivate when we have a proper undo-redo (cf #1107)
2024-12-31 14:23:57 +01:00
Yohan Boniface
424cb70ac4 fix(sync): do not try to reconnect after end edit
We now save the "closeRequested" on the receiver itself, other wise
there is a race condition between the reconnect (which create a new
transport) and the onclose checking closeRequest on an old transport.
2024-12-31 14:17:30 +01:00
dependabot[bot]
7344c60baa
chore: bump mkdocs-material from 9.5.48 to 9.5.49
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.48 to 9.5.49.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.5.48...9.5.49)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-30 17:39:36 +00:00
dependabot[bot]
5b5931dadb
chore: bump moto[s3] from 5.0.24 to 5.0.25
Bumps [moto[s3]](https://github.com/getmoto/moto) from 5.0.24 to 5.0.25.
- [Release notes](https://github.com/getmoto/moto/releases)
- [Changelog](https://github.com/getmoto/moto/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getmoto/moto/compare/5.0.24...5.0.25)

---
updated-dependencies:
- dependency-name: moto[s3]
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-30 17:39:25 +00:00
dependabot[bot]
6c6698966d
chore: bump djlint from 1.36.3 to 1.36.4
Bumps [djlint](https://github.com/djlint/djLint) from 1.36.3 to 1.36.4.
- [Release notes](https://github.com/djlint/djLint/releases)
- [Changelog](https://github.com/djlint/djLint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/djlint/djLint/compare/v1.36.3...v1.36.4)

---
updated-dependencies:
- dependency-name: djlint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-30 17:39:18 +00:00
dependabot[bot]
2b6ae7227e
chore: bump pydantic from 2.10.3 to 2.10.4
Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.10.3 to 2.10.4.
- [Release notes](https://github.com/pydantic/pydantic/releases)
- [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md)
- [Commits](https://github.com/pydantic/pydantic/compare/v2.10.3...v2.10.4)

---
updated-dependencies:
- dependency-name: pydantic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-30 17:39:13 +00:00
Stefan Warnat
d4df6aaae5
fix: Update ConfigMap reference name to fullname 2024-12-29 17:59:41 +01:00
Stefan Warnat
ed5e0c6aad
fix: reference secret-env by fullname instead release-name 2024-12-29 17:24:49 +01:00
Yohan Boniface
eb50d8adf4 2.8.2
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
2024-12-26 11:24:46 +01:00
Yohan Boniface
7d7ff7066e i18n 2024-12-26 11:23:28 +01:00
Yohan Boniface
48ae4123ec
fix: fix startMarker/Polyline/Polygon on right click (#2403)
fix #2392
2024-12-26 11:02:48 +01:00
Yohan Boniface
da78ac0919
fix: fix create marker from search result (#2404)
cf
https://github.com/umap-project/umap/issues/2392#issuecomment-2561151836
2024-12-26 11:02:38 +01:00
Yohan Boniface
f4cb3509b0 fix: fix create marker from search result
cf https://github.com/umap-project/umap/issues/2392#issuecomment-2561151836
2024-12-25 19:36:53 +01:00
Yohan Boniface
ed33b1611a fix: fix startMarker/Polyline/Polygon on right click
fix #2392
2024-12-25 19:33:35 +01:00
Yohan Boniface
52785e22ad 2.8.1
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
2024-12-24 09:56:52 +01:00
Yohan Boniface
5dd56a93d6 i18n 2024-12-24 09:47:03 +01:00
David Larlet
18c8258f2c
wip: add a 403.html template (#2396)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
fix #2390
2024-12-23 13:36:18 -05:00
David Larlet
a62bcf6d57
fix: do not load all datalayers at once (#2402)
Some maps have dozens, even hundreds of layers
2024-12-23 13:36:04 -05:00
David Larlet
56fe937e60
chore: bump ruff from 0.8.2 to 0.8.4 (#2400) 2024-12-23 13:19:40 -05:00
David Larlet
f97e8b7691
Merge branch 'master' into dependabot/pip/ruff-0.8.4 2024-12-23 13:19:30 -05:00
David Larlet
f840ac8ea4
chore: bump moto[s3] from 5.0.21 to 5.0.24 (#2397) 2024-12-23 13:18:43 -05:00
David Larlet
6c323b7c05
chore: bump hatch from 1.13.0 to 1.14.0 (#2398) 2024-12-23 13:18:21 -05:00
David Larlet
31f07b4492
chore: bump pymdown-extensions from 10.12 to 10.13 (#2399)
Bumps
[pymdown-extensions](https://github.com/facelessuser/pymdown-extensions)
from 10.12 to 10.13.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/facelessuser/pymdown-extensions/releases">pymdown-extensions's
releases</a>.</em></p>
<blockquote>
<h2>10.13</h2>
<ul>
<li><strong>NEW</strong>: Snippets: Allow multiple line numbers or line
number blocks separated by <code>,</code>.</li>
<li><strong>NEW</strong>: Snippets: Allow using a negative index for
number start indexes and end indexes. Negative indexes are converted to
positive indexes based on the number of lines in the snippet.</li>
<li><strong>FIX</strong>: Snippets: Properly capture empty newline at
end of file.</li>
<li><strong>FIX</strong>: Snippets: Fix issue where when non sections of
files are included, section labels are not stripped.</li>
<li><strong>FIX</strong>: BetterEm: Fixes for complex cases.</li>
<li><strong>FIX</strong>: Blocks: More consistent handling of empty
newlines in block processor extensions.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="36858c6b85"><code>36858c6</code></a>
Mention negative indexing in Snippets documentation</li>
<li><a
href="271950fb0d"><code>271950f</code></a>
More consistent newline handling in blocks extensions (<a
href="https://redirect.github.com/facelessuser/pymdown-extensions/issues/2553">#2553</a>)</li>
<li><a
href="9e26f64ee5"><code>9e26f64</code></a>
Allow negative indexes (<a
href="https://redirect.github.com/facelessuser/pymdown-extensions/issues/2552">#2552</a>)</li>
<li><a
href="1789d6094e"><code>1789d60</code></a>
Docs: Update JS deps</li>
<li><a
href="55ccf795df"><code>55ccf79</code></a>
Allow specifying multiple line selection blocks (<a
href="https://redirect.github.com/facelessuser/pymdown-extensions/issues/2551">#2551</a>)</li>
<li><a
href="f6102ac0dc"><code>f6102ac</code></a>
Fix some complex cases in BetterEm (<a
href="https://redirect.github.com/facelessuser/pymdown-extensions/issues/2547">#2547</a>)</li>
<li><a
href="9df48dbc84"><code>9df48db</code></a>
Strip sections from included file (<a
href="https://redirect.github.com/facelessuser/pymdown-extensions/issues/2541">#2541</a>)</li>
<li><a
href="377e8ff46d"><code>377e8ff</code></a>
Correctly document StripHTML defaults (<a
href="https://redirect.github.com/facelessuser/pymdown-extensions/issues/2535">#2535</a>)</li>
<li><a
href="68c70f9d12"><code>68c70f9</code></a>
Fix broken link to options in block-caption plugin page (<a
href="https://redirect.github.com/facelessuser/pymdown-extensions/issues/2533">#2533</a>)</li>
<li>See full diff in <a
href="https://github.com/facelessuser/pymdown-extensions/compare/10.12...10.13">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pymdown-extensions&package-manager=pip&previous-version=10.12&new-version=10.13)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2024-12-23 13:17:57 -05:00
David Larlet
d105f94c69
fix: zoom to droped file once loaded (#2401) 2024-12-23 13:16:57 -05:00
David Larlet
76cad4a24b
chore: lint python imports 2024-12-23 13:16:11 -05:00
Yohan Boniface
f7b4cb252d fix: do not load all datalayers at once
Some maps have dozens, even hundreds of layers

Co-authored-by: David Larlet <david@larlet.fr>
2024-12-23 19:16:09 +01:00
David Larlet
dc85b2461f
chore: lint templates 2024-12-23 12:29:35 -05:00
David Larlet
4cc8ae3d1f
chore: extract DropControl to a module 2024-12-23 12:26:40 -05:00
dependabot[bot]
46ad3f9b78
chore: bump ruff from 0.8.2 to 0.8.4
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.8.2 to 0.8.4.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.8.2...0.8.4)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-23 17:25:38 +00:00
dependabot[bot]
e7b776d44d
chore: bump pymdown-extensions from 10.12 to 10.13
Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 10.12 to 10.13.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases)
- [Commits](https://github.com/facelessuser/pymdown-extensions/compare/10.12...10.13)

---
updated-dependencies:
- dependency-name: pymdown-extensions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-23 17:25:21 +00:00
dependabot[bot]
8e9eaa5e3e
chore: bump hatch from 1.13.0 to 1.14.0
Bumps [hatch](https://github.com/pypa/hatch) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/pypa/hatch/releases)
- [Commits](https://github.com/pypa/hatch/compare/hatch-v1.13.0...hatch-v1.14.0)

---
updated-dependencies:
- dependency-name: hatch
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-23 17:25:17 +00:00
dependabot[bot]
35ef460640
chore: bump moto[s3] from 5.0.21 to 5.0.24
Bumps [moto[s3]](https://github.com/getmoto/moto) from 5.0.21 to 5.0.24.
- [Release notes](https://github.com/getmoto/moto/releases)
- [Changelog](https://github.com/getmoto/moto/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getmoto/moto/compare/5.0.21...5.0.24)

---
updated-dependencies:
- dependency-name: moto[s3]
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-23 17:25:11 +00:00
David Larlet
3fff54baab
fix: zoom to droped file once loaded 2024-12-23 12:09:16 -05:00
David Larlet
64ad6f0273
docs: faq entry for map permissions and translation
Co-authored-by: Yohan Boniface <yohanboniface@free.fr>
2024-12-23 11:40:31 -05:00
David Larlet
f69e8217cb
chore: better wording and style for the 403 page 2024-12-23 10:44:34 -05:00
David Larlet
e314fa18ad
chore: optimize logocyan’s SVG code
With https://jakearchibald.github.io/svgomg/
2024-12-23 10:33:15 -05:00
David Larlet
aedc26fe6d
docs: add English documentation for map statuses
Refs #2390
2024-12-23 10:28:24 -05:00
Yohan Boniface
ddddf4ece3 wip: add a 403.html template 2024-12-23 15:58:11 +01:00
David Larlet
49d1dbf36e
fix(#2391): split zoomTo to accept bounds (#2394)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
Since
de921660c9 (diff-4a01a166046bdf7e4ea7d41d97cd82a57c82f63d10d1697f76e6fe22bfa769ebR954)
we were calling it with bounds but also with the click event sometimes.
2024-12-20 09:42:46 -05:00
David Larlet
7cb6c0c45f
fix(#2391): split zoomTo to accept bounds
Since de921660c9 (diff-4a01a166046bdf7e4ea7d41d97cd82a57c82f63d10d1697f76e6fe22bfa769ebR954) we were calling it with bounds but also with the click event sometimes.
2024-12-20 09:25:25 -05:00
David Larlet
17e6cf7500
fix: main help button was broken (#2393) 2024-12-20 08:34:15 -05:00
Yohan Boniface
a9d9beacb2 fix: main help button was broken 2024-12-20 14:12:13 +01:00
Yohan Boniface
d4fb92ec56
Fix duplicated content during sync (#2388)
Some checks are pending
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Here are the main fixes:

- mark a synched datalayer as loaded (so the peer does not try to get
data from the server)
- do not mark synched datalayers as dirty
- properly consume the lastKnownHLC, so to get an accurate list of
operations

fix #2219
2024-12-19 17:38:39 +01:00
Yohan Boniface
650110fe8a
feat: reconnect websocket on disconnection (#2389)
This is a port of this PR: #2235

(But it was easier to copy-paste than rebase, given the split of umap.js
and co.)
2024-12-19 17:38:02 +01:00
Yohan Boniface
36fdb8190c chore: stringify sync payload before putting it in the console
This allow to have them displayed by playwright in the python
console.

Co-authored-by: David Larlet <david@larlet.fr>
2024-12-19 17:00:30 +01:00
Yohan Boniface
56f2d3d2f9 feat: reconnect websocket on disconnection
This is a port of this PR: #2235

(But it was easier to copy-paste than rebase, given the split of umap.js
and co.)

Co-authored-by: Alexis Métaireau <alexis@notmyidea.org>
Co-authored-by: David Larlet <david@larlet.fr>
2024-12-19 16:51:10 +01:00
Yohan Boniface
80152bf4fb
fix: update star icon on star/unstar (#2387) 2024-12-19 15:23:36 +01:00
Yohan Boniface
9ddca50d21
fix: honour carriage returns in layer description (in caption panel) (#2386)
This could have been a four letters fix (adding class "text"), but I've
seen that `Caption` was still using `DomUtil` instead of `WithTemplate`,
so I made this little effort more…
2024-12-19 15:23:16 +01:00
Yohan Boniface
1996e315e4 chore: allow to create non dirty DataLayer
There are two situations where we want to create "non dirty" datalayers:

- at normal load, we create datalayers that already exist in DB
- at sync, we create datalayers that will be saved by other peer
2024-12-19 13:38:09 +01:00
Yohan Boniface
dd7641c92e chore: mark synched datalayers as "loaded"
Otherwise, when they will get the "_referenceVersion" later, they
will call the server to fetch the data (while they already have
the data, from the sync itself)
2024-12-19 13:38:09 +01:00
Yohan Boniface
6caf4c3ed1 chore: properly consumme lastKnownHLC on list operations call 2024-12-19 13:38:09 +01:00
Yohan Boniface
471abe1f1b chore: honour "sync" parameter in layer.setReferenceVersion 2024-12-19 13:38:09 +01:00
Yohan Boniface
4ea5a28f04 chore: no need to call layer.redraw in layer.render()
We already call hide/show, which is what redraw does
2024-12-19 13:38:09 +01:00
Yohan Boniface
d24f05907c chore: add failing test for #2219 2024-12-19 13:38:09 +01:00
Yohan Boniface
0bc4900b16 fix(caption): honour carriage returns in datalayer description
fix #2385
2024-12-19 11:10:57 +01:00
Yohan Boniface
0e78d58c03 chore: use WithTemplate for Caption 2024-12-19 11:10:57 +01:00
Yohan Boniface
f93d0b5ca7 fix: update star icon on star/unstar 2024-12-19 10:44:32 +01:00
Yohan Boniface
24511d796d chore(tests): use new_page fixture in login one
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
So to have the js console relayed in the terminal
2024-12-18 17:44:30 +01:00
Yohan Boniface
0eedc47079 2.8.0
Some checks are pending
Test & Docs / docs (push) Waiting to run
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
2024-12-18 12:16:58 +01:00
Yohan Boniface
9e418c2ab0 chore: escape backticks in Makefile printf
Otherwise they are executed by the shell as subcommands…
2024-12-18 12:05:13 +01:00
Yohan Boniface
631e3a7fd3
fix: do not unset map dirty status if it has not yet been saved once (#2382) 2024-12-18 11:45:43 +01:00
Yohan Boniface
7b59cf4afb
fix: do not try to restore a newly created layer on reset (#2381)
When asking for cancel, a layer that has not yet been saved to the
server should only be erased, no need to try to restore its previous
state.
2024-12-18 11:45:27 +01:00
Yohan Boniface
d00b4e1da9 fix: do not unset map dirty status if it has not yet been saved once 2024-12-18 11:36:54 +01:00
Yohan Boniface
1ead369487 fix: do not try to restore a newly created layer on reset
When asking for cancel, a layer that has not yet been saved to the
server should only be erased, no need to try to restore its previous
state.
2024-12-18 11:21:36 +01:00
Yohan Boniface
32acdc2070
feat: experimental popup template for wikipedia (#2365)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
When the data contain a `wikipedia` attribute, like used in OSM data
(see https://wiki.openstreetmap.org/wiki/Key:wikipedia), this template
will fetch the image and an extract for the given page.


![image](https://github.com/user-attachments/assets/3187d5cf-4311-46c5-a6ed-be6a60d4b4a1)

fix #661
2024-12-17 20:29:28 +01:00
Yohan Boniface
a8ed8c0d3d 2.8.0b0
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
2024-12-17 19:03:55 +01:00
Yohan Boniface
b444380daa
fix: store the "active" status of a feature (#2378)
Otherwise, when the marker is redrawn by Leaflet itself, it will lose
the status (the class we added manually will not be added by Leaflet).

Eg. if we click on a marker on the map border, this will move the map to
make the marker popup fit the screen, and thus this will redraw the
marker icon, which will then lose the "active" flag class.
2024-12-17 18:50:39 +01:00
Yohan Boniface
92df1d792a fixup: escape Wikipedia HTML, just in case 2024-12-17 18:49:49 +01:00
Yohan Boniface
6e5540fe79 fixup: cache wikipedia calls and be a bit more defensive 2024-12-17 18:44:21 +01:00
Yohan Boniface
b7173d4629 fixup: allow to display asynchronous content in the panel too 2024-12-17 18:44:21 +01:00
Yohan Boniface
8a929d2352 fixup: allow aynchronous popups 2024-12-17 18:44:21 +01:00
Yohan Boniface
7670989798 fixup: bigger images from wikipedia 2024-12-17 18:44:21 +01:00
Yohan Boniface
573a065e05 wip 2024-12-17 18:44:21 +01:00
Yohan Boniface
dcaddef57c
feat: allow to edit datalayer name in datalayers list (#2349)
fix #1995



https://github.com/user-attachments/assets/b16d7d1b-eee1-4da2-93b9-2aac127051ba
2024-12-17 18:43:51 +01:00
Yohan Boniface
2bee0bf3d2 fix: store the "active" status of a feature
Otherwise, when the marker is redrawn by Leaflet itself, it will lose
the status (the class we added manually will not be added by Leaflet).

Eg. if we click on a marker on the map border, this will move the map
to make the marker popup fit the screen, and thus this will redraw the
marker icon, which will then lose the "active" flag class.
2024-12-17 18:41:37 +01:00
Yohan Boniface
8f3e9ee546
fix: do not autoescape static tag (#2376)
When using django-storage S3, this will escape the final static URL,
containing query string (so & will become &amp;).
2024-12-17 18:30:06 +01:00
Yohan Boniface
df3adbc85e
fix: bring marker to front on highlight (#2377)
fix #2351

The actual zIndex of a marker is computed by Leaflet, not set in CSS.
2024-12-17 18:28:52 +01:00
Yohan Boniface
7c986e5aea
fix: teach FormBuilder where to look for default values (#2374)
UMap will look into the schema for default values, but untill now
FormBuilder wasn't.
This fix is not the real fix we want, but let's make this last until
then.
The real fix is to refactor schema and make obj.properties a Proxy
object that will then be consumed by FormBuilder as it is now.
2024-12-17 18:19:07 +01:00
Yohan Boniface
1be00ed8ca
fix: show private/draft maps in team maps for members (#2373) 2024-12-17 18:16:55 +01:00
Yohan Boniface
de9b686584
chore: try to make biome ignore vendors/ (#2368)
Seems to be working today, no damn idea why it is and it was not before.
2024-12-17 18:15:48 +01:00
Yohan Boniface
3eba27f6ea
fixup: fix tilelayer switch not saved anymore (#2367)
Since map split.
2024-12-17 18:14:48 +01:00
Yohan Boniface
82708b1e53 fix: bring marker to front on highlight
fix #2351
2024-12-17 15:29:55 +01:00
Yohan Boniface
064473c816 chore: add default_acl in S3 options in documentation 2024-12-17 13:19:25 +01:00
Yohan Boniface
6db3032bdb fix: do not autoescape static tag
When using django-storage S3, this will escape the final static URL,
containing query string (so & will become &amp;).
2024-12-17 13:07:46 +01:00
Yohan Boniface
bf631f07de fix: display current configured oauth as icon instead of text 2024-12-17 11:44:13 +01:00
Yohan Boniface
9473a8552f fix: teach FormBuilder where to look for default values
UMap will look into the schema for default values, but untill now
FormBuilder wasn't.
This fix is not the real fix we want, but let's make this last until
then.
The real fix is to refactor schema and make obj.properties a Proxy
object that will then be consumed by FormBuilder as it is now.
2024-12-17 11:19:03 +01:00
Yohan Boniface
8a38dd63c9 fix: show private/draft maps in team maps for members 2024-12-17 10:37:07 +01:00
Yohan Boniface
05c27aed98
feat: parse files in parallel at import when multiple (#2372)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
cf https://github.com/umap-project/umap/pull/2363#discussion_r1882966275
2024-12-16 21:36:42 +01:00
Yohan Boniface
d08531121b feat: parse files in parallel at import when multiple 2024-12-16 19:49:58 +01:00
Yohan Boniface
06c2438ff1
fixup: fix save center and zoom (#2371)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Broken since map split.
2024-12-16 18:30:37 +01:00
Yohan Boniface
b92490eacc
feat: load all datalayers in parallel (#2370) 2024-12-16 18:26:55 +01:00
Yohan Boniface
cdb5d79297
chore: clean CSS loader (#2369)
- change the CSS (cf
https://github.com/umap-project/umap/issues/564#issuecomment-2541883101)
- change the way we pass events (and their id) to Leaflet.Loading
2024-12-16 18:24:43 +01:00
Yohan Boniface
ecdc58948f fixup: fix save center and zoom
Broken since map split.
2024-12-16 18:22:44 +01:00
Yohan Boniface
e3f02a475f feat: load all datalayers in parallel 2024-12-16 18:03:45 +01:00
Yohan Boniface
9c3f8db548 chore: clean CSS loader
- change the CSS (cf https://github.com/umap-project/umap/issues/564#issuecomment-2541883101)
- change the way we pass events (and their id) to Leaflet.Loading
2024-12-16 18:01:01 +01:00
Yohan Boniface
218b46c3b8 chore: try to make biome ignore vendors/ 2024-12-16 17:04:30 +01:00
Yohan Boniface
ce765efefc fixup: fix tilelayer switch not saved anymore
Since map split.
2024-12-16 17:00:43 +01:00
Yohan Boniface
09faa763f9
feat: add a back button to importers dialog (#2364)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
![image](https://github.com/user-attachments/assets/99445f06-f48f-4b0b-88f6-f696e067416d)
2024-12-13 15:49:45 +01:00
Yohan Boniface
fe06a0ff8e chore: add more tests for team related views 2024-12-13 14:44:54 +01:00
Yohan Boniface
b578ceced4 feat: add a back button to importers dialog 2024-12-13 12:27:41 +01:00
Yohan Boniface
7c808393f0 chore: make all backends point to S3 in the documentation example 2024-12-13 11:20:33 +01:00
Yohan Boniface
45a0ec5d42 fix: add default saved message
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Now that we do not always do a save on the map itself, we may have
no feedback message in case we only save layers.
2024-12-13 10:05:20 +01:00
Yohan Boniface
cbab6e03f8 fix: properly close the translate parentesis 2024-12-13 09:48:03 +01:00
Yohan Boniface
54aa687ba1 2.8.0a2 2024-12-13 09:33:24 +01:00
Yohan Boniface
8346459f28 i18n 2024-12-13 09:31:02 +01:00
Yohan Boniface
cd24bf0b3d
feat: refactor importer feedback (#2363)
We basically make the all import chain return the results as promise, so
the importer can act at the end of the process and:
- zoom only to the imported data (in case the layer already as some)
- display a counter of imported data when import is successfull
- display an alert when nothing has been imported

cf #564
2024-12-13 09:18:08 +01:00
Yohan Boniface
30b685ae43
chore: more logs in the ajax proxy validate url (#2362)
This should only be used in localhost, but there are a bunch of check
and it's often that we need to add print to understand why the URL does
not validate, which is usually an issue with the SITE_URL or this kind.
So let's make those print permanent.
2024-12-13 09:12:12 +01:00
Yohan Boniface
de921660c9 feat: refactor importer feedback
We basically make the all import chain return the results as promise, so
the importer can act at the end of the process and:
- zoom only to the imported data (in case the layer already as some)
- display a counter of imported data when import is successfull
- display an alert when nothing has been imported

cf #564
2024-12-12 21:52:54 +01:00
Yohan Boniface
8db974b96a chore: more logs in the ajax proxy validate url
This should only be used in localhost, but there are a bunch of
check and it's often that we need to add print to understand why
the URL does not validate, which is usually an issue with the SITE_URL
or this kind. So let's make those print permanent.
2024-12-12 21:06:09 +01:00
Yohan Boniface
dd89984e28
fix: make sure we set X-DataLayer-Version even when using X-Accel-Redirect (#2361)
Some checks are pending
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
2024-12-12 18:20:14 +01:00
Yohan Boniface
86c634db28 fix: make sure we set X-DataLayer-Version even when using X-Accel-Redirect 2024-12-12 18:19:02 +01:00
Yohan Boniface
a574db73e5
chore: review empty_trash command (#2360)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
- do not try to print map.id after delete (it's None)
- rely on date instead of minutes/microseconds
2024-12-12 16:32:34 +01:00
Yohan Boniface
5d0b7dff4c chore: review empty_trash command
- do not try to print map.id after delete (it's None)
- rely on date instead of minutes/microseconds
2024-12-12 13:47:40 +01:00
Yohan Boniface
b40b4e6306 changelog
Some checks are pending
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
2024-12-11 20:01:26 +01:00
Yohan Boniface
ddfef9cbe7 2.8.0a1 2024-12-11 19:25:10 +01:00
Yohan Boniface
e372b6410e
chore: make S3 dependencies optional (#2359) 2024-12-11 19:23:39 +01:00
Yohan Boniface
dc93ec99e8 chore: add s3 dependencies to Docker install 2024-12-11 19:21:05 +01:00
Yohan Boniface
8b65674e0a chore: make S3 dependencies optional 2024-12-11 19:16:17 +01:00
Yohan Boniface
c25ee5e29c changelog 2024-12-11 18:44:32 +01:00
Yohan Boniface
8f9ee89d18 2.8.0a0 2024-12-11 18:40:35 +01:00
Yohan Boniface
5370c9311a i18n 2024-12-11 18:16:31 +01:00
Yohan Boniface
eebef3420a
feat: add elevation gain and loss in extended properties (#2343)
![image](https://github.com/user-attachments/assets/c6a330e2-b981-4603-aa29-e70885a6f4fe)
2024-12-11 17:56:15 +01:00
Yohan Boniface
80ff4ed899
feat: move labelKey field on the top datalayer form (#2350)
fix #2331
2024-12-11 17:49:24 +01:00
Yohan Boniface
c41bf9129d
feat: display wikipedia link in OSM popup template when possible (#2358)
![image](https://github.com/user-attachments/assets/b22fd52e-1dfc-48f5-9f9e-0db12bf87fbe)

(And move popup related CSS to a dedicated file.)

cf #661
2024-12-11 17:48:40 +01:00
Yohan Boniface
c45c235ffe
feat: support storing layer data in S3 like servers (#2304)
This adds two now storage classes, `UmapFileSystem` and `UmapS3`.

The first class now handle the current storage behaviour (which was in
the DataLayer class), and the second one the S3 support.

Todo:

- [x] unit tests for the S3 class
- [x] understand how to deal with gzip in S3
- [x] clone

fix #2290
2024-12-11 17:46:19 +01:00
Yohan Boniface
c4ded4404e feat: display wikipedia link in OpenStreetMap popup template 2024-12-11 16:09:13 +01:00
Yohan Boniface
71389edca7 chore: move popup related CSS to a separate file 2024-12-11 16:08:29 +01:00
Yohan Boniface
8fb3c27445 fixup: properly read gzipped content from S3
We did not find a native way to do this from django-storages API.
2024-12-10 19:03:19 +01:00
Yohan Boniface
47524dacce chore: cache DataLayer._reference_version
Prevent to send a HEAD request head time to S3 (when using S3)
2024-12-10 19:03:19 +01:00
David Larlet
834970b725 chore: add command to migrate from fs to S3 2024-12-10 19:03:19 +01:00
David Larlet
14e74d15c1 chore: always gzip geojson in S3 storage 2024-12-10 19:03:19 +01:00
Yohan Boniface
1ac9a06195 chore: do not fail if S3 bucket does not handle versions
And mention the need of activating versioning in the doc.
2024-12-10 19:03:19 +01:00
Yohan Boniface
249367fd3a chore: install s3 dep for develop/CI 2024-12-10 19:03:19 +01:00
Yohan Boniface
81fa31f50b chore: add basic tests for S3 storage 2024-12-10 19:03:19 +01:00
Yohan Boniface
a04624c4c8 feat: support storing layer data in S3 like servers
fix #2290
2024-12-10 18:51:58 +01:00
Yohan Boniface
82b81706ab chore: add missing migration for new share_status values
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
2024-12-10 17:54:58 +01:00
Yohan Boniface
73e7f60cdf
feat: introduce Map.share_status=DRAFT and DELETED (#2357)
This PR introduce two new share_status: `DRAFT` and `DELETED`.

So all status are now:

        (DRAFT, _("Draft (private)")),
        (PUBLIC, _("Everyone (public)")),
        (OPEN, _("Anyone with link")),
        (PRIVATE, _("Editors and team only")),
        (BLOCKED, _("Blocked")),
        (DELETED, _("Deleted")),

Here are the impact of such introduction, on the draft side:
- by default maps are now create in draft status, and they are not
visible from others than owner (or collaborators if any); this can be
changed for a given instance with the setting
`UMAP_DEFAULT_SHARE_STATUS`
- now even anonymous owned maps have a share status, given one of the
goals is to make a better distinction between maps ready to be shared
and other, this also apply to maps without logged in owners

![image](https://github.com/user-attachments/assets/41dae9fe-0ae6-4ada-ace3-dc782c6cf972)
- when the map in in draft mode, the "Save" button on the frontend says
"Save draft", so to make the state clear

![image](https://github.com/user-attachments/assets/ca2ffb79-17fa-4a1c-9e81-a759c2a415a1)
- now the visibility of the map is immediately visible on the top bar
(while before this was only displayed after first save)

![image](https://github.com/user-attachments/assets/3d9efa86-3fac-4150-b01e-b7f1ea79114b)

Note: add the end `DRAFT` and `PRIVATE` are very similar, but I made the
choice to keep the two, so one can still distinguish their draft maps
from their ready map they want to keep private.

On the delete side:
- when deleting a map, it's now set as `share_status=DELETED`, which act
as a sort of trash; so it become easier to recover a map, with it's full
datalayers, etc. (the only thing which will not be restored is the
previous share_status, which should be draft again after a restore; the
restore function itself is not implemented)
- there is a new command `empty_trash` which delete for real maps in
DELETED status and with last_modified > 30 days (by default, can be
changed with a command line argument)
- deleted maps disappear from all views: home, search, dashboard…
- in the future, we could create a new view "My Trash", where one could
see their deleted map not yet deleted for real (and that should be the
opportunity to also add the `restore` function, which for now can be
done by simply changing the share_status from the shell or the admin)
- all the purgatory related code has been removed

fix #2207
2024-12-10 17:48:08 +01:00
Yohan Boniface
c8e171eb91 chore: make both save buttons hidden by default 2024-12-10 17:40:40 +01:00
Yohan Boniface
88ed5af776
Update umap/management/commands/empty_trash.py
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
2024-12-10 17:31:08 +01:00
Yohan Boniface
c4c874c5c2 chore: delete all datalayers version on delete 2024-12-10 16:51:32 +01:00
Yohan Boniface
cc457e9634 chore: do not use datetime.UTC yet, which is py>=3.11 only 2024-12-10 16:37:38 +01:00
Yohan Boniface
29d243b3c5 feat: move map to trash on delete
This also:
- adds a `umap empty_trash` command
- remove the previous purgatory concept
2024-12-10 16:30:23 +01:00
Yohan Boniface
1aaea0beb9 feat: introduce Map.share_status=DRAFT and DELETED 2024-12-10 15:14:12 +01:00
Yohan Boniface
c15ecfc29f
fix(#2355): correctly reset Dialog’s returnValue (#2356)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Fixes #2355
2024-12-10 13:33:00 +01:00
Yohan Boniface
246aedaeb9
chore: bump pydantic from 2.10.2 to 2.10.3 (#2352)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
2024-12-10 09:02:56 +01:00
Yohan Boniface
ec7c85db3a
chore: bump mkdocs-material from 9.5.47 to 9.5.48 (#2353) 2024-12-10 09:02:40 +01:00
Yohan Boniface
827fd39925
chore: bump ruff from 0.8.1 to 0.8.2 (#2354) 2024-12-10 09:02:23 +01:00
David Larlet
5b32e2ac03
fix(#2355): correctly reset Dialog’s returnValue
Fixes #2355
2024-12-09 18:16:41 -05:00
dependabot[bot]
d8e73121cf
chore: bump ruff from 0.8.1 to 0.8.2
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.8.1 to 0.8.2.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.8.1...0.8.2)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-09 17:29:29 +00:00
dependabot[bot]
43f3701a6f
chore: bump mkdocs-material from 9.5.47 to 9.5.48
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.47 to 9.5.48.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.5.47...9.5.48)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-09 17:29:12 +00:00
dependabot[bot]
c42bbf2b7b
chore: bump pydantic from 2.10.2 to 2.10.3
Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.10.2 to 2.10.3.
- [Release notes](https://github.com/pydantic/pydantic/releases)
- [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md)
- [Commits](https://github.com/pydantic/pydantic/compare/v2.10.2...v2.10.3)

---
updated-dependencies:
- dependency-name: pydantic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-09 17:29:05 +00:00
Yohan Boniface
89acf8f0ec feat: add elevation gain and loss in extended properties 2024-12-09 13:14:34 +01:00
Yohan Boniface
0f7b7d94f7 feat: allow to edit datalayer name in datalayers list
fix #1995
2024-12-09 13:14:16 +01:00
Yohan Boniface
d8abb28e35 feat: move labelKey field on the top datalayer form
fix #2331
2024-12-09 13:13:56 +01:00
Yohan Boniface
d0156bc7a6
fixup: make sure to redraw tile after a .umap import (#2347)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Broken since
20b2290d00

Since started as a simple fix, but:
- I first thought my previous fix of the failing test
`test_import_umap_from_textarea` was not a real fix, so I changed a bit
the way we mock tiles URL in tests, but at the end the test was failing
for good reasons
- since 20b2290d00 the reset of tilelayer
was not called anymore after importing a umap file, so I first made a
quick fix for this
- then I decided to refactor a bit more render and propagate, so
`importRaw` would pass the exact imported properties (instead of trying
to blindly target with some properties), and to remove a call to
`propagate`, which at the end should disappear in favor of `render` with
better targeting
2024-12-09 13:12:56 +01:00
Yohan Boniface
a7b714c887
fix: disable for real dragging the map on mobile when scrollWheelZoom is false (#2344)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
Changing map options at this stage is too late.

cf #2340
2024-12-07 15:46:45 +01:00
Yohan Boniface
f3c95bd13d chore: refactor render and propagate to better target UI changes 2024-12-07 15:41:16 +01:00
Yohan Boniface
bf2ed185db fix: make sure to redraw tile after a .umap import
Broken since 20b2290d00
2024-12-07 13:02:04 +01:00
Yohan Boniface
4070da392a chore: catch all "tile*" URL in playwright 2024-12-07 13:01:41 +01:00
David Larlet
ec23f09e5b
chore: bump django from 5.1.3 to 5.1.4 (#2346)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Bumps [django](https://github.com/django/django) from 5.1.3 to 5.1.4.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="2d4add11fd"><code>2d4add1</code></a>
[5.1.x] Bumped version for 5.1.4 release.</li>
<li><a
href="6943d61818"><code>6943d61</code></a>
[5.1.x] Fixed CVE-2024-53908 -- Prevented SQL injections in direct
HasKeyLook...</li>
<li><a
href="bbc74a7f7e"><code>bbc74a7</code></a>
[5.1.x] Fixed CVE-2024-53907 -- Mitigated potential DoS in
strip_tags().</li>
<li><a
href="5b4d949d7c"><code>5b4d949</code></a>
[5.1.x] Removed question marks from headings in
docs/topics/db/fixtures.txt.</li>
<li><a
href="6e3e7353e0"><code>6e3e735</code></a>
[5.1.x] Fixed <a
href="https://redirect.github.com/django/django/issues/35950">#35950</a>
-- Restored refreshing of relations when fields deferred.</li>
<li><a
href="ee2698dcca"><code>ee2698d</code></a>
[5.1.x] Removed reference to &quot;removing older versions of
Django&quot; in tutorial.</li>
<li><a
href="bed70e2c00"><code>bed70e2</code></a>
[5.1.x] Upgraded to Python 3.12, Ubuntu 24.04, and enabled
fail_on_warning fo...</li>
<li><a
href="5f82a5e4c7"><code>5f82a5e</code></a>
[5.1.x] Added stub release notes and release date for 5.1.4, 5.0.10, and
4.2.17.</li>
<li><a
href="4b262408aa"><code>4b26240</code></a>
[5.1.x] Fixed <a
href="https://redirect.github.com/django/django/issues/35942">#35942</a>
-- Fixed createsuperuser crash on Python 3.13+ when user...</li>
<li><a
href="08ac8c1b44"><code>08ac8c1</code></a>
[5.1.x] Updated maintainers of Django Debug Toolbar to Django
Commons.</li>
<li>Additional commits viewable in <a
href="https://github.com/django/django/compare/5.1.3...5.1.4">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=django&package-manager=pip&previous-version=5.1.3&new-version=5.1.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/umap-project/umap/network/alerts).

</details>
2024-12-06 14:57:47 -05:00
dependabot[bot]
b10dadd453
chore: bump django from 5.1.3 to 5.1.4
Bumps [django](https://github.com/django/django) from 5.1.3 to 5.1.4.
- [Commits](https://github.com/django/django/compare/5.1.3...5.1.4)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-06 18:38:34 +00:00
Yohan Boniface
42f74e1554 fix: disable for real dragging the map on mobile when scrollWheelZoom is false
Changing map options at this stage is too late.

cf #2340
2024-12-06 11:27:30 +01:00
Yohan Boniface
97ff26b6e8 fix: make that renderUI also recompute scrollWheelZoom
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Otherwise it does not change the behaviour when changing the setting.
2024-12-05 18:39:40 +01:00
Yohan Boniface
b7649a5e47
fix: Avoid map-panning on mobile using two fingers navigation (#2340)
If scrollWheelZoom option is false we deactivate leaflet dragging
options only on mobile
2024-12-05 18:38:08 +01:00
Yohan Boniface
92431d3b83
fix: do not redraw tilelayers each time a map property is changed (#2342) 2024-12-05 18:32:47 +01:00
Yohan Boniface
20b2290d00 fix: do not redraw tilelayers each time a map property is changed 2024-12-05 18:32:05 +01:00
Yohan Boniface
f4814797d7
feat: open importers in a dialog instead of in the form (#2327)
![image](https://github.com/user-attachments/assets/bdc8d7ef-874a-419c-9f02-47aff06081f3)

cf #2302
2024-12-05 18:27:18 +01:00
Yohan Boniface
0b818e8b75
feat: add a disabled/active mode to the submit button of import panel (#2341)
cf #2302

Warning: I removed the historic `width: 100%` on all buttons, who knows
where this will break? :p

Disabled:


![image](https://github.com/user-attachments/assets/000ff44b-bd6e-485b-b27f-39b0a189bf56)

Form valid:


![image](https://github.com/user-attachments/assets/afdbd4b6-7168-4dff-b314-e6556a289369)
2024-12-05 18:04:09 +01:00
Yohan Boniface
b692cb0cd1 chore: rename Importer.isValid to Importer.canSubmit
We are not really checking the validity of the form.
2024-12-05 18:03:30 +01:00
David Larlet
1f13c6ef00 docs-users: Update importers-related tutorial 2024-12-05 18:00:41 +01:00
Yohan Boniface
a9b13c709d feat(importer): check "copy" as default action
Let's make it simpler for new comers, and advanced users will know
where to click to change the behaviour.
2024-12-05 18:00:34 +01:00
Yohan Boniface
50efbc25be feat: add a disabled/active mode to the submit button of import panel
cf #2302
2024-12-05 18:00:26 +01:00
Yohan Boniface
d99fe70e36 feat: display importers in a dialog instead of direclty in the form
The goal is to keep the form smaller, specifically to keep the
submit button visible as much as possible.
2024-12-05 17:59:03 +01:00
Yohan Boniface
d64cdae987 chore: make that Importer extends WithTemplate
Another step is needed to use this.elements instead of this.qs
2024-12-05 17:59:03 +01:00
Yohan Boniface
da86020a0b feat: add icon-magic in 16-white.svg 2024-12-05 17:59:03 +01:00
Yohan Boniface
7f3726ddd1
feat: display an image from Panoramax in OSM template when tag is defined (#2338)
![Screenshot From 2024-12-05
11-45-05](https://github.com/user-attachments/assets/97949b2f-4716-4d56-bb2e-ce481b932dcb)

I initially just wanted to work on that simple Panoramax feature, but
faced a bunch of bugs!

- one bad var remaining since whatever refactor (and no tests for this
popup template!)
- title was duplicated, since whatever refactor (and not tests for
this…)
- title text was in black on blue background
2024-12-05 17:36:07 +01:00
Yohan Boniface
2c601e483d
feat: allow to configure the default label keys per instance (#2291)
fix #2289

Let's add "nom" in OSM France and ANCT instances, then, to make users
experience smoother (a lot of imported data contains a "nom" column, and
no "name" nor "title").
2024-12-05 17:35:48 +01:00
Yohan Boniface
171aba6676
feat: add basic autocompletion on inputs expecting a field name (#2281)
Eg. the labelKey or filterKey input.
2024-12-05 17:32:27 +01:00
Yohan Boniface
b7c77b9c9f
feat: make expression persistent in the overpass importer (#2339)
In other words: fill in the "tags" input with the latest typed
expression.

Otherwise, when making tries with overpass imports, one have to type it
again and again (it's available through the autocomplete, though, but
it's not obvious and it's less friendly IMHO).
2024-12-05 17:31:14 +01:00
Yohan Boniface
82853f7ade chore: add very minimal test for OSM popup template 2024-12-05 17:29:30 +01:00
Florent Triquet
acbdfda581 fix: Avoid map-panning on mobile using two fingers navigation
If scrollWheelZoom option is false we deactivate leaflet dragging options only on mobile
2024-12-05 14:11:05 +01:00
Yohan Boniface
e012d57e5c feat: make expression persistent in the overpass importer
In other words: fill in the "tags" input with the latest
typed expression.

Otherwise, when making tries with overpass imports, one have to
type it again and again (it's available through the autocomplete,
though, but it's not obvious and it's less friendly IMHO).
2024-12-05 12:42:21 +01:00
Yohan Boniface
6a0bc9443b feat: display an image from Panoramax in OSM template when tag is defined 2024-12-05 11:57:48 +01:00
Yohan Boniface
4949fcb4a4 feat: try to guess RGB from color name when element is not in DOM
We often need to compute the text/icon constrast color, but often
the element is not yet in the DOM, so we can't get the background
easily. Let's have a fallback for that instead of trying to have
"load" events everywhere.
2024-12-05 11:53:01 +01:00
Yohan Boniface
430dede0dd fix: fix broken OSM template 2024-12-05 11:46:52 +01:00
Yohan Boniface
d9c04c7d0a fix: do not render normal popup title in OSM template 2024-12-05 11:46:26 +01:00
Yohan Boniface
8f7e5c7252 chore: add missing import in cadastrefr
Some checks failed
Test & Docs / docs (push) Has been cancelled
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
2024-12-03 18:07:26 +01:00
Yohan Boniface
c9d532508d
chore: change cadastrefr buttons (#2333)
We remove the cancel button and change the accept label.
2024-12-03 17:56:57 +01:00
Yohan Boniface
6221b709f4
fix: importer.map is undefined in geodatamine importer (#2332)
Broken since the map split I guess.
2024-12-03 17:54:20 +01:00
Yohan Boniface
2b2580fa22
feat: swap import and settings buttons in edit toolbar (#2329)
fix #2297


![image](https://github.com/user-attachments/assets/2c7a98db-03dd-4cc2-afd3-1b5da3ae6964)
2024-12-03 17:53:51 +01:00
Yohan Boniface
26ff82e838 chore: change cadastrefr buttons
We remove the cancel button and change the accept label.
2024-12-03 16:24:30 +01:00
Yohan Boniface
8fa26a02a2 fix: importer.map is undefined
Broken this the map split I guess.
2024-12-03 16:21:37 +01:00
Yohan Boniface
9a900319af feat: swap import and settings buttons in edit toolbar
fix #2297
2024-12-03 15:20:22 +01:00
Yohan Boniface
e01a526935
chore: bump pytest-rerunfailures from 14.0 to 15.0 (#2326)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
2024-12-02 19:51:27 +01:00
Yohan Boniface
8569b827ca
fix: compute length of all shapes for MultiLineString (not only first) (#2310) 2024-12-02 19:46:45 +01:00
dependabot[bot]
2dab2f23b5
chore: bump pytest-rerunfailures from 14.0 to 15.0
Bumps [pytest-rerunfailures](https://github.com/pytest-dev/pytest-rerunfailures) from 14.0 to 15.0.
- [Changelog](https://github.com/pytest-dev/pytest-rerunfailures/blob/master/CHANGES.rst)
- [Commits](https://github.com/pytest-dev/pytest-rerunfailures/compare/14.0...15.0)

---
updated-dependencies:
- dependency-name: pytest-rerunfailures
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-02 18:43:58 +00:00
Yohan Boniface
f4ff1048bd
chore: bump pytest from 8.3.3 to 8.3.4 (#2325) 2024-12-02 19:42:49 +01:00
Yohan Boniface
6310cde28b
chore: bump djlint from 1.36.1 to 1.36.3 (#2324) 2024-12-02 19:41:34 +01:00
Yohan Boniface
666a92ec44 fix: compute length of all shapes for MultiLineString not only first 2024-12-02 19:39:57 +01:00
Yohan Boniface
2f776dab59
feat: highlight importer URL field when it is fulfilled (#2323)
Very small step of #2302 


![image](https://github.com/user-attachments/assets/0ff2c056-91ad-4daa-9882-dd44a4c6ef9f)
2024-12-02 19:04:04 +01:00
Yohan Boniface
bba9487847 feat: highlight importer URL field when it is fulfilled
cf #2302
2024-12-02 18:56:24 +01:00
dependabot[bot]
995052d83e
chore: bump pytest from 8.3.3 to 8.3.4
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.3 to 8.3.4.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/8.3.3...8.3.4)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-02 17:55:51 +00:00
dependabot[bot]
7e53e50b9c
chore: bump djlint from 1.36.1 to 1.36.3
Bumps [djlint](https://github.com/djlint/djLint) from 1.36.1 to 1.36.3.
- [Release notes](https://github.com/djlint/djLint/releases)
- [Changelog](https://github.com/djlint/djLint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/djlint/djLint/compare/v1.36.1...v1.36.3)

---
updated-dependencies:
- dependency-name: djlint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-02 17:55:44 +00:00
Yohan Boniface
8e5f46eb95
chore: bump pydantic from 2.9.2 to 2.10.2 (#2321) 2024-12-02 17:20:35 +01:00
Yohan Boniface
0f8ebcdf9a
chore: bump pytest-playwright from 0.5.2 to 0.6.2 (#2320) 2024-12-02 17:20:17 +01:00
Yohan Boniface
177a4edc1d
fix: broken ctrl+i and ctrl+o (#2322) 2024-12-02 17:19:53 +01:00
Yohan Boniface
31c8bf95ba fix: broken ctrl+i and ctrl+o 2024-12-02 17:10:06 +01:00
Yohan Boniface
f6f42f5e6b chore: move form css to a separate file 2024-12-02 17:07:06 +01:00
Yohan Boniface
d9998efc0f
Fix reordering of layers (#2316)
Broken in the map split I guess.

(Only the first line is the fix, the other are just naming, cf the two
commits.)
2024-12-02 15:43:14 +01:00
Yohan Boniface
30d9e43cd4
Add logo for social_core.backends.keycloak.KeycloakOAuth2 (#2258)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
2024-12-02 13:14:06 +01:00
dependabot[bot]
c29df404c8
chore: bump pydantic from 2.9.2 to 2.10.2
Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.9.2 to 2.10.2.
- [Release notes](https://github.com/pydantic/pydantic/releases)
- [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md)
- [Commits](https://github.com/pydantic/pydantic/compare/v2.9.2...v2.10.2)

---
updated-dependencies:
- dependency-name: pydantic
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-02 12:13:48 +00:00
dependabot[bot]
3f24563a05
chore: bump pytest-playwright from 0.5.2 to 0.6.2
Bumps [pytest-playwright](https://github.com/microsoft/playwright-pytest) from 0.5.2 to 0.6.2.
- [Release notes](https://github.com/microsoft/playwright-pytest/releases)
- [Commits](https://github.com/microsoft/playwright-pytest/compare/v0.5.2...v0.6.2)

---
updated-dependencies:
- dependency-name: pytest-playwright
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-02 12:12:48 +00:00
Yohan Boniface
64f0926e2d
chore: bump mkdocs-material from 9.5.44 to 9.5.47 (#2318) 2024-12-02 13:11:27 +01:00
Yohan Boniface
3aa0c8fc82
chore: bump ruff from 0.7.4 to 0.8.1 (#2319) 2024-12-02 13:11:10 +01:00
Yohan Boniface
1a88c11289 fix: don't show default label if another is found in features edit 2024-12-02 12:58:19 +01:00
Yohan Boniface
78d6699a81 feat: allow to configure the default label keys per instance
fix #2289
2024-12-02 12:58:19 +01:00
dependabot[bot]
9e2b207dfd
chore: bump ruff from 0.7.4 to 0.8.1
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.4 to 0.8.1.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.7.4...0.8.1)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-02 11:56:38 +00:00
Yohan Boniface
35b541f200 chore: better naming in layer reordering 2024-12-02 12:55:57 +01:00
Yohan Boniface
8624209e1b fix: iter on the right elements after reordering layers 2024-12-02 12:55:57 +01:00
dependabot[bot]
998bf87a0b
chore: bump mkdocs-material from 9.5.44 to 9.5.47
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.44 to 9.5.47.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.5.44...9.5.47)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-02 11:55:48 +00:00
Yohan Boniface
401efc037d
chore: fix failing test (#2317) 2024-12-02 12:54:12 +01:00
Yohan Boniface
471de78ab3 chore: fix failing test 2024-12-02 12:46:09 +01:00
Yohan Boniface
b7adf33237 chore: add missing doc file 2024-12-02 11:16:58 +01:00
Yohan Boniface
e33fc787ab
fix: do not fail when navigating with popup arrows in cluster mode (#2307)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
- make sure we have correct `this` in callback
- do not call anymatePan if icon is not added to map (because
clusterized)
2024-11-29 21:43:52 +01:00
Yohan Boniface
ca127c8c3c fix: do not fail when navigating with popup arrows in cluster mode
- make sure we have correct `this` in callback
- do not call anymatePan if icon is not added to map (because clusterized)
2024-11-29 18:32:14 +01:00
David Larlet
aadd41dd29
docs: add a video in French
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
2024-11-27 12:57:52 -05:00
David Larlet
b6229a05b7
Better login page styles and incentive (#2293)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
Fixes https://github.com/umap-project/umap-dsfr/issues/21

Rel.
24f23874f7
2024-11-22 09:29:47 -05:00
Yohan Boniface
d84c5246c5
chore: bump channels from 4.1.0 to 4.2.0 (#2275) 2024-11-22 10:18:48 +01:00
Yohan Boniface
4350f55e67
fix: do not fail when editing map infos if no licence is set (#2287) 2024-11-22 10:17:37 +01:00
Yohan Boniface
735c74dcb3
fix: allow spaces in iframe query strings in HTML formatting (#2292)
fix #2269
2024-11-22 09:46:56 +01:00
David Larlet
2008cca2f4
Add French Grist-related video tutorial
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
2024-11-21 16:12:34 -05:00
David Larlet
1073fe6142
Better login page styles and incentive
Fixes https://github.com/umap-project/umap-dsfr/issues/21

Rel. 24f23874f7
2024-11-21 15:37:21 -05:00
Yohan Boniface
d4bc91c41c chore: add --dependency-update in helm make command
Plus add a minimal doc
2024-11-21 17:40:49 +01:00
Yohan Boniface
3e6f8a6e7f
Add umap helm chart for Kubernetes deployment (#2286)
This helm chart allow to deploy umap on a Kubernetes cluster easily.
2024-11-21 17:12:46 +01:00
Yohan Boniface
95710a4dab fix: allow spaces in iframe query strings in HTML formatting
fix #2269
2024-11-21 15:21:35 +01:00
Antoine Millet
b76861489e chore: added "helm" job in Makefile to build & push helm chart 2024-11-21 15:13:51 +01:00
Yohan Boniface
f7c1b8f123 fix: do not fail when editing map infos if no licence is set 2024-11-20 16:44:15 +01:00
Antoine Millet
8ac548bf6f chore: added umap helm chart
This helm chart allow to deploy umap on a Kubernetes cluster easily.
2024-11-20 14:06:49 +01:00
Yohan Boniface
ccd6a21958
chore: explicitely set postgis as db engine (#2285)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
While working on a helm chart, we do not control the creation of the db
URL, which use "postgres://" instead of "postgis://", so Django does not
set the correct engine. So let's be explicit here.
2024-11-20 10:49:38 +01:00
Yohan Boniface
5cef79d395 i18n 2024-11-20 10:47:28 +01:00
Yohan Boniface
833941a9e6 chore: set an explicit db engine (postgis)
While working on a helm chart, we do not control the creation of
the db URL, which use "postgres://" instead of "postgis://", so
Django does not set the correct engine.
2024-11-19 18:44:35 +01:00
David Larlet
8f08ee3278
chore: update browserslist to be more explicit (#2277)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Given that we need to support ES6 modules, better to write it down
explicitely.

Current audience coverage is unchanged: 88.3 %

See
https://browsersl.ist/#q=%22browserslist%22%3A+%5B%0A++%22defaults+and+fully+supports+es6-module%22%0A%5D
vs.
https://browsersl.ist/#q=%22browserslist%22%3A+%5B%0A++%22%3E+0.5%25%2C+last+2+versions%2C+Firefox+ESR%2C+not+dead%2C+not+op_mini+all%22%0A%5D
2024-11-19 09:16:57 -05:00
Yohan Boniface
4acb20f3bb feat: add basic autocompletion on inputs expecting a field name
Eg. the labelKey or filterKey input.
2024-11-19 13:59:55 +01:00
Yohan Boniface
b678346d34
chore: move editToolBar and captionBar to modules (#2272)
This also tries to rework a bit the "reflow" process, which how to edit
the UI when something changes in the data.

The idea is to build the whole HTML, then:
- the `propagate` method tries to change the UI with targetted CSS
selector, but anywhere
- while `render` hide/show some elements

This is not the destination, but just another step. We certainly need to
refactor the SCHEMA to make the next step (as we want to associate some
data change to UI change).
2024-11-19 13:30:10 +01:00
Yohan Boniface
346597533c chore: a bit of CSS cleaning in bar.css 2024-11-19 13:16:02 +01:00
David Larlet
b085afa435
chore: update browserslist to be more explicit
Given that we need to support ES6 modules, better to write it down explicitely.

Current audience coverage is unchanged: 88.3 %

See https://browsersl.ist/#q=%22browserslist%22%3A+%5B%0A++%22defaults+and+fully+supports+es6-module%22%0A%5D vs. https://browsersl.ist/#q=%22browserslist%22%3A+%5B%0A++%22%3E+0.5%25%2C+last+2+versions%2C+Firefox+ESR%2C+not+dead%2C+not+op_mini+all%22%0A%5D
2024-11-18 18:06:05 -05:00
Yohan Boniface
5ceda7b2a3 chore: move editToolBar and captionBar to modules
This also tries to rework a bit the "reflow" process, which how
to edit the UI when something changes in the data.

The idea is to build the whole HTML, then:
- the `propagate` method tries to change the UI with targetted CSS
selector, but anywhere
- while `render` hide/show some elements

This is not the destination, but just another step. We certainly
need to refactor the SCHEMA to make the next step (as we want to associate
some data change to UI change).
2024-11-18 19:43:28 +01:00
Yohan Boniface
2c64745c52
fix: honour rules and slideshow when importing a umap file (#2270)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Side note (for another PR I'd say): this usually occurs on a non saved
map, but in case the map already exist and is in sync mode, should we
sync each property (safer but one call per property) or the whole
properties object (lighter, but may override unwanted things in remote,
and currently there is no method to do so).
2024-11-18 19:41:40 +01:00
Yohan Boniface
d38d8e152c
fix: honour custom labelKey in default popup template (#2271)
The default popup template expects a `name` key, so let's populate it.
2024-11-18 19:38:09 +01:00
David Larlet
25bf7e1466
chore: bump rcssmin from 1.1.3 to 1.2.0 (#2273)
Bumps [rcssmin](https://github.com/ndparker/rcssmin) from 1.1.3 to
1.2.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/ndparker/rcssmin/blob/master/CHANGES">rcssmin's
changelog</a>.</em></p>
<blockquote>
<p>Changes with version 1.2.0</p>
<p>*) Add support for nesting selector (&amp;)</p>
<p>*) Update project boilerplate</p>
<p>Changes with version 1.1.3</p>
<p>*) Add support for Python 3.13</p>
<p>*) Update project boilerplate</p>
<p>Changes with version 1.1.2</p>
<p>*) Add support for Python 3.12</p>
<p>*) Add musllinux wheels</p>
<p>*) Update project boilerplate</p>
<p>Changes with version 1.1.1</p>
<p>*) Add support for Python 3.11</p>
<p>*) Update project boilerplate</p>
<p>Changes with version 1.1.0</p>
<p>*) quoted data urls which are not base64 encoded keep their spaces
now (<a
href="https://redirect.github.com/ndparker/rcssmin/issues/8">#8</a>)</p>
<p>*) Add x86_64, i686 and aarch64 wheels</p>
<p>*) Update python support: 2.7, 3.6+</p>
<p>*) Both python 2 and 3 now accept bytes and text as input. All other
types now
raise a TypeError. Before they possibly have been converted to a string,
depending on the python version and the implementation. Python 3 also
accepts bytearray input.</p>
<p>*) Support for PyPy and Jython is no longer tested. Patches are
accepted,
though.</p>
<p>*) The python version will only accept the C implementation if the
versions
match exactly. This should prevent using older installed C versions.
Fixes <a
href="https://redirect.github.com/ndparker/rcssmin/issues/11">#11</a>.
This issue is now more relevant since <a
href="https://redirect.github.com/ndparker/rcssmin/issues/7">#7</a> is
fixed.</p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="5396f5ec39"><code>5396f5e</code></a>
Bump version to 1.2.0</li>
<li><a
href="81da21987b"><code>81da219</code></a>
Update benchmarks</li>
<li><a
href="1f9ff6d2d8"><code>1f9ff6d</code></a>
Add support for nesting selector (&amp;)</li>
<li><a
href="eac70b68c2"><code>eac70b6</code></a>
Add pyproject.toml, update dependencies</li>
<li><a
href="c1beaf0f1c"><code>c1beaf0</code></a>
update gpg info</li>
<li>See full diff in <a
href="https://github.com/ndparker/rcssmin/compare/1.1.3...1.2.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=rcssmin&package-manager=pip&previous-version=1.1.3&new-version=1.2.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2024-11-18 13:09:26 -05:00
David Larlet
9656d04432
chore: bump ruff from 0.7.3 to 0.7.4 (#2276)
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.3 to 0.7.4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/astral-sh/ruff/releases">ruff's
releases</a>.</em></p>
<blockquote>
<h2>0.7.4</h2>
<h2>Release Notes</h2>
<h3>Preview features</h3>
<ul>
<li>[<code>flake8-datetimez</code>] Detect usages of
<code>datetime.max</code>/<code>datetime.min</code>
(<code>DTZ901</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14288">#14288</a>)</li>
<li>[<code>flake8-logging</code>] Implement
<code>root-logger-calls</code> (<code>LOG015</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14302">#14302</a>)</li>
<li>[<code>flake8-no-pep420</code>] Detect empty implicit namespace
packages (<code>INP001</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14236">#14236</a>)</li>
<li>[<code>flake8-pyi</code>] Add &quot;replace with
<code>Self</code>&quot; fix (<code>PYI019</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14238">#14238</a>)</li>
<li>[<code>perflint</code>] Implement quick-fix for
<code>manual-list-comprehension</code> (<code>PERF401</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/13919">#13919</a>)</li>
<li>[<code>pylint</code>] Implement <code>shallow-copy-environ</code>
(<code>W1507</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14241">#14241</a>)</li>
<li>[<code>ruff</code>] Implement <code>none-not-at-end-of-union</code>
(<code>RUF036</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14314">#14314</a>)</li>
<li>[<code>ruff</code>] Implementation <code>unsafe-markup-call</code>
from <code>flake8-markupsafe</code> plugin (<code>RUF035</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14224">#14224</a>)</li>
<li>[<code>ruff</code>] Report problems for <code>attrs</code>
dataclasses (<code>RUF008</code>, <code>RUF009</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14327">#14327</a>)</li>
</ul>
<h3>Rule changes</h3>
<ul>
<li>[<code>flake8-boolean-trap</code>] Exclude dunder methods that
define operators (<code>FBT001</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14203">#14203</a>)</li>
<li>[<code>flake8-pyi</code>] Add &quot;replace with
<code>Self</code>&quot; fix (<code>PYI034</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14217">#14217</a>)</li>
<li>[<code>flake8-pyi</code>] Always autofix
<code>duplicate-union-members</code> (<code>PYI016</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14270">#14270</a>)</li>
<li>[<code>flake8-pyi</code>] Improve autofix for nested and mixed type
unions for <code>unnecessary-type-union</code> (<code>PYI055</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14272">#14272</a>)</li>
<li>[<code>flake8-pyi</code>] Mark fix as unsafe when type annotation
contains comments for <code>duplicate-literal-member</code>
(<code>PYI062</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14268">#14268</a>)</li>
</ul>
<h3>Server</h3>
<ul>
<li>Use the current working directory to resolve settings from
<code>ruff.configuration</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14352">#14352</a>)</li>
</ul>
<h3>Bug fixes</h3>
<ul>
<li>Avoid conflicts between <code>PLC014</code>
(<code>useless-import-alias</code>) and <code>I002</code>
(<code>missing-required-import</code>) by considering
<code>lint.isort.required-imports</code> for <code>PLC014</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14287">#14287</a>)</li>
<li>[<code>flake8-type-checking</code>] Skip quoting annotation if it
becomes invalid syntax (<code>TCH001</code>)</li>
<li>[<code>flake8-pyi</code>] Avoid using <code>typing.Self</code> in
stub files pre-Python 3.11 (<code>PYI034</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14230">#14230</a>)</li>
<li>[<code>flake8-pytest-style</code>] Flag <code>pytest.raises</code>
call with keyword argument <code>expected_exception</code>
(<code>PT011</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14298">#14298</a>)</li>
<li>[<code>flake8-simplify</code>] Infer &quot;unknown&quot; truthiness
for literal iterables whose items are all unpacks (<code>SIM222</code>)
(<a
href="https://redirect.github.com/astral-sh/ruff/pull/14263">#14263</a>)</li>
<li>[<code>flake8-type-checking</code>] Fix false positives for
<code>typing.Annotated</code> (<code>TCH001</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14311">#14311</a>)</li>
<li>[<code>pylint</code>] Allow <code>await</code> at the top-level
scope of a notebook (<code>PLE1142</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14225">#14225</a>)</li>
<li>[<code>pylint</code>] Fix miscellaneous issues in
<code>await-outside-async</code> detection (<code>PLE1142</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14218">#14218</a>)</li>
<li>[<code>pyupgrade</code>] Avoid applying PEP 646 rewrites in invalid
contexts (<code>UP044</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14234">#14234</a>)</li>
<li>[<code>pyupgrade</code>] Detect permutations in redundant open modes
(<code>UP015</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14255">#14255</a>)</li>
<li>[<code>refurb</code>] Avoid triggering
<code>hardcoded-string-charset</code> for reordered sets
(<code>FURB156</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14233">#14233</a>)</li>
<li>[<code>refurb</code>] Further special cases added to
<code>verbose-decimal-constructor</code> (<code>FURB157</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14216">#14216</a>)</li>
<li>[<code>refurb</code>] Use <code>UserString</code> instead of
non-existent <code>UserStr</code> (<code>FURB189</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14209">#14209</a>)</li>
<li>[<code>ruff</code>] Avoid treating lowercase letters as <code>#
noqa</code> codes (<code>RUF100</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14229">#14229</a>)</li>
<li>[<code>ruff</code>] Do not report when <code>Optional</code> has no
type arguments (<code>RUF013</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14181">#14181</a>)</li>
</ul>
<h3>Documentation</h3>
<ul>
<li>Add &quot;Notebook behavior&quot; section for <code>F704</code>,
<code>PLE1142</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14266">#14266</a>)</li>
<li>Document comment policy around fix safety (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14300">#14300</a>)</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md">ruff's
changelog</a>.</em></p>
<blockquote>
<h2>0.7.4</h2>
<h3>Preview features</h3>
<ul>
<li>[<code>flake8-datetimez</code>] Detect usages of
<code>datetime.max</code>/<code>datetime.min</code>
(<code>DTZ901</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14288">#14288</a>)</li>
<li>[<code>flake8-logging</code>] Implement
<code>root-logger-calls</code> (<code>LOG015</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14302">#14302</a>)</li>
<li>[<code>flake8-no-pep420</code>] Detect empty implicit namespace
packages (<code>INP001</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14236">#14236</a>)</li>
<li>[<code>flake8-pyi</code>] Add &quot;replace with
<code>Self</code>&quot; fix (<code>PYI019</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14238">#14238</a>)</li>
<li>[<code>perflint</code>] Implement quick-fix for
<code>manual-list-comprehension</code> (<code>PERF401</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/13919">#13919</a>)</li>
<li>[<code>pylint</code>] Implement <code>shallow-copy-environ</code>
(<code>W1507</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14241">#14241</a>)</li>
<li>[<code>ruff</code>] Implement <code>none-not-at-end-of-union</code>
(<code>RUF036</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14314">#14314</a>)</li>
<li>[<code>ruff</code>] Implementation <code>unsafe-markup-call</code>
from <code>flake8-markupsafe</code> plugin (<code>RUF035</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14224">#14224</a>)</li>
<li>[<code>ruff</code>] Report problems for <code>attrs</code>
dataclasses (<code>RUF008</code>, <code>RUF009</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14327">#14327</a>)</li>
</ul>
<h3>Rule changes</h3>
<ul>
<li>[<code>flake8-boolean-trap</code>] Exclude dunder methods that
define operators (<code>FBT001</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14203">#14203</a>)</li>
<li>[<code>flake8-pyi</code>] Add &quot;replace with
<code>Self</code>&quot; fix (<code>PYI034</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14217">#14217</a>)</li>
<li>[<code>flake8-pyi</code>] Always autofix
<code>duplicate-union-members</code> (<code>PYI016</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14270">#14270</a>)</li>
<li>[<code>flake8-pyi</code>] Improve autofix for nested and mixed type
unions for <code>unnecessary-type-union</code> (<code>PYI055</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14272">#14272</a>)</li>
<li>[<code>flake8-pyi</code>] Mark fix as unsafe when type annotation
contains comments for <code>duplicate-literal-member</code>
(<code>PYI062</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14268">#14268</a>)</li>
</ul>
<h3>Server</h3>
<ul>
<li>Use the current working directory to resolve settings from
<code>ruff.configuration</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14352">#14352</a>)</li>
</ul>
<h3>Bug fixes</h3>
<ul>
<li>Avoid conflicts between <code>PLC014</code>
(<code>useless-import-alias</code>) and <code>I002</code>
(<code>missing-required-import</code>) by considering
<code>lint.isort.required-imports</code> for <code>PLC014</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14287">#14287</a>)</li>
<li>[<code>flake8-type-checking</code>] Skip quoting annotation if it
becomes invalid syntax (<code>TCH001</code>)</li>
<li>[<code>flake8-pyi</code>] Avoid using <code>typing.Self</code> in
stub files pre-Python 3.11 (<code>PYI034</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14230">#14230</a>)</li>
<li>[<code>flake8-pytest-style</code>] Flag <code>pytest.raises</code>
call with keyword argument <code>expected_exception</code>
(<code>PT011</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14298">#14298</a>)</li>
<li>[<code>flake8-simplify</code>] Infer &quot;unknown&quot; truthiness
for literal iterables whose items are all unpacks (<code>SIM222</code>)
(<a
href="https://redirect.github.com/astral-sh/ruff/pull/14263">#14263</a>)</li>
<li>[<code>flake8-type-checking</code>] Fix false positives for
<code>typing.Annotated</code> (<code>TCH001</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14311">#14311</a>)</li>
<li>[<code>pylint</code>] Allow <code>await</code> at the top-level
scope of a notebook (<code>PLE1142</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14225">#14225</a>)</li>
<li>[<code>pylint</code>] Fix miscellaneous issues in
<code>await-outside-async</code> detection (<code>PLE1142</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14218">#14218</a>)</li>
<li>[<code>pyupgrade</code>] Avoid applying PEP 646 rewrites in invalid
contexts (<code>UP044</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14234">#14234</a>)</li>
<li>[<code>pyupgrade</code>] Detect permutations in redundant open modes
(<code>UP015</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14255">#14255</a>)</li>
<li>[<code>refurb</code>] Avoid triggering
<code>hardcoded-string-charset</code> for reordered sets
(<code>FURB156</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14233">#14233</a>)</li>
<li>[<code>refurb</code>] Further special cases added to
<code>verbose-decimal-constructor</code> (<code>FURB157</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14216">#14216</a>)</li>
<li>[<code>refurb</code>] Use <code>UserString</code> instead of
non-existent <code>UserStr</code> (<code>FURB189</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14209">#14209</a>)</li>
<li>[<code>ruff</code>] Avoid treating lowercase letters as <code>#
noqa</code> codes (<code>RUF100</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14229">#14229</a>)</li>
<li>[<code>ruff</code>] Do not report when <code>Optional</code> has no
type arguments (<code>RUF013</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14181">#14181</a>)</li>
</ul>
<h3>Documentation</h3>
<ul>
<li>Add &quot;Notebook behavior&quot; section for <code>F704</code>,
<code>PLE1142</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14266">#14266</a>)</li>
<li>Document comment policy around fix safety (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14300">#14300</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="ed7b98cf9b"><code>ed7b98c</code></a>
Bump version to 0.7.4 (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14358">#14358</a>)</li>
<li><a
href="6591775cd9"><code>6591775</code></a>
[<code>flake8-type-checking</code>] Skip quoting annotation if it
becomes invalid syntax...</li>
<li><a
href="1f82731856"><code>1f82731</code></a>
Use CWD to resolve settings from <code>ruff.configuration</code> (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14352">#14352</a>)</li>
<li><a
href="874da9c400"><code>874da9c</code></a>
[red-knot] Display raw characters for string literal (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14351">#14351</a>)</li>
<li><a
href="375cead202"><code>375cead</code></a>
Sync vendored typeshed stubs (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14350">#14350</a>)</li>
<li><a
href="9ec690b8f8"><code>9ec690b</code></a>
[red-knot] Add support for string annotations (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14151">#14151</a>)</li>
<li><a
href="a48d779c4e"><code>a48d779</code></a>
[red-knot] function signature representation (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14304">#14304</a>)</li>
<li><a
href="ba6c7f6897"><code>ba6c7f6</code></a>
[<code>pylint</code>] Remove check for dot in alias name in
`useless-import-alias (PLC04...</li>
<li><a
href="8095ff0e55"><code>8095ff0</code></a>
enforce required imports even with useless alias (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14287">#14287</a>)</li>
<li><a
href="24cd592a1d"><code>24cd592</code></a>
Avoid module lookup for known classes when possible (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14343">#14343</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/astral-sh/ruff/compare/0.7.3...0.7.4">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=ruff&package-manager=pip&previous-version=0.7.3&new-version=0.7.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2024-11-18 13:08:45 -05:00
dependabot[bot]
3104636cff
chore: bump ruff from 0.7.3 to 0.7.4
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.3 to 0.7.4.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.7.3...0.7.4)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-18 18:01:54 +00:00
dependabot[bot]
cf7c293523
chore: bump channels from 4.1.0 to 4.2.0
Bumps [channels](https://github.com/django/channels) from 4.1.0 to 4.2.0.
- [Changelog](https://github.com/django/channels/blob/main/CHANGELOG.txt)
- [Commits](https://github.com/django/channels/compare/4.1.0...4.2.0)

---
updated-dependencies:
- dependency-name: channels
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-18 18:01:44 +00:00
dependabot[bot]
91f3d55f5b
chore: bump rcssmin from 1.1.3 to 1.2.0
Bumps [rcssmin](https://github.com/ndparker/rcssmin) from 1.1.3 to 1.2.0.
- [Changelog](https://github.com/ndparker/rcssmin/blob/master/CHANGES)
- [Commits](https://github.com/ndparker/rcssmin/compare/1.1.3...1.2.0)

---
updated-dependencies:
- dependency-name: rcssmin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-18 18:01:30 +00:00
Yohan Boniface
4b170df1c2 fix: honour custom labelKey in default popup template
The default popup template expects a `name` key, so let's populate
it.
2024-11-16 11:20:23 +01:00
Yohan Boniface
123a6ea508 fix: honour rules and slideshow when importing a umap file
Side note (for another PR I'd say): this usually occurs on a non
saved map, but in case the map already exist and is in sync mode,
should we sync each property (safer but one call per property)
or the whole properties object (lighter, but may override unwanted
things in remote, and currently there is no method to do so).
2024-11-16 10:30:15 +01:00
Yohan Boniface
7de3ebd2d1
fix: fix event name in drop util (#2261)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
2024-11-15 18:45:43 +01:00
Yohan Boniface
57a670d64c
fix: use our fork of csv2geojson to be able to parse lat/lon with commas (#2263) 2024-11-15 18:44:01 +01:00
Yohan Boniface
8c6766157a chore: add test for CSV latlng parsing with commas 2024-11-15 18:24:57 +01:00
Yohan Boniface
92ef4b25b4 fix: use our fork of csv2geojson to be able to parse lat/lon with commas 2024-11-15 18:10:08 +01:00
Yohan Boniface
4acf0db17f fix: fix evenet name in drop util 2024-11-15 16:43:58 +01:00
Yohan Boniface
810537696d
Layers uuid2 (#2259)
Rebase of https://github.com/umap-project/umap/pull/2233
2024-11-15 15:36:29 +01:00
7dadb83ff5 feat(sync): Let the clients set layers UUID
This make it possible to synchronize datalayers before their creation on
the server, allowing at the same time to solve issues related to them
not being saved (e.g. duplication of geometries)

We use the DataLayer._referenceVersion to track if a DataLayer has been
saved on the server.

After a save, the _referenceVersion is synched with other peers.

To pass the reference version from the server to the frontend, we have two
options:
- use a header
- populate the `options.version` field

In the case of a GET on a Datalayer, we could not use the `options` scenario
because:
- the value in the file is not up to date (it was the value the client has
 before the save)
- the python cannot change it on the fly, as the file is served by nginx

So we decided to keep using a header. But on the map view, we load all
datalayers metadatas in the map options, so here we cannot use the header
scenario, so in this specific case we had to populate `options._referenceVersion`.

At the same time, we also changed:
- Umap.options.umap_id => Umap.id
- DataLayer.umap_id => Datalayer.id
- fixed the version number returned by DataLayer.version_metadata
2024-11-15 15:22:36 +01:00
Yohan Boniface
8c2a0eca28
chore: split umap.js in two modules (#2257)
Some checks failed
Test & Docs / docs (push) Has been cancelled
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Long awaited step! Very intrusive change!

The `umap.js` old papa js style is now moved to modules, and split in
two, as we did for layers and features: one module is for the data part,
and the other is for the rendering part, and this one inherits from
Leaflet.

Sadly, the split between those two modules is not as clear as I'd like
it to be, as some functions my be interpreted or not as rendering.

What is now moved to the rendering module is all elements that inherit
from Leaflet, so what concerns the map itself, but also controls in of
the Leaflet world (inheriting from L.Control). In the other hand, UI
elements that does not inherit from Leaflet are kept on the `umap.js`
module (panels, tooltip, contextmenu…).

Also, `Umap` as a `properties` key, to follow geojson spec, and
distinguish from `LeafletMap.options`.

This is a first step, that will need more work, but as tests pass, I'd
suggest to merge if we agree on the choices and continue working with
other (smaller) PRs (and I'll take care of rebasing current other PRs).

Some specific points I've in mind that does not smell good:
- umap.js module still uses some Leaflet utils
- Umap and LeafletMap have a reference to each other
- umap.js module still need Leaflet events
- layers and feature still need to have reference to both Umap and
LeafletMap
2024-11-13 14:52:33 +01:00
Yohan Boniface
378e0f3ad3 chore: review with Alexis 2024-11-13 14:27:39 +01:00
Thomas Legay
4bd7bd7d48 Add logo for social_core.backends.keycloak.KeycloakOAuth2 2024-11-12 23:58:30 +01:00
Yohan Boniface
51e41b7bce chore: remove unused imports from global.js 2024-11-12 15:28:05 +01:00
Yohan Boniface
b49f3d7633 chore: remove old umap.js file 2024-11-12 15:06:34 +01:00
Yohan Boniface
0dbac92853 chore: remove 'postsync' event 2024-11-12 14:50:08 +01:00
Yohan Boniface
6d56bbb5de chore: refactore LeafletMap.setup/update 2024-11-12 14:36:59 +01:00
Yohan Boniface
e1a24b6180 chore: fix updaters to use umap instead of map and properties instead of options 2024-11-12 13:27:29 +01:00
Yohan Boniface
b0eb263d93 chore: remove use of L. in umap.js 2024-11-12 11:38:38 +01:00
Yohan Boniface
491d0515cd chore: fix help module not using umap module 2024-11-12 11:31:14 +01:00
Yohan Boniface
55f04a2f10 chore: remove DomEvent import from umap.js 2024-11-12 11:23:18 +01:00
Yohan Boniface
ce3b8554bb
chore: bump pymdown-extensions from 10.11.2 to 10.12 (#2246)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
2024-11-12 10:20:11 +01:00
Yohan Boniface
c952fed96a chore: split umap.js in two modules 2024-11-12 10:17:12 +01:00
dependabot[bot]
6c752385e5
chore: bump pymdown-extensions from 10.11.2 to 10.12
Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 10.11.2 to 10.12.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases)
- [Commits](https://github.com/facelessuser/pymdown-extensions/compare/10.11.2...10.12)

---
updated-dependencies:
- dependency-name: pymdown-extensions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-11 18:11:20 +00:00
David Larlet
ec050144f5
chore: bump djlint from 1.35.2 to 1.36.1 (#2254)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Test & Docs / lint (push) Waiting to run
Test & Docs / docs (push) Waiting to run
Bumps [djlint](https://github.com/djlint/djLint) from 1.35.2 to 1.36.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/djlint/djLint/releases">djlint's
releases</a>.</em></p>
<blockquote>
<h2>v1.36.1</h2>
<ul>
<li>Improve performance by ~30%. Thanks, <a
href="https://github.com/oliverhaas"><code>@​oliverhaas</code></a>.</li>
</ul>
<h2>v1.36.0</h2>
<h3>Feature</h3>
<ul>
<li>Add support for <code>djlint.toml</code> config file. The format is
identical to <code>pyproject.toml</code>, but it does not use
<code>[tool.djlint]</code> table.</li>
</ul>
<h3>Fix</h3>
<ul>
<li>Do not format HTML in attributes. Thanks, <a
href="https://github.com/oliverhaas"><code>@​oliverhaas</code></a>.</li>
<li>Fix using <code>js_config</code> instead of
<code>css_config</code>.</li>
</ul>
<h3>Performance</h3>
<ul>
<li>Increase performance by ~30% by using regex more efficiently and
caching more stuff.</li>
</ul>
<h2>v1.35.4</h2>
<p>Compiled <a
href="https://mypyc.readthedocs.io/en/stable/introduction.html">mypyc</a>
wheels are now also available, which improve performance by ~21% over
Pure Python. They will be automatically installed by your package
manager when available for your platform. Pure Python wheel is still
available.</p>
<p>Other changes have been made to improve performance, thanks to <a
href="https://github.com/JCWasmx86"><code>@​JCWasmx86</code></a>. See
the <a
href="https://github.com/djlint/djLint/compare/v1.35.3...v1.35.4">commits</a>
for more details.</p>
<p>Formatting performance comparison with the previous version (tested
on <a
href="https://github.com/openedx/edx-platform">https://github.com/openedx/edx-platform</a>
with single thread):</p>
<table>
<thead>
<tr>
<th>Version</th>
<th>Seconds</th>
</tr>
</thead>
<tbody>
<tr>
<td>v1.35.3</td>
<td>20.39</td>
</tr>
<tr>
<td>v1.35.4 pure Python</td>
<td>14.39</td>
</tr>
<tr>
<td>v1.35.4 compiled</td>
<td>11.35</td>
</tr>
</tbody>
</table>
<h2>v1.35.3</h2>
<p>This release significantly improves performance, especially for large
files and large projects.</p>
<p>Formatting <a
href="https://github.com/openedx/edx-platform">https://github.com/openedx/edx-platform</a>
took 87 seconds in the previous version, now it takes only 4 seconds
(&gt;2000% speedup)! Tested on a 32-core computer.</p>
<ul>
<li>Performance improved by caching some functions. Thanks to <a
href="https://github.com/JCWasmx86"><code>@​JCWasmx86</code></a>!</li>
<li>Removed the limitation on the number of workers introduced in
v1.35.0.</li>
<li>Drop Python 3.8 support.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/djlint/djLint/blob/master/CHANGELOG.md">djlint's
changelog</a>.</em></p>
<blockquote>
<h2>[1.36.1] - 2024-11-07</h2>
<ul>
<li>Improve performance by ~30%. Thanks, <a
href="https://github.com/oliverhaas"><code>@​oliverhaas</code></a>.</li>
</ul>
<h2>[1.36.0] - 2024-11-05</h2>
<h3>Feature</h3>
<ul>
<li>Add support for <code>djlint.toml</code> config file. The format is
identical to <code>pyproject.toml</code>, but it does not use
<code>[tool.djlint]</code> table.</li>
</ul>
<h3>Fix</h3>
<ul>
<li>Do not format HTML in attributes. Thanks, <a
href="https://github.com/oliverhaas"><code>@​oliverhaas</code></a>.</li>
<li>Fix using <code>js_config</code> instead of
<code>css_config</code>.</li>
</ul>
<h3>Performance</h3>
<ul>
<li>Increase performance by ~30% by using regex more efficiently and
caching more stuff.</li>
</ul>
<h2>[1.35.4] - 2024-11-01</h2>
<p>Compiled <a
href="https://mypyc.readthedocs.io/en/stable/introduction.html">mypyc</a>
wheels are now also available, which improve performance by ~21% over
Pure Python. They will be automatically installed by your package
manager when available for your platform. Pure Python wheel is still
available.</p>
<p>Other changes have been made to improve performance, thanks to <a
href="https://github.com/JCWasmx86"><code>@​JCWasmx86</code></a>. See
the <a
href="https://github.com/djlint/djLint/compare/v1.35.3...v1.35.4">commits</a>
for more details.</p>
<p>Formatting performance comparison with the previous version (tested
on <a
href="https://github.com/openedx/edx-platform">https://github.com/openedx/edx-platform</a>
with single thread):</p>
<table>
<thead>
<tr>
<th>Version</th>
<th>Seconds</th>
</tr>
</thead>
<tbody>
<tr>
<td>v1.35.3</td>
<td>20.39</td>
</tr>
<tr>
<td>v1.35.4 pure Python</td>
<td>14.39</td>
</tr>
<tr>
<td>v1.35.4 compiled</td>
<td>11.35</td>
</tr>
</tbody>
</table>
<h2>[1.35.3] - 2024-10-30</h2>
<p>This release significantly improves performance, especially for large
files and large projects.</p>
<p>Formatting <a
href="https://github.com/openedx/edx-platform">https://github.com/openedx/edx-platform</a>
took 87 seconds in the previous version, now it takes only 4 seconds
(&gt;2000% speedup)! Tested on a 32-core computer.</p>
<ul>
<li>Performance improved by caching some functions. Thanks to <a
href="https://github.com/JCWasmx86"><code>@​JCWasmx86</code></a>!</li>
<li>Removed the limitation on the number of workers introduced in
v1.35.0.</li>
<li>Drop Python 3.8 support.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="f908697f4e"><code>f908697</code></a>
chore: v1.36.1</li>
<li><a
href="92e2e84f64"><code>92e2e84</code></a>
chore(deps): lock file maintenance</li>
<li><a
href="96fec0e0e1"><code>96fec0e</code></a>
chore(deps): update dependency
<code>@​ianvs/prettier-plugin-sort-imports</code> to v4.4.0</li>
<li><a
href="a7050555f8"><code>a705055</code></a>
chore(deps): lock file maintenance</li>
<li><a
href="21dc6a12d7"><code>21dc6a1</code></a>
perf: simple skip for unformatted blocks (<a
href="https://redirect.github.com/djlint/djLint/issues/1005">#1005</a>)</li>
<li><a
href="9dc7ea3cb6"><code>9dc7ea3</code></a>
chore(deps): lock file maintenance</li>
<li><a
href="14530c8356"><code>14530c8</code></a>
chore: v1.36.0</li>
<li><a
href="d97be3b90e"><code>d97be3b</code></a>
fix: types.py -&gt; types.pyi</li>
<li><a
href="012ee62d47"><code>012ee62</code></a>
chore(deps): lock file maintenance</li>
<li><a
href="1afeeb87cf"><code>1afeeb8</code></a>
fix: fix type hint</li>
<li>Additional commits viewable in <a
href="https://github.com/djlint/djLint/compare/v1.35.2...v1.36.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=djlint&package-manager=pip&previous-version=1.35.2&new-version=1.36.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2024-11-11 13:10:24 -05:00
David Larlet
ce59ee8544
chore: bump mkdocs-material from 9.5.42 to 9.5.44 (#2255)
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material)
from 9.5.42 to 9.5.44.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/squidfunk/mkdocs-material/releases">mkdocs-material's
releases</a>.</em></p>
<blockquote>
<h2>mkdocs-material-9.5.44</h2>
<ul>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7672">#7672</a>:
Font CSS 404's when using privacy plugin (9.5.43 regression)</li>
</ul>
<p>Thanks go to <a
href="https://github.com/nejch"><code>@​nejch</code></a> for their
contributions.</p>
<h2>mkdocs-material-9.5.43</h2>
<ul>
<li>Added support for external images in SVGs in privacy plugin</li>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7651">#7651</a>:
Privacy plugin doesn't handle quoted URLs in CSS</li>
</ul>
<p>Thanks go to <a
href="https://github.com/nejch"><code>@​nejch</code></a> for their
contributions</p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG">mkdocs-material's
changelog</a>.</em></p>
<blockquote>
<p>mkdocs-material-9.5.44 (2024-11-05)</p>
<ul>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7672">#7672</a>:
Font CSS 404's when using privacy plugin (9.5.43 regression)</li>
</ul>
<p>mkdocs-material-9.5.43 (2024-10-31)</p>
<ul>
<li>Added support for external images in SVGs in privacy plugin</li>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7651">#7651</a>:
Privacy plugin doesn't handle quoted URLs in CSS</li>
</ul>
<p>mkdocs-material-9.5.42 (2024-10-20)</p>
<ul>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7625">#7625</a>:
Invalid encoding of boolean attributes in privacy plugin</li>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7624">#7624</a>:
Crash when disabling privacy plugin (9.5.41 regression)</li>
</ul>
<p>mkdocs-material-9.5.41 (2024-10-15)</p>
<ul>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7619">#7619</a>:
Improved tooltip on logo disappears after instant navigation</li>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7616">#7616</a>:
Race condition in built-in privacy plugin when inlining assets</li>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7615">#7615</a>:
Comments and &quot;Was this page helpful?&quot; visible when
printing</li>
</ul>
<p>mkdocs-material-9.5.40 (2024-10-10)</p>
<ul>
<li>Updated Latvian translations</li>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7597">#7597</a>:
Social cards not using site name on home page</li>
</ul>
<p>mkdocs-material-9.5.39+insiders-4.53.14 (2024-09-29)</p>
<ul>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7567">#7567</a>:
Empty headlines when using typeset plugin with anchorlinks</li>
</ul>
<p>mkdocs-material-9.5.39 (2024-09-29)</p>
<ul>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7226">#7226</a>:
not staying on page when using mike's canonical versioning</li>
</ul>
<p>mkdocs-material-9.5.38 (2024-09-26)</p>
<ul>
<li>Added Albanian translations</li>
</ul>
<p>mkdocs-material-9.5.37 (2024-09-25)</p>
<ul>
<li>Added 4th and 5th level ordered list styles</li>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7548">#7548</a>:
Tags have no spacing in search</li>
</ul>
<p>mkdocs-material-9.5.36 (2024-09-21)</p>
<ul>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7544">#7544</a>:
Social cards incorrectly rendering HTML entities</li>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7542">#7542</a>:
Improved support for setting custom list styles</li>
</ul>
<p>mkdocs-material-9.5.35 (2024-09-18)</p>
<ul>
<li>Fixed <a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7498">#7498</a>:
Search not showing for Vietnamese language</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="aa4ef560f0"><code>aa4ef56</code></a>
Prepare 9.5.44 release</li>
<li><a
href="eb63b608e2"><code>eb63b60</code></a>
Fixed file save regression in privacy plugin (<a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7673">#7673</a>)</li>
<li><a
href="ac3315fd3e"><code>ac3315f</code></a>
Updated dependencies</li>
<li><a
href="8a60b49328"><code>8a60b49</code></a>
Prepare 9.5.43 release</li>
<li><a
href="f82a345f3a"><code>f82a345</code></a>
Documentation</li>
<li><a
href="4918a10d8f"><code>4918a10</code></a>
Added support for quoted external CSS URLs in privacy plugin (<a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7651">#7651</a>)</li>
<li><a
href="7dc96f1e13"><code>7dc96f1</code></a>
Added support for downloading external images in SVG for privacy plugin
(<a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7650">#7650</a>)</li>
<li><a
href="1357cd26af"><code>1357cd2</code></a>
Updated dependencies</li>
<li><a
href="198a6801fc"><code>198a680</code></a>
Documentation (<a
href="https://redirect.github.com/squidfunk/mkdocs-material/issues/7633">#7633</a>)</li>
<li><a
href="9aebe1498e"><code>9aebe14</code></a>
Updated dependencies</li>
<li>See full diff in <a
href="https://github.com/squidfunk/mkdocs-material/compare/9.5.42...9.5.44">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=mkdocs-material&package-manager=pip&previous-version=9.5.42&new-version=9.5.44)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2024-11-11 13:10:15 -05:00
dependabot[bot]
4a523b491b
chore: bump djlint from 1.35.2 to 1.36.1
Bumps [djlint](https://github.com/djlint/djLint) from 1.35.2 to 1.36.1.
- [Release notes](https://github.com/djlint/djLint/releases)
- [Changelog](https://github.com/djlint/djLint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/djlint/djLint/compare/v1.35.2...v1.36.1)

---
updated-dependencies:
- dependency-name: djlint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-11 18:02:31 +00:00
dependabot[bot]
59b255054a
chore: bump mkdocs-material from 9.5.42 to 9.5.44
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.42 to 9.5.44.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.5.42...9.5.44)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-11 18:02:30 +00:00
David Larlet
641bff4992
chore: bump django from 5.1.2 to 5.1.3 (#2256)
Bumps [django](https://github.com/django/django) from 5.1.2 to 5.1.3.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="69bf08e3a3"><code>69bf08e</code></a>
[5.1.x] Bumped version for 5.1.3 release.</li>
<li><a
href="e3984ca5d1"><code>e3984ca</code></a>
[5.1.x] Added release date for 5.1.3.</li>
<li><a
href="4ae358122b"><code>4ae3581</code></a>
[5.1.x] Made minor edits to form fields docs.</li>
<li><a
href="9fa2d235c9"><code>9fa2d23</code></a>
[5.1.x] Fixed <a
href="https://redirect.github.com/django/django/issues/35876">#35876</a>
-- Displayed non-ASCII fieldset names when rendering Mod...</li>
<li><a
href="5045dab4f9"><code>5045dab</code></a>
[5.1.x] Added missing lang attributes to html elements in docs.</li>
<li><a
href="ffc67aac1e"><code>ffc67aa</code></a>
[5.1.x] Fixed <a
href="https://redirect.github.com/django/django/issues/35864">#35864</a>
-- Documented EmailMessage.connection is ignored when us...</li>
<li><a
href="4915feaaf7"><code>4915fea</code></a>
[5.1.x] Fixed <a
href="https://redirect.github.com/django/django/issues/35873">#35873</a>
-- Corrected Form.as_table() call in form docs.</li>
<li><a
href="b57a8395b5"><code>b57a839</code></a>
[5.1.x] Refs <a
href="https://redirect.github.com/django/django/issues/35844">#35844</a>
-- Expanded compatibility for expected error messages in ...</li>
<li><a
href="c5ddc8550c"><code>c5ddc85</code></a>
[5.1.x] Corrected note on importing fields in model field reference
docs.</li>
<li><a
href="0a1091f118"><code>0a1091f</code></a>
[5.1.x] Removed unneeded OS reference on running the test suite in
contributi...</li>
<li>Additional commits viewable in <a
href="https://github.com/django/django/compare/5.1.2...5.1.3">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=django&package-manager=pip&previous-version=5.1.2&new-version=5.1.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2024-11-11 13:01:51 -05:00
David Larlet
81c494cbde
chore: bump ruff from 0.7.1 to 0.7.3 (#2253)
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.1 to 0.7.3.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/astral-sh/ruff/releases">ruff's
releases</a>.</em></p>
<blockquote>
<h2>0.7.3</h2>
<h2>Release Notes</h2>
<h3>Preview features</h3>
<ul>
<li>Formatter: Disallow single-line implicit concatenated strings (<a
href="https://redirect.github.com/astral-sh/ruff/pull/13928">#13928</a>)</li>
<li>[<code>flake8-pyi</code>] Include all Python file types for
<code>PYI006</code> and <code>PYI066</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14059">#14059</a>)</li>
<li>[<code>flake8-simplify</code>] Implement
<code>split-of-static-string</code> (<code>SIM905</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14008">#14008</a>)</li>
<li>[<code>refurb</code>] Implement <code>subclass-builtin</code>
(<code>FURB189</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14105">#14105</a>)</li>
<li>[<code>ruff</code>] Improve diagnostic messages and docs
(<code>RUF031</code>, <code>RUF032</code>, <code>RUF034</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14068">#14068</a>)</li>
</ul>
<h3>Rule changes</h3>
<ul>
<li>Detect items that hash to same value in duplicate sets
(<code>B033</code>, <code>PLC0208</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14064">#14064</a>)</li>
<li>[<code>eradicate</code>] Better detection of IntelliJ language
injection comments (<code>ERA001</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14094">#14094</a>)</li>
<li>[<code>flake8-pyi</code>] Add autofix for
<code>docstring-in-stub</code> (<code>PYI021</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14150">#14150</a>)</li>
<li>[<code>flake8-pyi</code>] Update
<code>duplicate-literal-member</code> (<code>PYI062</code>) to alawys
provide an autofix (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14188">#14188</a>)</li>
<li>[<code>pyflakes</code>] Detect items that hash to same value in
duplicate dictionaries (<code>F601</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14065">#14065</a>)</li>
<li>[<code>ruff</code>] Fix false positive for decorators
(<code>RUF028</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14061">#14061</a>)</li>
</ul>
<h3>Bug fixes</h3>
<ul>
<li>Avoid parsing joint rule codes as distinct codes in <code>#
noqa</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/12809">#12809</a>)</li>
<li>[<code>eradicate</code>] ignore <code># language=</code> in
commented-out-code rule (ERA001) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14069">#14069</a>)</li>
<li>[<code>flake8-bugbear</code>] - do not run
<code>mutable-argument-default</code> on stubs (<code>B006</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14058">#14058</a>)</li>
<li>[<code>flake8-builtins</code>] Skip lambda expressions in
<code>builtin-argument-shadowing (A002)</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14144">#14144</a>)</li>
<li>[<code>flake8-comprehension</code>] Also remove trailing comma while
fixing <code>C409</code> and <code>C419</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14097">#14097</a>)</li>
<li>[<code>flake8-simplify</code>] Allow <code>open</code> without
context manager in <code>return</code> statement (<code>SIM115</code>)
(<a
href="https://redirect.github.com/astral-sh/ruff/pull/14066">#14066</a>)</li>
<li>[<code>pylint</code>] Respect hash-equivalent literals in
<code>iteration-over-set</code> (<code>PLC0208</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14063">#14063</a>)</li>
<li>[<code>pylint</code>] Update known dunder methods for Python 3.13
(<code>PLW3201</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14146">#14146</a>)</li>
<li>[<code>pyupgrade</code>] - ignore kwarg unpacking for
<code>UP044</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14053">#14053</a>)</li>
<li>[<code>refurb</code>] Parse more exotic decimal strings in
<code>verbose-decimal-constructor</code> (<code>FURB157</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14098">#14098</a>)</li>
</ul>
<h3>Documentation</h3>
<ul>
<li>Add links to missing related options within rule documentations (<a
href="https://redirect.github.com/astral-sh/ruff/pull/13971">#13971</a>)</li>
<li>Add rule short code to mkdocs tags to allow searching via rule codes
(<a
href="https://redirect.github.com/astral-sh/ruff/pull/14040">#14040</a>)</li>
</ul>
<h2>Install ruff 0.7.3</h2>
<h3>Install prebuilt binaries via shell script</h3>
<pre lang="sh"><code>curl --proto '=https' --tlsv1.2 -LsSf
https://github.com/astral-sh/ruff/releases/download/0.7.3/ruff-installer.sh
| sh
</code></pre>
<h3>Install prebuilt binaries via powershell script</h3>
<pre lang="sh"><code>powershell -ExecutionPolicy ByPass -c &quot;irm
https://github.com/astral-sh/ruff/releases/download/0.7.3/ruff-installer.ps1
| iex&quot;
&lt;/tr&gt;&lt;/table&gt; 
</code></pre>
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md">ruff's
changelog</a>.</em></p>
<blockquote>
<h2>0.7.3</h2>
<h3>Preview features</h3>
<ul>
<li>Formatter: Disallow single-line implicit concatenated strings (<a
href="https://redirect.github.com/astral-sh/ruff/pull/13928">#13928</a>)</li>
<li>[<code>flake8-pyi</code>] Include all Python file types for
<code>PYI006</code> and <code>PYI066</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14059">#14059</a>)</li>
<li>[<code>flake8-simplify</code>] Implement
<code>split-of-static-string</code> (<code>SIM905</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14008">#14008</a>)</li>
<li>[<code>refurb</code>] Implement <code>subclass-builtin</code>
(<code>FURB189</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14105">#14105</a>)</li>
<li>[<code>ruff</code>] Improve diagnostic messages and docs
(<code>RUF031</code>, <code>RUF032</code>, <code>RUF034</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14068">#14068</a>)</li>
</ul>
<h3>Rule changes</h3>
<ul>
<li>Detect items that hash to same value in duplicate sets
(<code>B033</code>, <code>PLC0208</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14064">#14064</a>)</li>
<li>[<code>eradicate</code>] Better detection of IntelliJ language
injection comments (<code>ERA001</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14094">#14094</a>)</li>
<li>[<code>flake8-pyi</code>] Add autofix for
<code>docstring-in-stub</code> (<code>PYI021</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14150">#14150</a>)</li>
<li>[<code>flake8-pyi</code>] Update
<code>duplicate-literal-member</code> (<code>PYI062</code>) to alawys
provide an autofix (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14188">#14188</a>)</li>
<li>[<code>pyflakes</code>] Detect items that hash to same value in
duplicate dictionaries (<code>F601</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14065">#14065</a>)</li>
<li>[<code>ruff</code>] Fix false positive for decorators
(<code>RUF028</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14061">#14061</a>)</li>
</ul>
<h3>Bug fixes</h3>
<ul>
<li>Avoid parsing joint rule codes as distinct codes in <code>#
noqa</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/12809">#12809</a>)</li>
<li>[<code>eradicate</code>] ignore <code># language=</code> in
commented-out-code rule (ERA001) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14069">#14069</a>)</li>
<li>[<code>flake8-bugbear</code>] - do not run
<code>mutable-argument-default</code> on stubs (<code>B006</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14058">#14058</a>)</li>
<li>[<code>flake8-builtins</code>] Skip lambda expressions in
<code>builtin-argument-shadowing (A002)</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14144">#14144</a>)</li>
<li>[<code>flake8-comprehension</code>] Also remove trailing comma while
fixing <code>C409</code> and <code>C419</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14097">#14097</a>)</li>
<li>[<code>flake8-simplify</code>] Allow <code>open</code> without
context manager in <code>return</code> statement (<code>SIM115</code>)
(<a
href="https://redirect.github.com/astral-sh/ruff/pull/14066">#14066</a>)</li>
<li>[<code>pylint</code>] Respect hash-equivalent literals in
<code>iteration-over-set</code> (<code>PLC0208</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14063">#14063</a>)</li>
<li>[<code>pylint</code>] Update known dunder methods for Python 3.13
(<code>PLW3201</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14146">#14146</a>)</li>
<li>[<code>pyupgrade</code>] - ignore kwarg unpacking for
<code>UP044</code> (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14053">#14053</a>)</li>
<li>[<code>refurb</code>] Parse more exotic decimal strings in
<code>verbose-decimal-constructor</code> (<code>FURB157</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14098">#14098</a>)</li>
</ul>
<h3>Documentation</h3>
<ul>
<li>Add links to missing related options within rule documentations (<a
href="https://redirect.github.com/astral-sh/ruff/pull/13971">#13971</a>)</li>
<li>Add rule short code to mkdocs tags to allow searching via rule codes
(<a
href="https://redirect.github.com/astral-sh/ruff/pull/14040">#14040</a>)</li>
</ul>
<h2>0.7.2</h2>
<h3>Preview features</h3>
<ul>
<li>Fix formatting of single with-item with trailing comment (<a
href="https://redirect.github.com/astral-sh/ruff/pull/14005">#14005</a>)</li>
<li>[<code>pyupgrade</code>] Add PEP 646 <code>Unpack</code> conversion
to <code>*</code> with fix (<code>UP044</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/13988">#13988</a>)</li>
</ul>
<h3>Rule changes</h3>
<ul>
<li>Regenerate <code>known_stdlibs.rs</code> with stdlibs 2024.10.25 (<a
href="https://redirect.github.com/astral-sh/ruff/pull/13963">#13963</a>)</li>
<li>[<code>flake8-no-pep420</code>] Skip namespace package enforcement
for PEP 723 scripts (<code>INP001</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/pull/13974">#13974</a>)</li>
</ul>
<h3>Server</h3>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="fbf140a665"><code>fbf140a</code></a>
Bump version to 0.7.3 (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14197">#14197</a>)</li>
<li><a
href="670f958525"><code>670f958</code></a>
[red-knot] Fix intersection simplification for
<code>~Any</code>/<code>~Unknown</code> (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14195">#14195</a>)</li>
<li><a
href="fed35a25e8"><code>fed35a2</code></a>
[red-knot] Fix <code>is_assignable_to</code> for unions (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14196">#14196</a>)</li>
<li><a
href="d1ef418bb0"><code>d1ef418</code></a>
Docs: tweak rules documentation (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14180">#14180</a>)</li>
<li><a
href="272d24bf3e"><code>272d24b</code></a>
[<code>flake8-pyi</code>] Add a fix for
<code>duplicate-literal-member</code> (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14188">#14188</a>)</li>
<li><a
href="2624249219"><code>2624249</code></a>
[red-knot] Minor: fix <code>Literal[True] &lt;: int</code> (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14177">#14177</a>)</li>
<li><a
href="4b08d17088"><code>4b08d17</code></a>
[red-knot] Add a new <code>Type::KnownInstanceType</code> variant (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14155">#14155</a>)</li>
<li><a
href="5b6169b02d"><code>5b6169b</code></a>
[red-knot] Minor fix in intersection type comment (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14176">#14176</a>)</li>
<li><a
href="2040e93add"><code>2040e93</code></a>
[<code>flake8-logging-format</code>] Fix invalid formatting value in
docs of `logging-ex...</li>
<li><a
href="794eb886e4"><code>794eb88</code></a>
[<code>flake8-bandit</code>] Typo in docs
<code>suspicious-pickle-import</code> (<code>S403</code>) (<a
href="https://redirect.github.com/astral-sh/ruff/issues/14175">#14175</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/astral-sh/ruff/compare/0.7.1...0.7.3">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=ruff&package-manager=pip&previous-version=0.7.1&new-version=0.7.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2024-11-11 13:01:21 -05:00
dependabot[bot]
24c1075665
chore: bump django from 5.1.2 to 5.1.3
Bumps [django](https://github.com/django/django) from 5.1.2 to 5.1.3.
- [Commits](https://github.com/django/django/compare/5.1.2...5.1.3)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-11 17:20:59 +00:00
dependabot[bot]
3451ce6d47
chore: bump ruff from 0.7.1 to 0.7.3
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.1 to 0.7.3.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.7.1...0.7.3)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-11 17:20:41 +00:00
David Larlet
e0ca66f186
docs: from MonComptePro to ProConnect by @C-Sophie
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
Refs #2251
2024-11-07 20:21:32 -05:00
David Larlet
3b90bc11eb
docs: Change AgentConnect to ProConnect
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
2024-11-06 08:34:10 -05:00
Yohan Boniface
256d4487e7
chore: introduce SaveManager class (#2240)
Some checks failed
Test & Docs / tests (postgresql, 3.10) (push) Has been cancelled
Test & Docs / tests (postgresql, 3.12) (push) Has been cancelled
Test & Docs / lint (push) Has been cancelled
Test & Docs / docs (push) Has been cancelled
The last refactor of the save process
(0fdb70ce66) has introduced a bug: the
save flow was not more stopped when a layer fail to save. This ends with
a broken UI, as the map is not dirty anymore, so the save button is not
active anymore, while at least one layer still needs to be saved.

Save can fail in two scenarios:
  - there is a conflict (status 412)
  - the server is down or as an issue (eg. disk is full)

I tried a more modest scenario (listening for status in map.save and
recallign the map save after a conflict), but this ended with calling
map.save uselessly even more.

So I decided to try this refactor, which also totally remove the useless
map.save we were sending at each save until now.
2024-10-30 18:27:37 +01:00
Yohan Boniface
36efa9c4cc chore: use SAVEMANAGER as a module singleton 2024-10-30 17:14:35 +01:00
Yohan Boniface
488b5882e7 fixup: renaming 2024-10-30 09:43:31 +01:00
Yohan Boniface
7f65b1de57 chore: listen for later _trySave status 2024-10-30 09:42:06 +01:00
Yohan Boniface
7e2fee4f69
chore: bump ruff from 0.7.0 to 0.7.1 (#2242) 2024-10-28 18:31:57 +01:00
Yohan Boniface
2e4626b5df
chore: bump uwsgi from 2.0.27 to 2.0.28 (#2241)
Bumps [uwsgi](https://uwsgi-docs.readthedocs.io/en/latest/) from 2.0.27
to 2.0.28.


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=uwsgi&package-manager=pip&previous-version=2.0.27&new-version=2.0.28)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2024-10-28 18:31:13 +01:00
dependabot[bot]
bd9693e8c5
chore: bump ruff from 0.7.0 to 0.7.1
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.7.0...0.7.1)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-28 17:20:51 +00:00
dependabot[bot]
58deb4ffbd
chore: bump uwsgi from 2.0.27 to 2.0.28
Bumps [uwsgi](https://uwsgi-docs.readthedocs.io/en/latest/) from 2.0.27 to 2.0.28.

---
updated-dependencies:
- dependency-name: uwsgi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-28 17:20:34 +00:00
Yohan Boniface
ed232e59b8 chore: introduce SaveManager class
The last refactor of the save process (0fdb70ce66)
has introduced a bug: the save flow was not more stopped when a layer fail to save.
This ends with a broken UI, as the map is not dirty anymore, so the save button
is not active anymore, while at least one layer still needs to be saved.

Save can fail in two scenarios:
  - there is a conflict (status 412)
  - the server is down or as an issue (eg. disk is full)

I tried a more modest scenario (listening for status in map.save and
recallign the map save after a conflict), but this ended with calling
map.save uselessly even more.

So I decided to try this refactor, which also totally remove the useless
map.save we were sending at each save until now.
2024-10-28 18:15:18 +01:00
Yohan Boniface
bcea419bfd 2.7.1 2024-10-25 15:44:52 +02:00
Yohan Boniface
a16f6d409c
fix: always unset editedFeature on editPanel close (#2237)
And only this panel.

This was creating a weird bug, steps to reproduce:

- create a marker
- shift-click on the marker to edit the layer (so without explicitly
closing the panel)
- try to type the layer name: the panel would close

This is also because currently the schema and render() are too dump, and
when any `name` is changed then the `data` reflow is called, while it
should not when editing the datalayer name.

We want to:
- have more targeted schema
- have more specific reflow in render

But that's for other PRs!
2024-10-25 15:40:47 +02:00
Yohan Boniface
b36c03a203 fix: prevent feature.edit to be called twice on polygon/line end edit
When finishing drawing a polygon/line, Leaflet.Editable will send
both `editable:drawing:end` and `editable:drawing:commit`. In normal
flow, we only need to listen to the later, and we only need to
listen for the former in the case of pressing escape while drawing.
2024-10-24 21:07:58 +02:00
Yohan Boniface
71b55e7759 fix: always unset editedFeature on editPanel close
And only this panel.

This was creating a weird bug, steps to reproduce:

- create a marker
- shift-click on the marker to edit the layer (so without explicitly
  closing the panel)
- try to type the layer name: the panel would close

This is also because currently the schema and render() are too
dump, and when any `name` is changed then the `data` reflow is
called, while it should not when editing the datalayer name.

We want to:
- have more targeted schema
- have more specific reflow in render

But that's for other PRs!
2024-10-24 19:22:46 +02:00
Yohan Boniface
023f48ee94
chore: use shutil.move instead of Path.rename to move to purgatory (#2236)
Otherwise it will fail if src and dest are not on the same FS.
2024-10-24 19:18:21 +02:00
Yohan Boniface
928ce8232c chore: better document UMAP_PURGATORY_ROOT 2024-10-24 18:28:44 +02:00
Yohan Boniface
c6c255e216 chore: use shutil.move instead of Path.rename to move to purgatory
Otherwise it will fail if src and dest are not on the same FS.
2024-10-22 12:14:04 +02:00
459 changed files with 35589 additions and 22637 deletions

View file

@ -5,7 +5,7 @@
"es6": true
},
"parserOptions": {
"ecmaVersion": 2020,
"ecmaVersion": 2021,
"sourceType": "module"
}
}

26
.github/workflows/release-helm.yml vendored Normal file
View file

@ -0,0 +1,26 @@
name: Release Charts
on:
push:
branches:
- master
jobs:
release:
# depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions
# see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
permissions:
contents: write
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Publish Helm charts
uses: stefanprodan/helm-gh-pages@v1.7.0
with:
charts_dir: charts
linting: off
token: ${{ secrets.GITHUB_TOKEN }}

View file

@ -4,7 +4,9 @@ on:
push:
branches: [master]
pull_request:
branches: [master]
path:
- umap/*
- pyproject.toml
jobs:
tests:
@ -20,7 +22,11 @@ jobs:
POSTGRES_PASSWORD: postgres
POSTGRES_DB: postgres
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
redis:
image: redis
options: --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
ports:
- 6379:6379
strategy:
fail-fast: false
matrix:
@ -48,6 +54,8 @@ jobs:
DJANGO_SETTINGS_MODULE: 'umap.tests.settings'
UMAP_SETTINGS: 'umap/tests/settings.py'
PLAYWRIGHT_TIMEOUT: '20000'
REDIS_HOST: localhost
REDIS_PORT: 6379
lint:
runs-on: ubuntu-latest
steps:
@ -55,7 +63,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
- name: Install dependencies
run: |
python3 -m pip install -e .[test,dev]
@ -66,18 +74,3 @@ jobs:
- name: Run Docs
run: make docs
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Install dependencies
run: |
python3 -m pip install -r docs/requirements.txt
- name: Run Docs
run: mkdocs build

5
.gitignore vendored
View file

@ -25,3 +25,8 @@ test-results/
### Transifex ###
tx
# Helm
charts/*/charts
helmfile.yaml
charts/*/Chart.lock

View file

@ -1,10 +1,9 @@
# This part installs deps needed at runtime.
FROM python:3.11-slim AS common
FROM python:3.12-slim AS common
RUN apt-get update && \
apt-get install -y --no-install-recommends \
tini \
uwsgi \
sqlite3 \
libpq-dev \
gdal-bin \
@ -39,7 +38,7 @@ WORKDIR /srv/umap
COPY . /srv/umap
RUN /venv/bin/pip install .[docker]
RUN /venv/bin/pip install .[docker,s3,sync]
FROM common

View file

@ -7,7 +7,7 @@ install: ## Install the dependencies
.PHONY: develop
develop: ## Install the test and dev dependencies
python3 -m pip install -e .[test,dev,sync]
python3 -m pip install -e .[test,dev,sync,s3]
playwright install
.PHONY: format
@ -46,6 +46,13 @@ docker: ## Create a new Docker image and publish it
docker build -t umap/umap:${VERSION} .
docker push umap/umap:${VERSION}
.PHONY: helm
helm: ## Build the helm chart and publish it
$(eval VERSION=$(shell hatch version))
$(eval PACKAGE=$(shell helm package --dependency-update --app-version ${VERSION} ./charts/umap | grep "Successfully packaged" | awk '{print $$NF}'))
@echo "Successfully packaged helm chart in: ${PACKAGE}"
helm push ${PACKAGE} oci://registry-1.docker.io/umap
.PHONY: build
build: ## Build the Python package before release
@hatch build --clean
@ -58,7 +65,7 @@ publish: ## Publish the Python package to Pypi
test: testpy testjs
testpy:
pytest -vv umap/tests/ --dist=loadgroup --reruns 1
pytest -vv umap/tests/ --dist=loadgroup --reruns 1 --maxfail 10
test-integration:
pytest -xv umap/tests/integration/ --dist=loadgroup
@ -85,7 +92,7 @@ tx_pull:
changelog:
$(eval VERSION=$(shell hatch version))
@# Bearer token is readonly
@printf $(shell curl -sL -X POST -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/umap-project/umap/releases/generate-notes -d '{"target_commitish":"master","previous_tag_name":"", "tag_name": "${VERSION}"}' | jq .body | sed 's/https:\/\/github.com\/umap-project\/umap\/pull\//#/g')
@printf $(shell curl -sL -X POST -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/umap-project/umap/releases/generate-notes -d '{"target_commitish":"master","previous_tag_name":"", "tag_name": "${VERSION}"}' | jq .body | sed 's/https:\/\/github.com\/umap-project\/umap\/pull\//#/g' | sed 's/`/\\`/g')
jsdir = umap/static/umap/js/
filepath = "${jsdir}*.js"

View file

@ -1,4 +1,8 @@
{
"files": {
"include": ["umap/static/umap/js/**"],
"ignore": ["umap/static/umap/vendors/**"]
},
"formatter": {
"enabled": true,
"formatWithErrors": false,
@ -14,7 +18,11 @@
"rules": {
"style": {
"useBlockStatements": "off",
"noShoutyConstants": "warn"
"noShoutyConstants": "warn",
"noParameterAssign": "off"
},
"complexity": {
"noForEach": "off"
},
"performance": {
"noDelete": "off"

23
charts/umap/.helmignore Normal file
View file

@ -0,0 +1,23 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*.orig
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/

16
charts/umap/Chart.yaml Normal file
View file

@ -0,0 +1,16 @@
apiVersion: v2
name: umap
description: A Helm chart to deploy umap on Kubernetes
type: application
version: 0.1.0
appVersion: "2.7.2"
dependencies:
- name: cnpg-cluster
version: 2.0.1
repository: https://charts.enix.io/
alias: cnpg
condition: cnpg.enabled

View file

@ -0,0 +1,73 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "umap.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- end }}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "umap.fullname" -}}
{{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
{{- else }}
{{- $name := default .Chart.Name .Values.nameOverride }}
{{- if contains $name .Release.Name }}
{{- .Release.Name | trunc 63 | trimSuffix "-" }}
{{- else }}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
{{- end }}
{{- end }}
{{- end }}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "umap.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end }}
{{/*
Common labels
*/}}
{{- define "umap.labels" -}}
helm.sh/chart: {{ include "umap.chart" . }}
{{ include "umap.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end }}
{{/*
Selector labels
*/}}
{{- define "umap.selectorLabels" -}}
app.kubernetes.io/name: {{ include "umap.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}
{{/*
Create the name of the service account to use
*/}}
{{- define "umap.serviceAccountName" -}}
{{- if .Values.serviceAccount.create }}
{{- default (include "umap.fullname" .) .Values.serviceAccount.name }}
{{- else }}
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
{{- end }}
{{/*
Get the name of the persistent volume claim
*/}}
{{- define "umap.pvcName" -}}
{{- if .Values.persistence.existingClaim -}}
{{- printf "%s" (tpl .Values.persistence.existingClaim $) -}}
{{- else -}}
{{- printf "%s" (include "umap.fullname" .) -}}
{{- end -}}
{{- end -}}

View file

@ -0,0 +1,110 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "umap.fullname" . }}
labels:
{{- include "umap.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "umap.selectorLabels" . | nindent 6 }}
template:
metadata:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/secret-config.yaml") . | sha256sum }}
checksum/env: {{ include (print $.Template.BasePath "/secret-env.yaml") . | sha256sum }}
{{- with .Values.podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "umap.labels" . | nindent 8 }}
{{- with .Values.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "umap.serviceAccountName" . }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
containers:
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: http
containerPort: {{ .Values.service.port }}
protocol: TCP
startupProbe:
httpGet:
path: /stats
port: http
livenessProbe:
httpGet:
path: /stats
port: http
readinessProbe:
httpGet:
path: /stats
port: http
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- if .Values.cnpg.enabled }}
env:
- name: DATABASE_URL
valueFrom:
secretKeyRef:
name: {{ .Release.Name }}-cnpg-app
key: uri
- name: UMAP_SETTINGS
value: /etc/umap/umap.conf
{{- end }}
envFrom:
- secretRef:
{{- if .Values.umap.envFromSecret }}
name: {{ .Values.umap.envFromSecret }}
{{- else }}
name: {{ include "umap.fullname" . }}-env
{{- end }}
volumeMounts:
- name: config
mountPath: /etc/umap/
readOnly: true
- name: statics
mountPath: /srv/umap/static
{{- if .Values.persistence.enabled }}
- name: data
mountPath: /srv/umap/uploads/
{{- end }}
volumes:
- name: config
secret:
{{- if .Values.umap.configFromSecret }}
secretName: {{ .Values.umap.configFromSecret }}
{{- else }}
secretName: {{ include "umap.fullname" . }}-config
{{- end }}
- name: statics
emptyDir: {}
{{- if .Values.persistence.enabled }}
- name: data
persistentVolumeClaim:
claimName: {{ include "umap.pvcName" . }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}

View file

@ -0,0 +1,31 @@
{{- if .Values.ingress.enabled -}}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ include "umap.fullname" . }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingress.className }}
tls:
- hosts:
{{- range .Values.ingress.hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ include "umap.fullname" . }}-tls
rules:
{{- range .Values.ingress.hosts }}
- host: {{ . | quote }}
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: {{ include "umap.fullname" $ }}
port:
number: {{ $.Values.service.port }}
{{- end }}
{{- end }}

View file

@ -0,0 +1,24 @@
{{- if and (.Values.persistence.enabled) (not .Values.persistence.existingClaim) }}
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
{{- if .Values.persistence.annotations }}
annotations:
{{- toYaml .Values.persistence.annotations | nindent 4 }}
{{- end }}
name: {{ include "umap.pvcName" . }}
labels:
{{- include "umap.labels" . | nindent 4 }}
spec:
accessModes:
{{- range .Values.persistence.accessModes }}
- {{ . | quote }}
{{- end }}
{{- with .Values.persistence.resources }}
resources:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- if .Values.persistence.storageClassName }}
storageClassName: {{ .Values.persistence.storageClassName | quote }}
{{- end }}
{{- end }}

View file

@ -0,0 +1,11 @@
{{ if not .Values.umap.configFromSecret }}
apiVersion: v1
kind: Secret
metadata:
name: {{ include "umap.fullname" . }}-config
labels:
{{- include "umap.labels" . | nindent 4 }}
type: Opaque
data:
umap.conf: {{ .Values.umap.config | b64enc }}
{{- end }}

View file

@ -0,0 +1,13 @@
{{ if not .Values.umap.envFromSecret }}
apiVersion: v1
kind: Secret
metadata:
name: {{ include "umap.fullname" . }}-env
labels:
{{- include "umap.labels" . | nindent 4 }}
type: Opaque
data:
{{- range $key, $value := .Values.umap.environment }}
{{ $key }}: "{{ $value | b64enc }}"
{{- end }}
{{- end }}

View file

@ -0,0 +1,15 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "umap.fullname" . }}
labels:
{{- include "umap.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
- port: {{ .Values.service.port }}
targetPort: http
protocol: TCP
name: http
selector:
{{- include "umap.selectorLabels" . | nindent 4 }}

View file

@ -0,0 +1,13 @@
{{- if .Values.serviceAccount.create -}}
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "umap.serviceAccountName" . }}
labels:
{{- include "umap.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
{{- end }}

125
charts/umap/values.yaml Normal file
View file

@ -0,0 +1,125 @@
# Default values for umap.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
image:
repository: umap/umap
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: ""
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
serviceAccount:
# Specifies whether a service account should be created
create: true
# Automatically mount a ServiceAccount's API credentials?
automount: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: ""
podAnnotations: {}
podLabels: {}
podSecurityContext:
runAsUser: 1000
runAsGroup: 1000
fsGroup: 1000
securityContext:
capabilities:
drop:
- ALL
readOnlyRootFilesystem: true
runAsNonRoot: true
runAsUser: 1000
service:
type: ClusterIP
port: 8000
ingress:
enabled: false
className: ""
annotations: {}
hosts:
- example.org
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}
umap:
# Set environment variables supported by umap here
# see: https://docs.umap-project.org/en/stable/config/settings/
environment:
SECRET_KEY: CHANGE_ME
STATIC_ROOT: /srv/umap/static
MEDIA_ROOT: /srv/umap/uploads
# Configure environment variables using an existing secret in the same namespace.
# In this case the values above are not used
envFromSecret: null
# You can also provide umap.conf content here:
config: |
from umap.settings.base import *
# See: https://github.com/umap-project/umap/blob/master/umap/settings/local.py.sample
# Configure config file using an existing secret in the same namespace.
# In this case the values above are not used
configFromSecret: null
persistence:
enabled: true
accessModes:
- ReadWriteOnce
annotations: {}
existingClaim: ""
storageClassName: ""
resources:
requests:
storage: 1Gi
# Configure Cloudnative-pg operator for Postgis database
# Alternatively, you can disable CNPG and provide your own
# Postgis database by setting the `umap.environment.DATABASE_URL`
cnpg:
enabled: true
replicaCount: 2
image:
repository: ghcr.io/cloudnative-pg/postgis
tag: 14
persistence:
storageClass: ""
size: 1Gi
clusterExtraSpec:
bootstrap:
initdb:
postInitTemplateSQL:
- CREATE EXTENSION postgis;
- CREATE EXTENSION postgis_topology;
- CREATE EXTENSION fuzzystrmatch;
- CREATE EXTENSION postgis_tiger_geocoder;
# See available values here: https://artifacthub.io/packages/helm/enix/cnpg-cluster?modal=values

View file

@ -1,5 +1,15 @@
services:
# Usefull only to use the real time collaboration
redis:
image: redis:latest
healthcheck:
test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
interval: 1s
timeout: 3s
retries: 5
command: ["redis-server"]
db:
healthcheck:
test: [ "CMD-SHELL", "pg_isready -U postgres" ]
@ -14,18 +24,35 @@ services:
depends_on:
db:
condition: service_healthy
image: umap/umap:2.0.2
ports:
- "${PORT-8000}:8000"
redis:
condition: service_healthy
image: umap/umap:3.0.2
environment:
- STATIC_ROOT=/srv/umap/static
- MEDIA_ROOT=/srv/umap/uploads
- DATABASE_URL=postgis://postgres@db/postgres
- SECRET_KEY=some-long-and-weirdly-unrandom-secret-key
- SITE_URL=https://umap.local/
- UMAP_ALLOW_ANONYMOUS=True
- DEBUG=1
- REALTIME_ENABLED=1
- REDIS_URL=redis://redis:6379
volumes:
- data:/srv/umap/uploads
- static:/srv/umap/static
proxy:
image: nginx:latest
ports:
- "8000:80"
volumes:
- ./docker/nginx.conf:/etc/nginx/nginx.conf:ro
- static:/static:ro
- data:/data:ro
depends_on:
- app
volumes:
data:
static:
db:

View file

@ -9,5 +9,5 @@ umap collectstatic --noinput
umap wait_for_database
# then migrate the database
umap migrate
# run uWSGI
exec uwsgi --ini docker/uwsgi.ini
# run the server
exec uvicorn --proxy-headers --no-access-log --host 0.0.0.0 umap.asgi:application

111
docker/nginx.conf Normal file
View file

@ -0,0 +1,111 @@
events {
worker_connections 1024; # Adjust this to your needs
}
http {
proxy_cache_path /tmp/nginx_ajax_proxy_cache levels=1:2 keys_zone=ajax_proxy:10m inactive=60m;
proxy_cache_key "$uri$is_args$args";
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
}
types {
application/javascript mjs;
}
include mime.types;
default_type application/octet-stream;
sendfile on;
keepalive_timeout 65;
# Server block
server {
listen 80;
server_name localhost;
# Static file serving
location /static/ {
alias /static/;
gzip on;
gzip_vary on;
gzip_proxied any;
gzip_types text/plain application/javascript application/x-javascript text/javascript text/xml text/css;
expires 365d;
access_log /dev/null;
}
# Geojson files
location /uploads/ {
alias /data/;
expires 30d;
}
location /favicon.ico {
alias /static/favicon.ico;
}
# X-Accel-Redirect
location /internal/ {
internal;
gzip_vary on;
gzip_static on;
add_header X-DataLayer-Version $upstream_http_x_datalayer_version;
alias /data/;
}
# Ajax proxy
location ~ ^/proxy/(.*) {
internal;
add_header X-Proxy-Cache $upstream_cache_status always;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache ajax_proxy;
proxy_cache_valid 1m; # Default. Umap will override using X-Accel-Expires
set $target_url $1;
# URL is encoded, so we need a few hack to clean it back.
if ( $target_url ~ (.+)%3A%2F%2F(.+) ){ # fix :// between scheme and destination
set $target_url $1://$2;
}
if ( $target_url ~ (.+?)%3A(.*) ){ # fix : between destination and port
set $target_url $1:$2;
}
if ( $target_url ~ (.+?)%2F(.*) ){ # fix / after port, the rest will be decoded by proxy_pass
set $target_url $1/$2;
}
resolver 8.8.8.8;
add_header X-Proxy-Target $target_url; # For debugging
proxy_pass_request_headers off;
proxy_set_header Content-Type $http_content_type;
proxy_set_header Content-Encoding $http_content_encoding;
proxy_set_header Content-Length $http_content_length;
proxy_read_timeout 10s;
proxy_connect_timeout 5s;
proxy_ssl_server_name on;
proxy_pass $target_url;
proxy_intercept_errors on;
error_page 301 302 307 = @handle_proxy_redirect;
}
location @handle_proxy_redirect {
resolver 8.8.8.8;
set $saved_redirect_location '$upstream_http_location';
proxy_pass $saved_redirect_location;
}
# Proxy pass to ASGI server
location / {
proxy_pass http://app:8000;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_redirect off;
proxy_buffering off;
}
}
}

View file

@ -1,26 +0,0 @@
[uwsgi]
http = :$(PORT)
home = /venv
module = umap.wsgi:application
master = True
vacuum = True
max-requests = 5000
processes = 4
enable-threads = true
static-map = /static=/srv/umap/static
static-map = /uploads=/srv/umap/uploads
buffer-size = 32768
; Run the websocket server only when the env variable
; WEBSOCKET_ENABLED is set to True.
; This is enough for the base docker image, but does not
; take into account the settings as the source of truth.
if-env = WEBSOCKET_ENABLED
websocket_enabled = %(_)
endif =
if-opt = websocket_enabled=True
print = Starting the Websocket Server (WEBSOCKET_ENABLED=%(websocket_enabled))
attach-daemon = umap run_websocket_server
endif =
lazy-apps = true

View file

@ -1,5 +1,11 @@
# Articles
## [Créer des cartes interactives personnalisées : uMap ou Leaflet ?](https://www.d-booker.fr/content/242-creer-des-cartes-interactives-personnalisees-umap-ou-leaflet) (2025-02-01)
> Dans ce guide, nous comparerons deux solutions libres populaires : uMap, une plateforme en ligne intuitive, et Leaflet, une bibliothèque JavaScript puissante.
[Article complet →](https://www.d-booker.fr/content/242-creer-des-cartes-interactives-personnalisees-umap-ou-leaflet){ .md-button }
## [Vers uMap 3 😱](https://www.openstreetmap.org/user/David%20Larlet/diary/404654#vers-umap-3-) (2024-07-16)
> La dernière version 2.4.X ouvre la voie à deux fonctionnalités majeures demandées : la collaboration en temps réel et les assistants dimport de données à distance en un clic.

View file

@ -77,6 +77,7 @@ Toute propriété de l'élément sera disponible, ainsi que:
- `{locale}` → la langue sous la forme `fr` ou `fr_CA` quand une variante est utilisée
- `{lang}` → la langue sous la forme `fr` ou `fr-ca` quand une variante est utilisée
- `{measure}` → la longueur d'une ligne ou la surface d'un polygone
- `{gain}`/`{loss}` → la dénivelée positive/négative d'une ligne (seulement si elle contient les altitudes)
- `{rank}` → la rang d'un élément dans son calque
- `{layer}` → le nom du calque de l'élément
- `{zoom}` → le zoom actuel de la carte
@ -91,3 +92,27 @@ Toute propriété de l'élément sera disponible, ainsi que:
- `{zoom}` → le zoom actuel de la carte
- `{lat}` → la latitude du centre actuel de la carte
- `{lng}` → la longitude du centre actuel de la carte
## Quels statuts peut avoir une carte ? {: #map-statuses}
### En accès
* **Brouillon (privé)**: Vous seul et votre équipe pouvez accéder à la carte.
* **Tout le monde (public)**: Tout le monde peut accéder à la carte, qui est visible dans la recherche et la page daccueil. La carte est indexée dans les moteurs de recherche (Google, etc.).
* **Quiconque a le lien**: La carte est visible par toutes les personnes qui en ont le lien. Elle nest pas indexée dans les moteurs de recherche.
* **Éditeurs et équipe seulement**: Vous seul et votre équipe pouvez accéder à la carte.
Les personnes affichant une carte à laquelle elles nont pas accès auront une page derreur 403.
### En édition
* **Propriétaire uniquement**: Vous seul pouvez modifier la carte.
* **Éditeurs et équipe seulement**: Vous seul et votre équipe pouvez modifier la carte.
* **Tout le monde**: Tout le monde peut modifier la carte, même les comptes anonymes.
Pour les cartes créées sans compte :
* **Modifiable seulement avec le lien dédition secret**: Seules les personnes avec un lien dédition pourront modifier la carte.
Ces réglages sont aussi disponibles pour chaque calque.

View file

@ -18,7 +18,7 @@ lieux (domicile, vacances, travail, etc.). Procédons par étapes.
!!! french-instance "Pour les agents publics"
Rendez-vous sur le site uMap agents publics <https://umap.incubateur.anct.gouv.fr/>
et connectez-vous en haut à gauche. La connexion utilise MonComptePro.
et connectez-vous en haut à gauche. La connexion utilise ProConnect.
<shot-scraper
data-output="static/tutoriels/create-map.png"
@ -115,7 +115,7 @@ nécessaire de conserver de lien secret.
Sils ne se sont pas connectés avant de créer leur carte, le message est différent :
![Le lien vers la connexion MonComptePro](../../static/tutoriels/moncomptepro-connexion.png)
![Le lien vers la connexion MonComptePro](../../static/tutoriels/proconnect-connexion.png)
Il nest pas possible denregistrer les modifications apportées à une carte anonyme sur cette instance.

View file

@ -62,12 +62,15 @@ récipiendaires ne pourront pas modifier vos cartes.
#### :fontawesome-solid-landmark-flag: Pour les agents publics
1. Se connectez à MonComptePro : <https://moncomptepro.beta.gouv.fr/> <br>
1. Se connectez à ProConnect : <https://moncomptepro.beta.gouv.fr/> <br>
Toute personne qui travaille pour un service public y a accès.
2. Créez un compte sur MonComptePro. Lopération prend quelques minutes.
2. Créez un compte, lopération peut prendre quelques minutes.
3. Sur [le site uMap pour les agents publics](https://umap.incubateur.anct.gouv.fr/fr/),
cliquez sur `Me Connecter`.
On peut accéder à la page de création de compte ProConnect directement
depuis [uMap pour les agents publics](https://umap.incubateur.anct.gouv.fr/fr/).
Le tableau de bord souvre, il affiche lensemble des cartes que
vous créez ainsi que les équipes auxquelles vous participez.

View file

@ -47,7 +47,7 @@ Voici un bref passage en revu des différents imports proposés et pour finir l
## 1. Importer le contour dune commune
Cliquez sur loutil dimportation en bas de la barre de droite, puis descendez jusquau cadre « Assistants dimport ».
Cliquez sur loutil dimportation en bas de la barre de droite, puis cliquez sur le lien « Assistants dimport ».
Cliquez sur « Communes France » et sélectionnez la commune souhaitée dans une liste déroulante. Une fois la commune sélectionnée, le format est reconnu automatiquement (geojson) puis le type de calque (cliquer sur « ? » pour savoir quel choix opérer)
@ -64,7 +64,7 @@ Une fois cet import réalisé, tout est réglable : couleur de contour, de fond,
## 2. Importer les contours des départements ou des régions
Cliquez sur loutil dimportation en bas de la barre de droite, puis descendez jusquau cadre « Assistants dimport ».
Cliquez sur loutil dimportation en bas de la barre de droite, puis cliquez sur le lien « Assistants dimport ».
Cliquez sur « Contours nationaux » puis soit départements, soit régions et enfin le type de calque (voir supra lexplication). Tous les départements sont importés :
@ -72,7 +72,7 @@ Cliquez sur « Contours nationaux » puis soit départements, soit régions et
## 3. Importer un point dintérêt issu de GeoDataMine
Cliquez sur loutil dimportation en bas de la barre de droite, puis descendez jusquau cadre « Assistants dimport ».
Cliquez sur loutil dimportation en bas de la barre de droite, puis cliquez sur le lien « Assistants dimport ».
Cliquez sur « GeoDataMine (thèmes OSM) » et sélectionnez les informations souhaitées, routes, bâtiments, commerces, services publics, …
Par exemple, en sélectionnant les points deau potable de la CA du Grand Avignon, puis « Copier dans un calque »

View file

@ -1,12 +1,20 @@
# Vidéos uMap
## Faire la carte de son marché de Noël
<iframe title="Faire la carte de son marché de Noël" width="560" height="315" src="https://tube.numerique.gouv.fr/videos/embed/7d3a95ad-37dc-4af1-ac15-17992cb95869" frameborder="0" allowfullscreen="" sandbox="allow-same-origin allow-scripts allow-popups allow-forms"></iframe>
## Atelier « Afficher des donnees Grist dans uMap »
<iframe title="Atelier Afficher des donnees Grist dans uMap" width="560" height="315" src="https://tube.numerique.gouv.fr/videos/embed/517beed6-ed57-430d-ad76-61e0c4784338" frameborder="0" allowfullscreen="" sandbox="allow-same-origin allow-scripts allow-popups allow-forms"></iframe>
## Transformer un tableau Grist en carte avec uMap
<iframe title="Transformer une table Grist en carte avec uMap" width="560" height="315" src="https://tube.numerique.gouv.fr/videos/embed/9e5b09d5-c660-41a0-8591-cae347c88e65" frameborder="0" allowfullscreen="" sandbox="allow-same-origin allow-scripts allow-popups allow-forms"></iframe>
## uMap incubé par lÉtat, ça donne quoi ?
<iframe title="24 - uMap incubé par lÉtat, ça donne quoi ?" width="560" height="315" src="https://peertube.openstreetmap.fr/videos/embed/c564dcfd-4b0b-4796-86ac-ca8624226cd3" frameborder="0" allowfullscreen="" sandbox="allow-same-origin allow-scripts allow-popups allow-forms"></iframe>
<iframe title="uMap incubé par lÉtat, ça donne quoi ?" width="560" height="315" src="https://peertube.openstreetmap.fr/videos/embed/c564dcfd-4b0b-4796-86ac-ca8624226cd3" frameborder="0" allowfullscreen="" sandbox="allow-same-origin allow-scripts allow-popups allow-forms"></iframe>
## uMap a 10 ans, bilan et perspectives

View file

@ -1,5 +1,5 @@
# Force rtfd to use a recent version of mkdocs
mkdocs==1.6.1
pymdown-extensions==10.11.2
mkdocs-material==9.5.42
mkdocs-static-i18n==1.2.3
pymdown-extensions==10.14.3
mkdocs-material==9.6.12
mkdocs-static-i18n==1.3.0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 MiB

After

Width:  |  Height:  |  Size: 734 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View file

@ -77,6 +77,7 @@ Any property of the feature will be available, plus:
- `{locale}` → the locale in the form `en` or `en_US` when a variant is used
- `{lang}` → the lang in the form `en` or `en-us` when a variant is used
- `{measure}` → the length of a line or the area of a polygon
- `{gain}`/`{loss}` → the elevation gain/loss of a line (only if it contains the altitude information)
- `{rank}` → the rank of the feature in the layer
- `{layer}` → the name of the feature's layer
- `{zoom}` → the current map zoom
@ -91,3 +92,27 @@ Any property of the feature will be available, plus:
- `{zoom}` → the current map zoom
- `{lat}` → the latitude of the current map center
- `{lng}` → the longitude of the current map center
## Which statuses can have a map? {: #map-statuses}
### Access statuses
* **Draft (private)**: Only you and your collaborators are able to see the map.
* **Everybody (public)**: Everybody can see your map, it is listed on search results and potentially the homepage. It is indexed by search engines like Google.
* **Anyone with link**: The map will be accessible only to people knowing the link. The map is not indexed by search engines.
* **Editors and team only**: Only you and your collaborators will be able to see the map.
Providing a link of a map to unallowed people will display a `403 Forbidden` error.
### Edit statuses
* **Owner only**: only the owner of the map can edit it.
* **Editors and team only**: the owner, editors and members of the linked team will be able to edit the map.
* **Everyone**: Everybody can edit the map without even being logged in.
Only for maps created without an account:
* **Only editable with secret edit link**: Only people with a secret link will be able to edit the map.
These settings are also available for each layer.

View file

@ -1,9 +1,334 @@
# Changelog
## 3.0.5 - 2025-04-25
* allow to save a remote data with unloaded data by @yohanboniface in #2657
* allow to save/undo/sync drag'n'drop of datalayers by @yohanboniface in #2677
* setting center and zoom manually should set dirty status by @yohanboniface in #2676
* fix error when saving and deleting heatmap layer by @yohanboniface in #2681
* make rules reordering syncable, savable and undoable by @yohanboniface in #2672
* loading remote data should not make the map dirty by @yohanboniface in #2679
* implement a design system for UI consistency by @davidbgk in #2654
* pass CSRF_TRUSTED_ORIGINS env to settings by @lippoliv in #2656
* do not display "saved" message if some request failed by @yohanboniface in #2669
* show an error message if saving layer failed by @yohanboniface in #2670
* naive support for GeometryCollection as Feature geometry by @yohanboniface in #2658
* add a back button in rules form by @yohanboniface in #2673
## New Contributors
* @lippoliv made their first contribution in #2656
## 3.0.4 - 2025-04-14
* do not show "back to home" button in iframes by @yohanboniface in #2644
* remove "hide home button" shown twice in map settings by @yohanboniface in #2645
* adapt Helm chart to match La Suite's expectations by @ohemelaar in #2646
* update colors by @yohanboniface in #2647
## 3.0.3 - 2025-04-11
* do not try to remove a feature not yet added by @yohanboniface in #2637
* document that nginx needs to be added in Docker stack to serve statics by @yohanboniface in #2636
* display back help button in switch fields by @yohanboniface in #2634
* use Last-Modified header from remote data when available by @yohanboniface in #2624
* fix text overflow on search results by @yohanboniface in #2628
* redirect to user dashboard after map delete by @yohanboniface in #2626
* add missing margin-bottom in importers by @yohanboniface in #2627
* fix pictogram categories always hidden by @yohanboniface in #2630
* display search category on list page by @davidbgk in #2635
* allow to hide the layer switcher from bottom bar by @davidbgk in #2639
* hidden download button in browser when embedControl=false by @yohanboniface in #2640
* allow to hide the back to home button by @davidbgk in #2638
## 3.0.2 - 2025-04-08
* fix copiable input CSS by @yohanboniface in #2616
* fix categorized layer crashing with null value by @yohanboniface in #2621
* properly call endEdit for markers by @yohanboniface in #2617
* fix result tools buttons background color by @yohanboniface in #2620
* fix min-height of select in caption bar by @yohanboniface in #2622
* give priority to small usernames on autocomplete by @yohanboniface in #2604
## 3.0.1 - 2025-04-07
* fix showLabel wrongly using MultiChoices by @yohanboniface in #2609
## 3.0.0 - 2025-04-07
This is the first release to officially support colaborative real-time map editing.
It introduces ASGI deployement, to support websockets, and adds Redis in the stack.
But it's still possible to continue deploying in WSGI for now, and Redis is only
mandatory when using the real-time feature.
How to use the real-time editing feature in your instance:
- you need to deploy with ASGI, see https://docs.umap-project.org/en/stable/deploy/asgi/
- you need to set `REALTIME_ENABLED=True` in your settings
Other notable changes:
- a first version of a real undo/redo
- map categories; those are defined through the `UMAP_TAGS` settings
Note: you may want to update your search index to include the category search,
see https://docs.umap-project.org/en/stable/config/settings/#umap_search_configuration
### Breaking change
* The Docker image will not serve assets and data files anymore, an Nginx container must
be configured. See [docker-compose.yml](https://github.com/umap-project/umap/blob/master/docker-compose.yml)
for an example.
### New features
* add collaborative real-time map editing
* add atomic undo redo by @yohanboniface in #2570
* expose active sessions in stats endpoint by @yohanboniface in #2544
* add more users counts in /stats/ by @yohanboniface in #2555
* add new "Back to home" icon by @yohanboniface in #2551
* add experimental BAN importer by @yohanboniface in #2565
* add titles in the text formatting dialog by @yohanboniface in #2584
* layers selector in bottom bar by @yohanboniface in #2579
* display maps list as a grid now by @yohanboniface in #2590
* add Map.tags and allow to edit from client by @yohanboniface in #2530
* add minimal "raw" icon shape by @yohanboniface in #2597
### Bug fixes
* cast value to string before calling trim by @yohanboniface in #2567
* import iconUrl as absolute when possible by @yohanboniface in #2563
* iconUrl field was broken on older browsers by @yohanboniface in #2575
* do not fail when trying to read metadata of a missing geojson by @yohanboniface in #2592
* remote data loading on import from umap backup by @davidbgk in #2598
* do not export layer ids in umap backup by @davidbgk in #2600
* use the multichoices for ttl in remote data form by @davidbgk in #2599
### Internal changes
* refactor search UX by @yohanboniface in #2545
* new icon, colors and title for search buttons by @yohanboniface in #2556
* use real redraw for datalayer, instead of hide/show by @yohanboniface in #2568
* order importers by name instead of id by @yohanboniface in #2578
* update the Dockerfile to expose websockets by @almet in #2576
* remove confirm delete for features and datalayers by @yohanboniface in #2603
### Accessibility
* a11y: turn embeded maps into inert elements by @davidbgk in #2533
### Changed templates
- auth/user_detail.html
- auth/user_stars.html
- umap/content.html
- umap/home.html
- umap/map_fragment.html
- umap/map_list.html
- umap/search.html
- umap/search_bar.html
- umap/team_detail.html
## 2.9.3 - 2025-03-07
* be explicit in the message that logout is needed after adding a new oauth provider
## 2.9.2 - 2025-03-04
* measure/drawing tooltip was misplaced by @yohanboniface in #2541
* be defensive when getting the backend name from the session by @yohanboniface in #2540
## 2.9.1 - 2025-03-03
* be more persuasive in deprecating twitter login backend by @yohanboniface in #2538
## 2.9.0 - 2025-03-03
This release is mainly about making the sync feature deployable and more stable (but still
not yet activated by default).
### New features
* display map's "created at" and "modified at" in the caption by @yohanboniface in #2424
* allow to define sortKey at layer level by @yohanboniface in #2449
* move star button to caption by @yohanboniface in #2442
* add a debounce for Input and Textarea fields by @yohanboniface in #2445
* soft delete datalayers by @yohanboniface in #2459
* add DEPRECATED_AUTHENTICATION_PROVIDERS setting by @yohanboniface in #2461
* expose teams in users CSV export by @davidbgk in #2484
* add title attribute to layers in browser by @yohanboniface in #2489
* make the tooltip sticky in hover mode for paths by @yohanboniface in #2507
* make vertex icons bigger (and round) by @yohanboniface in #2506
* add a quick link to layer's permalink by @yohanboniface in #2529
### Bug fixes
* display a more usefull message when error in remote data by @yohanboniface in #2443
* fix circle icon no longer hihlighted by @yohanboniface in #2440
* keep layer visibility after clicking on toggle all by @yohanboniface in #2439
* update map.modified_at when saving a datalayer by @yohanboniface in #2423
* do not consume ctrl-Z in textarea or input by @yohanboniface in #2441
* Fix categorized layers colors palette not updating by @yohanboniface in #2447
* reference secret-env by fullname instead release-name by @swarnat in #2406
* correctly parse http link including another http link in the path by @yohanboniface in #2460
* display current configured oauth as icon instead of text by @yohanboniface in #2375
* better buttons positionning for the homepage by @davidbgk in #2463
* catch cluster error at zoom in certain situation by @yohanboniface in #2464
* display a more descriptive alert on invalid geojson error by @yohanboniface in #2466
* do not try to backup an undefined geojson by @yohanboniface in #2468
* do not error when escape during marker creation by @davidbgk in #2483
* do not import empty features by @yohanboniface in #2485
* do not display an error for an empty CSV by @yohanboniface in #2505
* try to reconnect after network error when getting token by @yohanboniface in #2502
* wait for websocket full connection by @yohanboniface in #2503
* feature edit status not disabled on hide by @yohanboniface in #2534
### Internal changes
* deactivate cancel and hide button when sync is active by @yohanboniface in #2413
* do not try to reconnect after end edit by @yohanboniface in #2412
* handle sync of datalayer delete by @yohanboniface in #2416
* internalize FormBuilder by @yohanboniface in #2420
* POC of using Redis for pubsub by @yohanboniface in #2426
* include site description within page titles by @davidbgk in #2455
* Sync show usernames by @yohanboniface in #2444
* only allow to set a map as sync when it is already saved by @yohanboniface in #2465
* move DrawToolbar and SettingsToolbar to bar.js module by @yohanboniface in #2482
* add very minimal documentation for deploying uMap with ASGI by @yohanboniface in #2480
* use default value from schema for non inheritable fields by @yohanboniface in #2513
* sync save state by @yohanboniface in #2487
* use our contexmenu class for inplace toolbar by @yohanboniface in #2510
* make sure we sync a line when hitting esc while drawing by @yohanboniface in #2526
* make datalayer upsert idempotent by @yohanboniface in #2528
### Accessibility
* set an aria-label for unlabelled search input by @davidbgk in #2531
* switch to better contrasted links by @davidbgk in #2532
### New Contributors
* @swarnat made their first contribution in #2406
## 2.8.2 - 2024-12-26
### Bug fixes
* fix create marker from search result by @yohanboniface in #2404
* fix startMarker/Polyline/Polygon on right click by @yohanboniface in #2403
## 2.8.1 - 2024-12-24
### Bug fixes
* honour carriage returns in layer description (in caption panel) by @yohanboniface in #2386
* update star icon on star/unstar by @yohanboniface in #2387
* reconnect websocket on disconnection by @almet in #2389
* fix duplicated content during sync by @yohanboniface in #2388
* main help button was broken by @yohanboniface in #2393
* split zoomTo to accept bounds by @davidbgk in #2394
* zoom to droped file once loaded by @davidbgk in #2401
* do not load all datalayers at once by @yohanboniface in #2402
* add a 403.html template by @yohanboniface in #2396
## 2.8.0 - 2024-12-18
### What's Changed
This release is mainly about being able to deploy uMap on helm/k8s, with a S3-compatible storage. Doing so,
we introduce two new map statuses:
- "draft" (which is now the default, unless you change the UMAP_DEFAULT_SHARE_STATUS setting), which
makes the maps private by default
- "deleted", which make that now a delete will be a soft delete (and the command `umap empty_trash`
could be run to do the real delete).
Also pursuing the code cleaning (more modules and spliting uMap core code from Leaflet rendering one).
Finally, this is now the javascript who create the datalayer uuid, and then push it to the back. This
is for preparing for the synchronisation between clients.
### Breaking change
* if you use `X-Accel-Redirect` with Nginx, you **must** make sure that the `X-DataLayer-Version` header
is forwarded to the client. This is the line you usually need to add in your Nginx `/internal/` config:
add_header X-DataLayer-Version $upstream_http_x_datalayer_version;
See the [documentation](deploy/nginx.md) for more informations.
### New features
* add umap helm chart for Kubernetes deployment by @NaPs in #2286
* support storing layer data in S3 like servers by @yohanboniface in #2304
* introduce Map.share_status=DRAFT and DELETED by @yohanboniface in #2357
* highlight importer URL field when it is fulfilled by @yohanboniface in #2323
* swap import and settings buttons in edit toolbar by @yohanboniface in #2329
* make expression persistent in the overpass importer by @yohanboniface in #2339
* add basic autocompletion on inputs expecting a field name by @yohanboniface in #2281
* allow to configure the default label keys per instance by @yohanboniface in #2291
* display an image from Panoramax in OSM template when tag is defined by @yohanboniface in #2338
* add a disabled/active mode to the submit button of import panel by @yohanboniface in #2341
* open importers in a dialog instead of in the form by @yohanboniface in #2327
* display wikipedia link in OSM popup template when possible by @yohanboniface in #2358
* move labelKey field on the top datalayer form by @yohanboniface in #2350
* add elevation gain and loss in extended properties by @yohanboniface in #2343
* add a back button to importers dialog by @yohanboniface in #2364
* load all datalayers in parallel by @yohanboniface in #2370
* parse files in parallel at import when multiple by @yohanboniface in #2372
* allow to edit datalayer name in datalayers list by @yohanboniface in #2349
* experimental popup template for wikipedia by @yohanboniface in #2365
### Bug fixes
* honour custom labelKey in default popup template by @yohanboniface in #2271
* honour `rules` and `slideshow` when importing a umap file by @yohanboniface in #2270
* use our fork of csv2geojson to be able to parse lat/lon with commas by @yohanboniface in #2263
* allow spaces in iframe query strings in HTML formatting by @yohanboniface in #2292
* do not fail when navigating with popup arrows in cluster mode by @yohanboniface in #2307
* better login page styles and incentive by @davidbgk in #2293
* compute length of all shapes for MultiLineString (not only first) by @yohanboniface in #2310
* avoid map-panning on mobile using two fingers navigation by @fttriquet in #2340
* do not try to restore a newly created layer on reset by @yohanboniface in #2381
* do not unset map dirty status if it has not yet been saved once by @yohanboniface in #2382
* refactor importer feedback by @yohanboniface in #2363
* make sure we set X-DataLayer-Version even when using X-Accel-Redirect by @yohanboniface in #2361
* bring marker to front on highlight by @yohanboniface in #2377
* show private/draft maps in team maps for members by @yohanboniface in #2373
### Internal changes
* introduce SaveManager class by @yohanboniface in #2240
* split umap.js in two modules by @yohanboniface in #2257
* make the client create the DataLayer.id by @yohanboniface in #2259
* move editToolBar and captionBar to modules by @yohanboniface in #2272
* update browserslist to be more explicit by @davidbgk in #2277
* explicitely set postgis as db engine by @yohanboniface in #2285
* add logo for social_core.backends.keycloak.KeycloakOAuth2 by @tomamplius in #2258
### Changed templates
* umap/css.html:
* added `umap/css/bar.css`
* added `umap/css/popup.css`
* umap/js.html:
* added `umap/css/bar.js`
* umap/templates/registration/login.html
* umap/templates/umap/map_init.html
* changed the way we instanciate `Umap` (instead of `U.Map`)
* umap/templates/umap/user_dashboard.html
* changed the way we instanciate `Umap` (instead of `U.Map`)
### New Contributors
* @NaPs made their first contribution in #2286
* @tomamplius made their first contribution in #2258
* @fttriquet made their first contribution in #2340
## 2.7.1 - 2024-10-25
### Bug fixes
* use shutil.move instead of Path.rename to move to purgatory by @yohanboniface in #2236
* always unset editedFeature on editPanel close by @yohanboniface in #2237
## 2.7.0 - 2024-10-24
### New features
* delete datalayer's files on delete by @yohanboniface in #2158
- deleted files will be moved to `UMAP_PURGATORY_ROOT`, so set this setting to
somewhere meaningful for your instance (default is `/tmp/umappurgatory`)
* very minimal CSV export of users and maps in admin by @yohanboniface in #2131
* add a setting to prevent users from editing their profile by @davidbgk in #2133
* allow to search by code INSEE in communes importer by @yohanboniface in #2188

View file

@ -28,6 +28,14 @@ Can be set through env var too: `ALLOWED_HOSTS=umap.mydomain.org,u.mydomain.org`
Set it to `True` for easier debugging in case of error.
#### DEPRECATED_AUTHENTICATION_BACKENDS
List of auth backends to deprecate. Defining this will display a message to
all users using this provider, to encourage them to configure another provider to
their account.
DEPRECATED_AUTHENTICATION_BACKENDS = ["social_core.backends.twitter_oauth2.TwitterOAuth2"]
#### EMAIL_BACKEND
Must be configured if you want uMap to send emails to anonymous users.
@ -80,6 +88,19 @@ Nginx configuration.
See [Django documentation for MEDIA_ROOT](https://docs.djangoproject.com/en/4.2/ref/settings/#media-root)
#### REALTIME_ENABLED
Setting `REALTIME_ENABLED` to `True` will allow users to enable real-time collaboration.
A switch will be available for them in the "advanced properties" of the map.
See [the documentation about ASGI deployment](../deploy/asgi.md) for more information.
#### REDIS_URL
Connection URL to the Redis server. Only need for the real-time editing.
Default: `redis://localhost:6379`
#### SECRET_KEY
Must be defined to something unique and secret.
@ -89,13 +110,6 @@ Running uMap / Django with a known SECRET_KEY defeats many of Djangos securit
See [Django documentation for SECRET_KEY](https://docs.djangoproject.com/en/4.2/ref/settings/#secret-key)
#### SITE_URL
The final URL of you instance, including the protocol:
`SITE_URL=http://umap.org`
#### SHORT_SITE_URL
If you have a short domain for sharing links.
@ -105,7 +119,26 @@ Eg.: `SHORT_SITE_URL=https://u.umap.org`
#### SITE_NAME
The name of the site, to be used in header and HTML title.
The name of the site, to be used in header.
#### SITE_DESCRIPTION
The description of the site, to be used in HTML title.
#### SITE_URL
The final URL of you instance, including the protocol:
`SITE_URL=http://umap.org`
#### SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_KEY, SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_SECRET
If you use OpenStreetMap as OAuth 2 provider, you can use those settings.
Otherwise, use any valid [python-social-auth configuration](https://python-social-auth.readthedocs.io/en/latest/configuration/django.html).
#### STATIC_ROOT
@ -115,6 +148,12 @@ Nginx configuration.
See [Django documentation for STATIC_ROOT](https://docs.djangoproject.com/en/4.2/ref/settings/#static-root)
#### STORAGES
See [storage](storage.md).
#### USE_I18N
Default is True. Set it to False if you don't want uMap to localize the app.
@ -175,11 +214,6 @@ UMAP_EXTRA_URLS = {
}
```
#### UMAP_KEEP_VERSIONS
How many datalayer versions to keep. 10 by default.
#### UMAP_DEFAULT_EDIT_STATUS
Define the map default edit status.
@ -270,6 +304,16 @@ Available importers:
- `communesfr`: download French communes boundaries, from https://geo.api.gouv.fr/
- `datasets`: define URLs you want to promote to users, with a `name` and a `format`
#### UMAP_KEEP_VERSIONS
How many datalayer versions to keep. 10 by default.
#### UMAP_LABEL_KEYS
List of properties to consider as "Feature label" (to show in popup or in browser).
UMAP_LABEL_KEYS = ["name", "title"]
#### UMAP_MAPS_PER_PAGE
How many maps to show in maps list, like search or home page.
@ -282,12 +326,6 @@ How many total maps to return in the search.
How many maps to show in the user "my maps" page.
#### UMAP_PURGATORY_ROOT
Path where files are moved when a datalayer is deleted. They will stay there until
`umap purge_purgatory` is run. May be useful in case a user deletes by mistake
a datalayer, or even a map.
#### UMAP_SEARCH_CONFIGURATION
Use it if you take control over the search configuration.
@ -305,7 +343,10 @@ CREATE EXTENSION btree_gin;
ALTER TEXT SEARCH CONFIGURATION umapdict ALTER MAPPING FOR hword, hword_part, word WITH unaccent, simple;
# Now create the index
CREATE INDEX IF NOT EXISTS search_idx ON umap_map USING GIN(to_tsvector('umapdict', COALESCE(name, ''::character varying)::text), share_status);
CREATE INDEX IF NOT EXISTS search_idx ON umap_map USING GIN(to_tsvector('umapdict', COALESCE(name, ''::character varying)::text), share_status, tags);
# You should also create an index for tag filtering:
CREATE INDEX IF NOT EXISTS tags_idx ON umap_map USING GIN(share_status, tags);
```
Then set:
@ -327,61 +368,3 @@ Should uMap gzip datalayers geojson.
Can be set to `X-Accel-Redirect` to enable the [NGINX X-Accel](https://www.nginx.com/resources/wiki/start/topics/examples/xsendfile/) feature.
See the NGINX documentation in addition.
#### SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_KEY, SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_SECRET
If you use OpenStreetMap as OAuth 2 provider, you can use those settings.
Otherwise, use any valid [python-social-auth configuration](https://python-social-auth.readthedocs.io/en/latest/configuration/django.html).
#### WEBSOCKET_ENABLED
A WebSocket server is packaged with uMap, and can be turned-on to activate
"real-time collaboration". In practice, in order to enable it, a few settings
are exposed.
Setting `WEBSOCKET_ENABLED` to `True` will **not** enable real-time
collaboration on all the maps served by the server. Instead, a switch will be
available in the "advanced properties" of the map.
The websocket server can be started with the following command:
```bash
umap run_websocket_server
```
And can take optional settings `--host` and `--port` (default values are defined in
the settings).
Configuration example:
```python
WEBSOCKET_ENABLED = True
WEBSOCKET_BACK_HOST = "localhost"
WEBSOCKET_BACK_PORT = 8002
WEBSOCKET_FRONT_URI = "ws://localhost:8002"
```
These settings can also be set with the (same names) environment variables.
#### WEBSOCKET_BACK_HOST
#### WEBSOCKET_BACK_PORT
The internal host and port the websocket server will connect to.
#### WEBSOCKET_FRONT_URI
The connection string that will be used by the client to connect to the
websocket server. In practice, as it's useful to put the WebSocket server behind
TLS encryption, the values defined by `WEBSOCKET_FRONT_URI` are different than
the values defined by `WEBSOCKET_BACK_PORT` and `WEBSOCKET_BACK_HOST`.
This value is comprised of three parts:
```
protocol://host:port
```
- `protocol`: can either be `ws` for plain unencrypted WebSockets, or `wss` when using TLS encryption.
- `host`: is the address where the connection will be sent. It should be public facing.
- `port`: is the port that is open on the host.

81
docs/config/storage.md Normal file
View file

@ -0,0 +1,81 @@
# Storage
uMap stores metadata (such as owner, permissions…) in PostgreSQL, and the data itself (the content of a layer)
in geojson format, by default on the local file system, but optionally in a S3 like server.
This can be configured through the `STORAGES` settings. uMap will use three keys:
- `default`, used only for the pictogram files, it can use whatever storage suits your needs
- `staticfiles`, used to store the static files, it can use whatever storage suits your needs,
but by default uses a custom storage that will add hash to the filenames, to be sure they
are not kept in any cache after a release
- `data`, used to store the layers data. This one should follow the uMap needs, and currently
uMap provides only two options: `umap.storage.fs.FSDataStorage` and `umap.storage.s3.S3DataStorage`
## Default settings:
This will use the file system for everything, including the data.
```
STORAGES = {
"default": {
"BACKEND": "django.core.files.storage.FileSystemStorage",
},
"data": {
"BACKEND": "umap.storage.fs.FSDataStorage",
},
"staticfiles": {
"BACKEND": "umap.storage.staticfiles.UmapManifestStaticFilesStorage",
},
}
```
## Using S3
To use an S3 like server for the layers data, the first thing is to install
the needed dependencies: `pip install umap-project[s3]`.
Then, change the `STORAGES` settings with something like this:
```
STORAGES = {
"default": {
"BACKEND": "storages.backends.s3.S3Storage",
"OPTIONS": {
"access_key": "xxx",
"secret_key": "yyy",
"bucket_name": "umap-pictograms",
"endpoint_url": "http://127.0.0.1:9000",
"default_acl": "public-read",
},
},
"data": {
# Whatch out, this is a dedicated uMap class!
"BACKEND": "umap.storage.s3.S3DataStorage",
"OPTIONS": {
"access_key": "xxx",
"secret_key": "yyy",
"bucket_name": "umap-data",
"endpoint_url": "http://127.0.0.1:9000",
},
},
"staticfiles": {
"BACKEND": "storages.backends.s3.S3Storage",
"OPTIONS": {
"access_key": "xxx",
"secret_key": "yyy",
"bucket_name": "umapstatics",
"endpoint_url": "http://127.0.0.1:9000",
"default_acl": "public-read",
},
},
}
```
As you can see in this example, both `staticfiles` and `default` use the storage class provided
by `django-storages` (`storages.backends.s3.S3Storage`), but the `data` one uses a specific class
(`umap.storage.s3.S3DataStorage`).
In order to store old versions of a layer, the versioning should be activated in the bucket.
See more about the configuration on the [django-storages documentation](https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html).

92
docs/deploy/asgi.md Normal file
View file

@ -0,0 +1,92 @@
# ASGI
While uMap has been historically deployed using the WSGI specification,
there is now an **experimental** ASGI endpoint. This will be the way to
deploy uMap to use the live collaborative editing feature, which needs
websockets.
## Nginx
When using ASGI, the [nginx](nginx.md), the `/` entrypoint should be:
```
location / {
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_redirect off;
proxy_buffering off;
proxy_pass http://umap/;
}
```
Also add this mapping for the `$connection_upgrade` variable:
```
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
}
```
## Uvicorn
Uvicorn must be installed in the umap virtualenv:
/path/to/umap/venv/bin/pip install uvicorn
And could then be run like this:
/path/to/umap/venv/bin/uvicorn \
--proxy-headers \
--uds /srv/umap/umap.sock \
--no-access-log \
umap.asgi:application
## Systemd
Here is an example service to manage uvicorn with systemd:
```
[Unit]
Description=umap
After=network.target
Requires=postgresql.service
[Service]
Type=simple
User=umap
WorkingDirectory=/srv/umap/
PrivateTmp=true
EnvironmentFile=/srv/umap/env
ExecStart=/srv/umap/venv/bin/uvicorn \
--proxy-headers \
--uds /srv/umap/uvicorn.sock \
--no-access-log \
umap.asgi:application
ExecReload=/bin/kill -HUP ${MAINPID}
RestartSec=1
Restart=always
[Install]
WantedBy=multi-user.target
```
Then to install it and enable it, copy it to `/etc/systemd/system/umap.service`
and run:
sudo systemctl enable umap.service
## Env
Uvicorn can be [configured](https://www.uvicorn.org/deployment/) from env vars,
for example to define the number of workers:
```env title="/srv/umap/env"
UVICORN_WORKERS=4
```

View file

@ -14,7 +14,7 @@ services:
app:
# Check https://hub.docker.com/r/umap/umap/tags to find the latest version
image: umap/umap:2.0.2
image: umap/umap:2.9.3
ports:
# modify the external port (8001, on the left) if desired, but make sure it matches SITE_URL, below
- "8001:8000"
@ -48,3 +48,45 @@ User accounts can be managed via the Django admin page ({SITE_URL}/admin). The r
```bash
umap createsuperuser
```
## Developping with Docker
If you want to develop with podman or docker, here are commands that might be useful, given that you have a postgreSQL server running locally and that your settings are located at `umap.conf`:
You can build the docker image with:
```bash
podman build -t umap .
```
And run it with:
```bash
podman run -v ./umap.conf:/tmp/umap.conf -e UMAP_SETTINGS=/tmp/umap.conf -it --network host umap
```
## Real time collaboration
To enable real time collaboration when using Docker, a Redis service must be added. Something like this in `docker-compose.py` world:
```yaml title="docker-compose.yml"
services
redis:
image: redis:latest
healthcheck:
test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
command: ["redis-server"]
app:
depends_on:
redis:
condition: service_healthy
environment:
- REALTIME_ENABLED=1
- REDIS_URL=redis://redis:6379
```

7
docs/deploy/helm.md Normal file
View file

@ -0,0 +1,7 @@
# Helm
To deploy using helm:
helm install <my-release> oci://registry-1.docker.io/umap/umap
Helm chart is pushed here: https://hub.docker.com/repository/docker/umap/umap/tags

View file

@ -1,84 +1,10 @@
# Configuring Nginx
Here are some configuration files to use umap with nginx and [uWSGI](https://uwsgi-docs.readthedocs.io/en/latest/), a server for python, which will handle your processes for you.
See [WSGI](wsgi.md) or [ASGI](asgi.md) for a basic setup.
```nginx title="nginx.conf"
upstream umap {
server unix:///srv/umap/uwsgi.sock;
}
Then consider adding this configuration
server {
# the port your site will be served on
listen 80;
listen [::]:80;
listen 443 ssl;
listen [::]:443 ssl;
# the domain name it will serve for
server_name your-domain.org;
charset utf-8;
# max upload size
client_max_body_size 5M; # adjust to taste
# Finally, send all non-media requests to the Django server.
location / {
uwsgi_pass umap;
include /srv/umap/uwsgi_params;
}
}
```
## uWSGI
```nginx title="uwsgi_params"
uwsgi_param QUERY_STRING $query_string;
uwsgi_param REQUEST_METHOD $request_method;
uwsgi_param CONTENT_TYPE $content_type;
uwsgi_param CONTENT_LENGTH $content_length;
uwsgi_param REQUEST_URI $request_uri;
uwsgi_param PATH_INFO $document_uri;
uwsgi_param DOCUMENT_ROOT $document_root;
uwsgi_param SERVER_PROTOCOL $server_protocol;
uwsgi_param REQUEST_SCHEME $scheme;
uwsgi_param HTTPS $https if_not_empty;
uwsgi_param REMOTE_ADDR $remote_addr;
uwsgi_param REMOTE_PORT $remote_port;
uwsgi_param SERVER_PORT $server_port;
uwsgi_param SERVER_NAME $server_name;
```
```ini title="uwsgi.ini"
[uwsgi]
uid = umap
gid = users
# Python related settings
# the base directory (full path)
chdir = /srv/umap/
# umap's wsgi module
module = umap.wsgi
# the virtualenv (full path)
home = /srv/umap/venv
# process-related settings
# master
master = true
# maximum number of worker processes
processes = 4
# the socket (use the full path to be safe)
socket = /srv/umap/uwsgi.sock
# ... with appropriate permissions - may be needed
chmod-socket = 666
stats = /srv/umap/stats.sock
# clear environment on exit
vacuum = true
plugins = python3
```
## Static files
## Static files and geojson
```nginx title="nginx.conf"
location /static {
@ -116,6 +42,53 @@ UMAP_XSENDFILE_HEADER = 'X-Accel-Redirect'
internal;
gzip_vary on;
gzip_static on;
# Next line is very important!
add_header X-DataLayer-Version $upstream_http_x_datalayer_version;
alias /path/to/umap/var/data/;
}
```
## Ajax proxy
In order for users to load CORS protected data within a map, Nginx can act as a proxy.
Here is an example configuration for this:
```
location ~ ^/proxy/(.*) {
internal;
add_header X-Proxy-Cache $upstream_cache_status always;
proxy_cache_background_update on;
proxy_cache_use_stale updating;
proxy_cache ajax_proxy;
proxy_cache_valid 1m; # Default. Umap will override using X-Accel-Expires
set $target_url $1;
# URL is encoded, so we need a few hack to clean it back.
if ( $target_url ~ (.+)%3A%2F%2F(.+) ){ # fix :// between scheme and destination
set $target_url $1://$2;
}
if ( $target_url ~ (.+?)%3A(.*) ){ # fix : between destination and port
set $target_url $1:$2;
}
if ( $target_url ~ (.+?)%2F(.*) ){ # fix / after port, the rest will be decoded by proxy_pass
set $target_url $1/$2;
}
resolver 8.8.8.8;
add_header X-Proxy-Target $target_url; # For debugging
proxy_pass_request_headers off;
proxy_set_header Content-Type $http_content_type;
proxy_set_header Content-Encoding $http_content_encoding;
proxy_set_header Content-Length $http_content_length;
proxy_read_timeout 10s;
proxy_connect_timeout 5s;
proxy_ssl_server_name on;
proxy_pass $target_url;
proxy_intercept_errors on;
error_page 301 302 307 = @handle_proxy_redirect;
}
location @handle_proxy_redirect {
resolver 8.8.8.8;
set $saved_redirect_location '$upstream_http_location';
proxy_pass $saved_redirect_location;
}
```

37
docs/deploy/overview.md Normal file
View file

@ -0,0 +1,37 @@
# Deploying uMap
uMap is a python package, running [Django](https://docs.djangoproject.com/en/5.2/howto/deployment/),
so anyone experimented with this stack will find it familiar, but there are some speficic details
to know about.
## Data
One important design point of uMap is that while metadata are stored in a PostgreSQL database, the
data itself is stored in the file system, as geojson files. This design choice has been made
to make uMap scale better, as there are much more reads than writes, and when some
map is shared a lot (like on a national media) we want to be able to serve it without needing an
overcomplex and costly stack.
So when a request for data is made (that is on a *DataLayer*), the flow is that uMap will read
the request headers to check for permissions, and then it will forward the request to Nginx,
that will properly serve the data (a geojson file), without consuming a python worker, and with
much more efficiency than python.
In DEBUG mode, uMap will serve the geojson itself, but this is not recommended in production,
unless you have a very small audience.
Data can also be stored in a [S3 like storage](../config/storage/#using-s3).
## Assets (JS, CSS…)
As any web app, uMap also needs static files to be served. In DEBUG mode, Django will do this
kindly, but not in production. See [Nginx configuration](nginx.md) for this.
Assets can also be stored in a [S3 like storage](../config/storage/#using-s3).
## python app (metadata, permissions…)
uMap needs a python server, which can either be of [WSGI](wsgi.md) or [ASGI](asgi.md) (this later
is needed in order to use the collaborative live editing).
## Redis
Still when using the collaborative live editing, uMap needs a [Redis](../config/settings.md#redis_url) server, to act as pubsub.

87
docs/deploy/wsgi.md Normal file
View file

@ -0,0 +1,87 @@
# WSGI
WSGI is the historical standard to serve python in general, and uMap in this case.
From recently, uMap also supports [ASGI](asgi.md), which is required to use the
collaborative editing feature.
## uWSGI
In Nginx host, use:
```nginx title="nginx.conf"
upstream umap {
server unix:///srv/umap/umap.sock;
}
server {
# the port your site will be served on
listen 80;
listen [::]:80;
listen 443 ssl;
listen [::]:443 ssl;
# the domain name it will serve for
server_name your-domain.org;
charset utf-8;
# max upload size
client_max_body_size 5M; # adjust to taste
# Finally, send all non-media requests to the Django server.
location / {
uwsgi_pass umap;
include /srv/umap/uwsgi_params;
}
}
```
```nginx title="uwsgi_params"
uwsgi_param QUERY_STRING $query_string;
uwsgi_param REQUEST_METHOD $request_method;
uwsgi_param CONTENT_TYPE $content_type;
uwsgi_param CONTENT_LENGTH $content_length;
uwsgi_param REQUEST_URI $request_uri;
uwsgi_param PATH_INFO $document_uri;
uwsgi_param DOCUMENT_ROOT $document_root;
uwsgi_param SERVER_PROTOCOL $server_protocol;
uwsgi_param REQUEST_SCHEME $scheme;
uwsgi_param HTTPS $https if_not_empty;
uwsgi_param REMOTE_ADDR $remote_addr;
uwsgi_param REMOTE_PORT $remote_port;
uwsgi_param SERVER_PORT $server_port;
uwsgi_param SERVER_NAME $server_name;
```
```ini title="uwsgi.ini"
[uwsgi]
uid = umap
gid = users
# Python related settings
# the base directory (full path)
chdir = /srv/umap/
# umap's wsgi module
module = umap.wsgi
# the virtualenv (full path)
home = /srv/umap/venv
# process-related settings
# master
master = true
# maximum number of worker processes
processes = 4
# the socket (use the full path to be safe)
socket = /srv/umap/umap.sock
# ... with appropriate permissions - may be needed
chmod-socket = 666
stats = /srv/umap/stats.sock
# clear environment on exit
vacuum = true
plugins = python3
```
See also [Django documentation](https://docs.djangoproject.com/en/5.2/howto/deployment/wsgi/).

View file

@ -63,15 +63,3 @@ When the data layers are initialized, they can have two states:
To mark what needs to be synced with the server, uMap currently mark objects as "dirty". Something marked as "dirty" has changed on the client, but is not yet saved on the server.
Each map, datalayer and permission objects can be marked as "dirty". When a change is made on an object, it will mark its parent as "dirty" as well, so it can be updated accordingly.
### Saving data to the server with `umap.save()`
Here is what's being done when you call `map.save()`:
1. `map.saveSelf()`, posting `name`, `center` and `settings` to the server, and then
2. calls `permission.save()`, which will post the permissions to the server, and then call back
3. `map.continueSaving()`, which will take the first dirtyLayer and call
4. `datalayer.save()` on it. It does the following:
1. Post the data (`name`, `displayOnLoad`, `rank`, `settings`, and `geojson`)
2. Calls `permission.save()`, posting `edit_status` to the server, and then calling `map.continue_saving()` and remove the datalayer from `dirtyDatalayers`.
5. When the `dirtyDatalayers` list is empty, we are done.

View file

@ -27,10 +27,9 @@
4. `git tag 2.X.Y`
5. `git push && git push --tag`
6. Go to [Github release page](https://github.com/umap-project/umap/releases/new) and paste release notes
7. Commit the changelog `git commit -am "changelog"`
8. `make build`
9. `make publish`
10. `make docker`
7. `make build`
8. `make publish`
9. `make docker`
### Deploying instances

View file

@ -1,5 +1,5 @@
# Force rtfd to use a recent version of mkdocs
mkdocs==1.6.1
pymdown-extensions==10.11.2
mkdocs-material==9.5.42
mkdocs-static-i18n==1.2.3
pymdown-extensions==10.14.3
mkdocs-material==9.6.12
mkdocs-static-i18n==1.3.0

View file

@ -15,10 +15,15 @@ nav:
- Configuration:
- Settings: config/settings.md
- Customize: config/customize.md
- Storage: config/storage.md
- Icon packs: config/icons.md
- Deployment:
- Overview: deploy/overview.md
- Docker: deploy/docker.md
- Helm: deploy/helm.md
- Nginx: deploy/nginx.md
- ASGI: deploy/asgi.md
- WSGI: deploy/wsgi.md
- Changelog: changelog.md
theme:
name: material

View file

@ -38,16 +38,15 @@
"dependencies": {
"@dwayneparton/geojson-to-gpx": "^0.2.0",
"@placemarkio/tokml": "0.3.4",
"@tmcw/togeojson": "^5.8.0",
"@tmcw/togeojson": "^7.1.0",
"colorbrewer": "1.5.7",
"csv2geojson": "5.1.2",
"dompurify": "3.1.7",
"csv2geojson": "github:umap-project/csv2geojson#patched",
"dompurify": "3.2.4",
"georsstogeojson": "^0.2.0",
"jsdom": "^24.0.0",
"leaflet": "1.9.4",
"leaflet-editable": "^1.3.0",
"leaflet-editable": "^1.3.1",
"leaflet-editinosm": "0.2.3",
"leaflet-formbuilder": "0.2.10",
"leaflet-fullscreen": "1.0.2",
"leaflet-hash": "0.2.1",
"leaflet-i18n": "0.3.5",
@ -60,11 +59,11 @@
"leaflet.locatecontrol": "0.81.1",
"leaflet.markercluster": "^1.5.3",
"leaflet.path.drag": "0.0.6",
"leaflet.photon": "0.9.1",
"leaflet.photon": "0.9.2",
"osmtogeojson": "^3.0.0-beta.5",
"simple-statistics": "7.8.5"
},
"browserslist": [
"> 0.5%, last 2 versions, Firefox ESR, not dead, not op_mini all"
"defaults and fully supports es6-module"
]
}

View file

@ -28,48 +28,52 @@ classifiers = [
"Programming Language :: Python :: 3.12",
]
dependencies = [
"Django==5.1.2",
"Django==5.1.8",
"django-agnocomplete==2.2.0",
"django-environ==0.11.2",
"django-environ==0.12.0",
"django-probes==1.7.0",
"Pillow==11.0.0",
"psycopg==3.2.3",
"Pillow==11.2.1",
"psycopg==3.2.6",
"requests==2.32.3",
"rcssmin==1.1.3",
"rjsmin==1.2.3",
"social-auth-core==4.5.4",
"social-auth-app-django==5.4.2",
"rcssmin==1.2.1",
"rjsmin==1.2.4",
"social-auth-core==4.5.6",
"social-auth-app-django==5.4.3",
]
[project.optional-dependencies]
dev = [
"hatch==1.13.0",
"ruff==0.7.0",
"djlint==1.35.2",
"hatch==1.14.1",
"ruff==0.11.6",
"djlint==1.36.4",
"mkdocs==1.6.1",
"mkdocs-material==9.5.42",
"mkdocs-static-i18n==1.2.3",
"mkdocs-material==9.6.12",
"mkdocs-static-i18n==1.3.0",
"vermin==1.6.0",
"pymdown-extensions==10.11.2",
"isort==5.13.2",
"pymdown-extensions==10.14.3",
"isort==6.0.1",
]
test = [
"factory-boy==3.3.1",
"daphne==4.1.2",
"factory-boy==3.3.3",
"playwright>=1.39",
"pytest==8.3.3",
"pytest-django==4.9.0",
"pytest-playwright==0.5.2",
"pytest-rerunfailures==14.0",
"pytest==8.3.5",
"pytest-django==4.11.1",
"pytest-playwright==0.7.0",
"pytest-rerunfailures==15.0",
"pytest-xdist>=3.5.0,<4",
"moto[s3]==5.1.4"
]
docker = [
"uwsgi==2.0.27",
"uvicorn==0.34.2",
]
s3 = [
"django-storages[s3]==1.14.6",
]
sync = [
"channels==4.1.0",
"daphne==4.1.2",
"pydantic==2.9.2",
"websockets==13.1",
"pydantic==2.11.3",
"redis==5.2.1",
"websockets==15.0.1",
]
[project.scripts]
@ -100,3 +104,6 @@ format_css=true
blank_line_after_tag="load,extends"
line_break_after_multiline_tag=true
[lint]
# Disable autoremove of unused import.
unfixable = ["F401"]

View file

@ -16,8 +16,6 @@ mkdir -p umap/static/umap/vendors/markercluster/ && cp -r node_modules/leaflet.m
mkdir -p umap/static/umap/vendors/markercluster/ && cp -r node_modules/leaflet.markercluster/dist/MarkerCluster.* umap/static/umap/vendors/markercluster/
mkdir -p umap/static/umap/vendors/heat/ && cp -r node_modules/leaflet.heat/dist/leaflet-heat.js umap/static/umap/vendors/heat/
mkdir -p umap/static/umap/vendors/fullscreen/ && cp -r node_modules/leaflet-fullscreen/dist/** umap/static/umap/vendors/fullscreen/
mkdir -p umap/static/umap/vendors/toolbar/ && cp -r node_modules/leaflet-toolbar/dist/leaflet.toolbar.* umap/static/umap/vendors/toolbar/
mkdir -p umap/static/umap/vendors/formbuilder/ && cp -r node_modules/leaflet-formbuilder/Leaflet.FormBuilder.js umap/static/umap/vendors/formbuilder/
mkdir -p umap/static/umap/vendors/measurable/ && cp -r node_modules/leaflet-measurable/Leaflet.Measurable.* umap/static/umap/vendors/measurable/
mkdir -p umap/static/umap/vendors/photon/ && cp -r node_modules/leaflet.photon/leaflet.photon.js umap/static/umap/vendors/photon/
mkdir -p umap/static/umap/vendors/csv2geojson/ && cp -r node_modules/csv2geojson/csv2geojson.js umap/static/umap/vendors/csv2geojson/

View file

@ -1 +1 @@
VERSION = "2.7.0"
VERSION = "3.0.5"

View file

@ -69,9 +69,18 @@ class PictogramAdmin(admin.ModelAdmin):
list_filter = ("category",)
class TeamAdmin(admin.ModelAdmin):
class TeamAdmin(CSVExportMixin, admin.ModelAdmin):
csv_fields = [
"pk",
"name",
"users_count",
]
list_display = list(admin.ModelAdmin.list_display) + ["users_count"]
filter_horizontal = ("users",)
def users_count(self, obj):
return obj.users.count()
class UserAdmin(CSVExportMixin, UserAdminBase):
csv_fields = [
@ -83,13 +92,17 @@ class UserAdmin(CSVExportMixin, UserAdminBase):
"last_login",
"date_joined",
"maps_count",
"user_teams",
]
list_display = list(UserAdminBase.list_display) + ["maps_count"]
list_display = list(UserAdminBase.list_display) + ["maps_count", "user_teams"]
def maps_count(self, obj):
# owner maps + maps as editor
return obj.owned_maps.count() + obj.map_set.count()
def user_teams(self, obj):
return " ; ".join(obj.teams.values_list("name", flat=True))
admin.site.register(Map, MapAdmin)
admin.site.register(DataLayer)

View file

@ -1,15 +1,20 @@
import os
from channels.routing import ProtocolTypeRouter
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "umap.settings")
from django.core.asgi import get_asgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "umap.settings")
from .sync.app import application as ws_application
# Initialize Django ASGI application early to ensure the AppRegistry
# is populated before importing code that may import ORM models.
django_asgi_app = get_asgi_application()
application = ProtocolTypeRouter(
{
"http": django_asgi_app,
}
)
async def application(scope, receive, send):
if scope["type"] == "http":
await django_asgi_app(scope, receive, send)
elif scope["type"] == "websocket":
await ws_application(scope, receive, send)
else:
raise NotImplementedError(f"Unknown scope type {scope['type']}")

View file

@ -2,6 +2,7 @@ from agnocomplete.core import AgnocompleteModel
from agnocomplete.register import register
from django.conf import settings
from django.contrib.auth import get_user_model
from django.db.models.functions import Length
@register
@ -13,3 +14,11 @@ class AutocompleteUser(AgnocompleteModel):
data = super().item(current_item)
data["url"] = current_item.get_url()
return data
def build_extra_filtered_queryset(self, queryset, **kwargs):
order_by = []
for field_name in self.fields:
if not field_name[0].isalnum():
field_name = field_name[1:]
order_by.append(Length(field_name).asc())
return queryset.order_by(*order_by)

View file

@ -7,12 +7,14 @@ def settings(request):
return {
"UMAP_HELP_URL": djsettings.UMAP_HELP_URL,
"SITE_NAME": djsettings.SITE_NAME,
"SITE_DESCRIPTION": djsettings.SITE_DESCRIPTION,
"SITE_URL": djsettings.SITE_URL,
"ENABLE_ACCOUNT_LOGIN": djsettings.ENABLE_ACCOUNT_LOGIN,
"UMAP_READONLY": djsettings.UMAP_READONLY,
"UMAP_DEMO_SITE": djsettings.UMAP_DEMO_SITE,
"UMAP_HOST_INFOS": djsettings.UMAP_HOST_INFOS,
"UMAP_ALLOW_EDIT_PROFILE": djsettings.UMAP_ALLOW_EDIT_PROFILE,
"UMAP_TAGS": djsettings.UMAP_TAGS,
}

View file

@ -1,9 +1,11 @@
from functools import wraps
from django.conf import settings
from django.core.exceptions import PermissionDenied
from django.http import HttpResponseForbidden
from django.shortcuts import get_object_or_404
from django.urls import reverse_lazy
from django.utils.translation import gettext as _
from .models import Map, Team
from .views import simple_json_response
@ -55,7 +57,7 @@ def can_view_map(view_func):
map_inst = get_object_or_404(Map, pk=kwargs["map_id"])
kwargs["map_inst"] = map_inst # Avoid rerequesting the map in the view
if not map_inst.can_view(request):
return HttpResponseForbidden()
raise PermissionDenied(_("This map is not publicly available"))
return view_func(request, *args, **kwargs)
return wrapper

View file

@ -4,7 +4,6 @@ from django.contrib.auth import get_user_model
from django.contrib.gis.geos import Point
from django.forms.utils import ErrorList
from django.template.defaultfilters import slugify
from django.utils.translation import gettext_lazy as _
from .models import DataLayer, Map, Team
@ -40,16 +39,12 @@ class UpdateMapPermissionsForm(forms.ModelForm):
class AnonymousMapPermissionsForm(forms.ModelForm):
STATUS = (
(Map.OWNER, _("Only editable with secret edit link")),
(Map.ANONYMOUS, _("Everyone can edit")),
)
edit_status = forms.ChoiceField(choices=STATUS)
edit_status = forms.ChoiceField(choices=Map.ANONYMOUS_EDIT_STATUS)
share_status = forms.ChoiceField(choices=Map.ANONYMOUS_SHARE_STATUS)
class Meta:
model = Map
fields = ("edit_status",)
fields = ("edit_status", "share_status")
class DataLayerForm(forms.ModelForm):
@ -65,13 +60,7 @@ class DataLayerPermissionsForm(forms.ModelForm):
class AnonymousDataLayerPermissionsForm(forms.ModelForm):
STATUS = (
(DataLayer.INHERIT, _("Inherit")),
(DataLayer.OWNER, _("Only editable with secret edit link")),
(DataLayer.ANONYMOUS, _("Everyone can edit")),
)
edit_status = forms.ChoiceField(choices=STATUS)
edit_status = forms.ChoiceField(choices=DataLayer.ANONYMOUS_EDIT_STATUS)
class Meta:
model = DataLayer
@ -102,7 +91,7 @@ class MapSettingsForm(forms.ModelForm):
return self.cleaned_data["center"]
class Meta:
fields = ("settings", "name", "center", "slug")
fields = ("settings", "name", "center", "slug", "tags")
model = Map

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-15 13:53+0000\n"
"POT-Creation-Date: 2024-12-11 17:05+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Alazar Tekle <al3may3hu@gmail.com>, 2015\n"
"Language-Team: Amharic (Ethiopia) (http://app.transifex.com/openstreetmap/umap/language/am_ET/)\n"
@ -18,258 +18,316 @@ msgstr ""
"Language: am_ET\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "በሚስጥር የመረሚያ መስመሩ ብቻ የሚታረም"
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "ሁሉም ማረም ይችላል"
#: forms.py:69 models.py:371
msgid "Inherit"
#: admin.py:16
msgid "CSV Export"
msgstr ""
#: middleware.py:13
msgid "Site is readonly for maintenance"
msgstr ""
#: models.py:50
#: models.py:60 models.py:79
msgid "name"
msgstr "ስም"
#: models.py:81
msgid "details"
msgstr "ዝርዝሮች"
#: models.py:82
msgid "Link to a page where the licence is detailed."
msgstr "ፈቃዱ በዝርዝር ከተቀመጠ ገፅ ጛር አገናኝ"
#: models.py:92
msgid "URL template using OSM tile format"
msgstr "የድረ-ገፅ አድራሻ ተምሳሌ በኦ.ኤስ.ኤም. የታይል ፎርማት"
#: models.py:98
msgid "Order of the tilelayers in the edit box"
msgstr "በማረሚያ ሳጥኑ ውስጥ የታይል ሌየሮቹ ቅደም ተከተል"
#: models.py:144 models.py:372
msgid "Everyone"
msgstr ""
#: models.py:145 models.py:151 models.py:373
msgid "Editors only"
msgstr ""
#: models.py:146 models.py:374
msgid "Owner only"
msgstr ""
#: models.py:149
msgid "Everyone (public)"
msgstr ""
#: models.py:150
msgid "Anyone with link"
msgstr ""
#: models.py:152
msgid "Blocked"
msgstr ""
#: models.py:155 models.py:378
#: models.py:62 models.py:475
msgid "description"
msgstr "መገለጫ"
#: models.py:156
#: models.py:110
msgid "details"
msgstr "ዝርዝሮች"
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr "ፈቃዱ በዝርዝር ከተቀመጠ ገፅ ጛር አገናኝ"
#: models.py:121
msgid "URL template using OSM tile format"
msgstr "የድረ-ገፅ አድራሻ ተምሳሌ በኦ.ኤስ.ኤም. የታይል ፎርማት"
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr "በማረሚያ ሳጥኑ ውስጥ የታይል ሌየሮቹ ቅደም ተከተል"
#: models.py:175 models.py:469
msgid "Only editable with secret edit link"
msgstr "በሚስጥር የመረሚያ መስመሩ ብቻ የሚታረም"
#: models.py:176 models.py:470
msgid "Everyone can edit"
msgstr "ሁሉም ማረም ይችላል"
#: models.py:179 models.py:463
msgid "Everyone"
msgstr ""
#: models.py:180 models.py:189 models.py:464
msgid "Editors and team only"
msgstr ""
#: models.py:181 models.py:465
msgid "Owner only"
msgstr ""
#: models.py:184
msgid "Draft (private)"
msgstr ""
#: models.py:185
msgid "Everyone (public)"
msgstr ""
#: models.py:188
msgid "Anyone with link"
msgstr ""
#: models.py:190
msgid "Blocked"
msgstr ""
#: models.py:191
msgid "Deleted"
msgstr ""
#: models.py:194
msgid "center"
msgstr "መሀከል"
#: models.py:157
#: models.py:195
msgid "zoom"
msgstr "ዙም"
#: models.py:159
#: models.py:197
msgid "locate"
msgstr "ጠቁም"
#: models.py:159
#: models.py:197
msgid "Locate user on load?"
msgstr "በመጫን ላይ ያለውን ተጠቃሚ ጠቁም?"
#: models.py:163
#: models.py:201
msgid "Choose the map licence."
msgstr "የካርታውን ፈቃድ ከልስ"
#: models.py:164
#: models.py:202
msgid "licence"
msgstr "ፈቃድ"
#: models.py:175
#: models.py:213
msgid "owner"
msgstr "ባለቤት"
#: models.py:179
#: models.py:217
msgid "editors"
msgstr "አራሚዎች"
#: models.py:184 models.py:392
#: models.py:223
msgid "team"
msgstr ""
#: models.py:229 models.py:491
msgid "edit status"
msgstr "ያለበትን ሁኔታ አርም"
#: models.py:189
#: models.py:234
msgid "share status"
msgstr "ያለበትን ሁኔታ አጋራ"
#: models.py:192 models.py:387
#: models.py:237 models.py:486
msgid "settings"
msgstr "ሁኔታዎች"
#: models.py:320
#: models.py:402
msgid "Clone of"
msgstr "ድቃይ"
#: models.py:382
#: models.py:462 models.py:468
msgid "Inherit"
msgstr ""
#: models.py:481
msgid "display on load"
msgstr "በመጫን ላይ አሳይ"
#: models.py:383
#: models.py:482
msgid "Display this layer on load."
msgstr "ሌየሩ በመጫን ላይ አሳይ"
#: templates/404.html:6
#: templates/404.html:8
msgid "Take me to the home page"
msgstr ""
#: templates/auth/user_detail.html:5
#: templates/auth/user_detail.html:8
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "የ %(current_user)s'ን ካርታ አስስ"
#: templates/auth/user_detail.html:12
#: templates/auth/user_detail.html:17
#, python-format
msgid "%(current_user)s has no maps."
msgstr ""
#: templates/auth/user_form.html:6
msgid "My Maps"
msgstr ""
#: templates/auth/user_form.html:7
msgid "My Profile"
msgstr ""
#: templates/auth/user_form.html:20
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
msgid "Save"
msgstr ""
#: templates/auth/user_form.html:25
#: templates/auth/user_form.html:27
msgid "Your current providers"
msgstr ""
#: templates/auth/user_form.html:31
#: templates/auth/user_form.html:39
msgid "Connect to another provider"
msgstr ""
#: templates/auth/user_form.html:33
#: templates/auth/user_form.html:42
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr ""
#: templates/auth/user_stars.html:5
#: templates/auth/user_stars.html:8
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr ""
#: templates/auth/user_stars.html:12
#: templates/auth/user_stars.html:17
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr ""
#: templates/base.html:12
#: templates/base.html:13
msgid ""
"uMap lets you create maps with OpenStreetMap layers in a minute and embed "
"them in your site."
msgstr ""
#: templates/registration/login.html:16
msgid "Please log in with your account"
msgstr ""
#: templates/registration/login.html:28
msgid "Username"
msgstr ""
#: templates/registration/login.html:31
msgid "Password"
msgstr ""
#: templates/registration/login.html:32
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr ""
#: templates/registration/login.html:37
msgid "Please choose a provider"
msgstr "እባክዎ አቅራቢ ይምረጡ"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr ""
#: templates/umap/about_summary.html:11
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr ""
#: templates/registration/login.html:42
msgid "Username"
msgstr ""
#: templates/registration/login.html:45
msgid "Password"
msgstr ""
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr ""
#: templates/umap/about_summary.html:12
#, python-format
msgid ""
"uMap lets you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
"layers in a minute and embed them in your site."
msgstr ""
#: templates/umap/about_summary.html:21
#: templates/umap/about_summary.html:23
msgid "Choose the layers of your map"
msgstr "የካርታዎን ሌየሮች ይምረጡ"
#: templates/umap/about_summary.html:22
#: templates/umap/about_summary.html:26
msgid "Add POIs: markers, lines, polygons..."
msgstr "ፒ.ኦ.አይ. ይጨምሩ፡ ማርከሮች፣ መስመሮች፣ ፖሊጎኖች ..."
#: templates/umap/about_summary.html:23
#: templates/umap/about_summary.html:29
msgid "Manage POIs colours and icons"
msgstr "የፒ.ኦ.አይ. ከለሮችን እና ጠቋሚዎችን ያስተዳድሩ"
#: templates/umap/about_summary.html:24
#: templates/umap/about_summary.html:32
msgid "Manage map options: display a minimap, locate user on load…"
msgstr "የካርታ አማራጮችን ያስተዳድሩ። ትንሽ ካርታ አሳይ፣ ተጠቃሚውን በመጫን ላይ አሳይ ..."
#: templates/umap/about_summary.html:25
#: templates/umap/about_summary.html:35
msgid "Batch import geostructured data (geojson, gpx, kml, osm...)"
msgstr "ጂዖስትራክቸርድ የሆነ መረጃ በጅምላ አምጣ (geojson, gpx, kml, osm...)"
#: templates/umap/about_summary.html:26
#: templates/umap/about_summary.html:38
msgid "Choose the license for your data"
msgstr "ለመረጃዎ ፈቃድ ይምረጡ"
#: templates/umap/about_summary.html:27
#: templates/umap/about_summary.html:41
msgid "Embed and share your map"
msgstr "ካርታዎን ያካትቱ እና ይጋሩ"
#: templates/umap/about_summary.html:37
#: templates/umap/about_summary.html:52
#, python-format
msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "እንዲሁም <a href=\"%(repo_url)s\">ነፃ እና ክፍት ነው</a> !"
#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38
#: templates/umap/user_dashboard.html:42
#: templates/umap/about_summary.html:63 templates/umap/navigation.html:39
#: templates/umap/user_dashboard.html:40
msgid "Create a map"
msgstr "ካርታ ፍጠር"
#: templates/umap/about_summary.html:51
#: templates/umap/about_summary.html:66
msgid "Play with the demo"
msgstr "በማሳያው ተለማመድ"
#: templates/umap/content.html:22
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
msgid "Close"
msgstr ""
#: templates/umap/components/alerts/alert.html:30
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
"target=\"_blank\">create an account</a> or <a href=\"%(login_url)s\" "
"target=\"_blank\">log in</a>."
msgstr ""
#: templates/umap/components/alerts/alert.html:35
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr ""
#: templates/umap/components/alerts/alert.html:39
msgid "Copy link"
msgstr ""
#: templates/umap/components/alerts/alert.html:46
msgid "Enter your email address to receive the secret link:"
msgstr ""
#: templates/umap/components/alerts/alert.html:52
msgid "Email"
msgstr ""
#: templates/umap/components/alerts/alert.html:55
msgid "Send me the link"
msgstr ""
#: templates/umap/components/alerts/alert.html:79
msgid "See their edits in another tab"
msgstr ""
#: templates/umap/components/alerts/alert.html:82
msgid "Keep your changes and loose theirs"
msgstr ""
#: templates/umap/components/alerts/alert.html:85
msgid "Keep their changes and loose yours"
msgstr ""
#: templates/umap/content.html:26
msgid ""
"This instance of uMap is currently in read only mode, no creation/edit is "
"allowed."
msgstr ""
#: templates/umap/content.html:30
#: templates/umap/content.html:34
#, python-format
msgid ""
"This is a demo instance, used for tests and pre-rolling releases. If you "
@ -278,270 +336,339 @@ msgid ""
"instance, it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "ይህ ለሙከራ እና ፕሪ-ሮሊግ ሪሊዞች የሚያገለግል ማሳያ ነው። ቋሚ የሆነ ማሳያ ከፈለጉ እባክዎ <a href=\"%(stable_url)s\">%(stable_url)s</a> ይጠቀሙ። እንዲሁም የራስዎን ማስቀመጥ ይችላሉ፣ <a href=\"%(repo_url)s\">ነፃ እና ክፍት</a> ነው!"
#: templates/umap/home.html:8
#: templates/umap/content_footer.html:5
msgid "An OpenStreetMap project"
msgstr ""
#: templates/umap/content_footer.html:6
msgid "version"
msgstr ""
#: templates/umap/content_footer.html:7
msgid "Hosted by"
msgstr ""
#: templates/umap/content_footer.html:8
msgid "Contact"
msgstr ""
#: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
msgid "Help"
msgstr ""
#: templates/umap/dashboard_menu.html:6
#, python-format
msgid "My Maps (%(count)s)"
msgstr ""
#: templates/umap/dashboard_menu.html:8
msgid "My Maps"
msgstr ""
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr ""
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr ""
#: templates/umap/home.html:14
msgid "Map of the uMaps"
msgstr "የዩማፖች ካርታ"
#: templates/umap/home.html:14
#: templates/umap/home.html:24
msgid "Get inspired, browse maps"
msgstr "ካርታዎችን ተመልከት፣ ስሜትህን አነቃቃ!"
#: templates/umap/login_popup_end.html:2
#: templates/umap/login_popup_end.html:4
msgid "You are logged in. Continuing..."
msgstr "ገብተዋል። በመቀጠል ላይ ..."
#: templates/umap/map_list.html:9 views.py:341
#: templates/umap/map_list.html:11 views.py:433
msgid "by"
msgstr "በ"
#: templates/umap/map_list.html:17
#: templates/umap/map_list.html:20
msgid "More"
msgstr "ተጨማሪ"
#: templates/umap/map_table.html:6
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
msgid "Name"
msgstr ""
#: templates/umap/map_table.html:7
#: templates/umap/map_table.html:11
msgid "Preview"
msgstr ""
#: templates/umap/map_table.html:8
#: templates/umap/map_table.html:14
msgid "Who can see"
msgstr ""
#: templates/umap/map_table.html:9
#: templates/umap/map_table.html:17
msgid "Who can edit"
msgstr ""
#: templates/umap/map_table.html:10
#: templates/umap/map_table.html:20
msgid "Last save"
msgstr ""
#: templates/umap/map_table.html:11
#: templates/umap/map_table.html:23
msgid "Owner"
msgstr ""
#: templates/umap/map_table.html:12
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
msgid "Actions"
msgstr ""
#: templates/umap/map_table.html:25 templates/umap/map_table.html:27
#: templates/umap/map_table.html:41 templates/umap/map_table.html:43
msgid "Open preview"
msgstr ""
#: templates/umap/map_table.html:46 templates/umap/map_table.html:48
#: templates/umap/map_table.html:72 templates/umap/map_table.html:74
msgid "Share"
msgstr ""
#: templates/umap/map_table.html:51 templates/umap/map_table.html:53
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
msgid "Edit"
msgstr ""
#: templates/umap/map_table.html:56 templates/umap/map_table.html:58
#: templates/umap/map_table.html:84 templates/umap/map_table.html:86
msgid "Download"
msgstr ""
#: templates/umap/map_table.html:63 templates/umap/map_table.html:65
#: templates/umap/map_table.html:90 templates/umap/map_table.html:92
msgid "Clone"
msgstr ""
#: templates/umap/map_table.html:73 templates/umap/map_table.html:75
#: templates/umap/map_table.html:101 templates/umap/map_table.html:103
msgid "Delete"
msgstr ""
#: templates/umap/map_table.html:88
#: templates/umap/map_table.html:117
msgid "first"
msgstr ""
#: templates/umap/map_table.html:89
#: templates/umap/map_table.html:118
msgid "previous"
msgstr ""
#: templates/umap/map_table.html:98
#: templates/umap/map_table.html:126
#, python-format
msgid "Page %(maps_number)s of %(num_pages)s"
msgstr ""
#: templates/umap/map_table.html:104
#: templates/umap/map_table.html:131
msgid "next"
msgstr ""
#: templates/umap/map_table.html:105
#: templates/umap/map_table.html:132
msgid "last"
msgstr ""
#: templates/umap/map_table.html:113
#: templates/umap/map_table.html:140
#, python-format
msgid "Lines per page: %(per_page)s"
msgstr ""
#: templates/umap/map_table.html:118
#: templates/umap/map_table.html:145
#, python-format
msgid "%(count)s maps"
msgstr ""
#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4
#: templates/umap/navigation.html:11 templates/umap/user_dashboard.html:6
msgid "My Dashboard"
msgstr ""
#: templates/umap/navigation.html:13
#: templates/umap/navigation.html:14
msgid "Starred maps"
msgstr ""
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Log in"
msgstr "ግባ"
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Sign in"
msgstr "ግባ"
#: templates/umap/navigation.html:21
#: templates/umap/navigation.html:22
msgid "About"
msgstr "ስለ"
#: templates/umap/navigation.html:24
msgid "Help"
msgstr ""
#: templates/umap/navigation.html:29
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr ""
#: templates/umap/navigation.html:33
#: templates/umap/navigation.html:34
msgid "Log out"
msgstr "ውጣ"
#: templates/umap/password_change.html:4
#: templates/umap/password_change.html:7
msgid "Password change"
msgstr ""
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:10
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr ""
#: templates/umap/password_change.html:13
#: templates/umap/password_change.html:17
msgid "Old password"
msgstr ""
#: templates/umap/password_change.html:18
#: templates/umap/password_change.html:22
msgid "New password"
msgstr ""
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password confirmation"
msgstr ""
#: templates/umap/password_change.html:23
#: templates/umap/password_change.html:27
msgid "Change my password"
msgstr ""
#: templates/umap/password_change_done.html:4
#: templates/umap/password_change_done.html:7
msgid "Password change successful"
msgstr ""
#: templates/umap/password_change_done.html:5
#: templates/umap/password_change_done.html:10
msgid "Your password was changed."
msgstr ""
#: templates/umap/search.html:10
#: templates/umap/search.html:15
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
msgstr[0] ""
msgstr[1] ""
#: templates/umap/search.html:18
#: templates/umap/search.html:24
msgid "No map found."
msgstr ""
#: templates/umap/search.html:21
#: templates/umap/search.html:29
msgid "Latest created maps"
msgstr ""
#: templates/umap/search_bar.html:3
#: templates/umap/search_bar.html:4
msgid "Search maps"
msgstr "ካርታዎች መሀከል ፈልግ"
#: templates/umap/search_bar.html:14
#: templates/umap/search_bar.html:15
msgid "Search"
msgstr "ፈልግ"
#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26
#: templates/umap/team_detail.html:10
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr ""
#: templates/umap/team_detail.html:22
#, python-format
msgid "%(current_team)s has no public maps."
msgstr ""
#: templates/umap/team_form.html:24
msgid "Delete this team"
msgstr ""
#: templates/umap/team_form.html:47
msgid "Add user"
msgstr ""
#: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
msgid "Search my maps"
msgstr ""
#: templates/umap/user_dashboard.html:11
#, python-format
msgid "My Maps (%(count)s)"
msgstr ""
#: templates/umap/user_dashboard.html:13
msgid "My profile"
msgstr ""
#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23
#: templates/umap/user_dashboard.html:17 templates/umap/user_dashboard.html:22
msgid "Maps title"
msgstr ""
#: templates/umap/user_dashboard.html:32
#: templates/umap/user_dashboard.html:30
#, python-format
msgid "Download %(count)s maps"
msgstr ""
#: templates/umap/user_dashboard.html:42
#: templates/umap/user_dashboard.html:40
msgid "You have no map yet."
msgstr ""
#: views.py:346
#: templates/umap/user_teams.html:17
msgid "Users"
msgstr ""
#: templates/umap/user_teams.html:48
msgid "New team"
msgstr ""
#: views.py:234
msgid "Cannot delete a team with more than one member"
msgstr ""
#: views.py:238
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr ""
#: views.py:438
msgid "View the map"
msgstr "ካርታውን አሳይ"
#: views.py:704
#: views.py:820
msgid "See full screen"
msgstr ""
#: views.py:803
#: views.py:963
msgid "Map editors updated with success!"
msgstr "የካርታ አራሚዎች በትክክል ታድሰዋል!"
#: views.py:841
#: views.py:999
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr ""
#: views.py:844
#: views.py:1002
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr ""
#: views.py:850
#: views.py:1009
#, python-format
msgid "Can't send email to %(email)s"
msgstr ""
#: views.py:1012
#, python-format
msgid "Email sent to %(email)s"
msgstr ""
#: views.py:861
#: views.py:1023
msgid "Only its owner can delete the map."
msgstr "ካርታውን የሚሰርዘው ባለቤቱ ብቻ ነው።"
#: views.py:889
#: views.py:1026
msgid "Map successfully deleted."
msgstr ""
#: views.py:1052
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "ካርታዎ ተዳቅሏል! ይህንን ካርታ ከሌላ ኮምፒውተር ላይ ሆነው ለማረም ከፈለጉ የሚከተለውን አድራሻ ይጠቀሙ %(anonymous_url)s"
#: views.py:894
#: views.py:1057
msgid "Congratulations, your map has been cloned!"
msgstr "እንኳን ደስ አለዎ ካርታዎ ተዳቅሏል!"
#: views.py:1130
#: views.py:1308
msgid "Layer successfully deleted."
msgstr "ሌየሩ በትክክል ተሰርዟ"
#: views.py:1152
#: views.py:1330
msgid "Permissions updated with success!"
msgstr ""

Binary file not shown.

View file

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-25 08:16+0000\n"
"POT-Creation-Date: 2024-12-24 08:39+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Med Limem Smida <medlimem200@gmail.com>, 2018\n"
"Language-Team: Arabic (http://app.transifex.com/openstreetmap/umap/language/ar/)\n"
@ -20,260 +20,331 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: forms.py:43
#, python-format
msgid "Secret edit link is %s"
#: admin.py:16
msgid "CSV Export"
msgstr ""
#: forms.py:47
msgid "Everyone can edit"
msgstr "يمكن للجميع التعدبل"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr ""
#: forms.py:48
msgid "Only editable with secret edit link"
msgstr "قابل للتعديل فقط مع رابط تعديلٍ سري"
#: middleware.py:14
#: middleware.py:13
msgid "Site is readonly for maintenance"
msgstr "الموقع مفتوح للقراءة فقط لغاية الصيانة"
#: models.py:48
#: models.py:60 models.py:79
msgid "name"
msgstr "الإسم"
#: models.py:79
msgid "details"
msgstr "تفاصيل"
#: models.py:80
msgid "Link to a page where the licence is detailed."
msgstr ""
#: models.py:90
msgid "URL template using OSM tile format"
msgstr ""
#: models.py:96
msgid "Order of the tilelayers in the edit box"
msgstr ""
#: models.py:142
msgid "Everyone"
msgstr ""
#: models.py:143 models.py:149
msgid "Editors only"
msgstr ""
#: models.py:144
msgid "Owner only"
msgstr ""
#: models.py:147
msgid "Everyone (public)"
msgstr ""
#: models.py:148
msgid "Anyone with link"
msgstr ""
#: models.py:150
msgid "Blocked"
msgstr ""
#: models.py:153 models.py:307
#: models.py:62 models.py:475
msgid "description"
msgstr "تقديم"
#: models.py:154
#: models.py:110
msgid "details"
msgstr "تفاصيل"
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr ""
#: models.py:121
msgid "URL template using OSM tile format"
msgstr ""
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr ""
#: models.py:175 models.py:469
msgid "Only editable with secret edit link"
msgstr "قابل للتعديل فقط مع رابط تعديلٍ سري"
#: models.py:176 models.py:470
msgid "Everyone can edit"
msgstr "يمكن للجميع التعدبل"
#: models.py:179 models.py:463
msgid "Everyone"
msgstr ""
#: models.py:180 models.py:189 models.py:464
msgid "Editors and team only"
msgstr ""
#: models.py:181 models.py:465
msgid "Owner only"
msgstr ""
#: models.py:184
msgid "Draft (private)"
msgstr ""
#: models.py:185
msgid "Everyone (public)"
msgstr ""
#: models.py:188
msgid "Anyone with link"
msgstr ""
#: models.py:190
msgid "Blocked"
msgstr ""
#: models.py:191
msgid "Deleted"
msgstr ""
#: models.py:194
msgid "center"
msgstr "وسط"
#: models.py:155
#: models.py:195
msgid "zoom"
msgstr "تكبير"
#: models.py:157
#: models.py:197
msgid "locate"
msgstr "تموقع"
#: models.py:157
#: models.py:197
msgid "Locate user on load?"
msgstr "حدد موقع المستعمل عند التحميل ؟"
#: models.py:161
#: models.py:201
msgid "Choose the map licence."
msgstr "إختر رخصة الخريطة."
#: models.py:162
#: models.py:202
msgid "licence"
msgstr "الترخيص"
#: models.py:172
#: models.py:213
msgid "owner"
msgstr ""
#: models.py:176
#: models.py:217
msgid "editors"
msgstr ""
#: models.py:181
#: models.py:223
msgid "team"
msgstr ""
#: models.py:229 models.py:491
msgid "edit status"
msgstr ""
#: models.py:186
#: models.py:234
msgid "share status"
msgstr ""
#: models.py:189 models.py:316
#: models.py:237 models.py:486
msgid "settings"
msgstr ""
#: models.py:262
#: models.py:402
msgid "Clone of"
msgstr ""
#: models.py:311
#: models.py:462 models.py:468
msgid "Inherit"
msgstr ""
#: models.py:481
msgid "display on load"
msgstr ""
#: models.py:312
#: models.py:482
msgid "Display this layer on load."
msgstr "عرض هذه الطبقة عند التحميل"
#: templates/404.html:6
msgid "Take me to the home page"
msgstr "الرجوع إلى الصفحة الرئيسية"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr ""
#: templates/auth/user_detail.html:5
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr ""
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr ""
#: templates/auth/user_detail.html:8
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "تصفح خرائط %(current_user)s"
#: templates/auth/user_detail.html:12
#: templates/auth/user_detail.html:17
#, python-format
msgid "%(current_user)s has no maps."
msgstr "%(current_user)sلا يملك أي خريطة. "
#: templates/auth/user_form.html:6 templates/umap/navigation.html:12
#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:10
msgid "My Dashboard"
msgstr ""
#: templates/auth/user_form.html:6
msgid "My Profile"
msgstr ""
#: templates/auth/user_form.html:19
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
msgid "Save"
msgstr ""
#: templates/auth/user_form.html:24
#: templates/auth/user_form.html:27
msgid "Your current providers"
msgstr ""
#: templates/auth/user_form.html:30
#: templates/auth/user_form.html:39
msgid "Connect to another provider"
msgstr ""
#: templates/auth/user_form.html:32
#: templates/auth/user_form.html:42
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr ""
#: templates/auth/user_stars.html:5
#: templates/auth/user_stars.html:8
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr ""
#: templates/auth/user_stars.html:12
#: templates/auth/user_stars.html:17
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr ""
#: templates/base.html:12
#: templates/base.html:13
msgid ""
"uMap lets you create maps with OpenStreetMap layers in a minute and embed "
"them in your site."
msgstr ""
#: templates/registration/login.html:3
msgid "Please log in with your account"
msgstr "الرجاء الدخول بحسابك"
#: templates/registration/login.html:15
msgid "Username"
msgstr "إسم المستخدم"
#: templates/registration/login.html:18
msgid "Password"
msgstr "كلمة السر"
#: templates/registration/login.html:19
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "تسجيل الدخول"
#: templates/registration/login.html:24
msgid "Please choose a provider"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr ""
#: templates/umap/about_summary.html:11
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr ""
#: templates/registration/login.html:42
msgid "Username"
msgstr "إسم المستخدم"
#: templates/registration/login.html:45
msgid "Password"
msgstr "كلمة السر"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr ""
#: templates/umap/about_summary.html:12
#, python-format
msgid ""
"uMap lets you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
"layers in a minute and embed them in your site."
msgstr ""
#: templates/umap/about_summary.html:21
#: templates/umap/about_summary.html:23
msgid "Choose the layers of your map"
msgstr "إختر الطبقات على خريطتك"
#: templates/umap/about_summary.html:22
#: templates/umap/about_summary.html:26
msgid "Add POIs: markers, lines, polygons..."
msgstr ""
#: templates/umap/about_summary.html:23
#: templates/umap/about_summary.html:29
msgid "Manage POIs colours and icons"
msgstr ""
#: templates/umap/about_summary.html:24
#: templates/umap/about_summary.html:32
msgid "Manage map options: display a minimap, locate user on load…"
msgstr ""
#: templates/umap/about_summary.html:25
#: templates/umap/about_summary.html:35
msgid "Batch import geostructured data (geojson, gpx, kml, osm...)"
msgstr ""
#: templates/umap/about_summary.html:26
#: templates/umap/about_summary.html:38
msgid "Choose the license for your data"
msgstr "إختر رخصة بياناتك"
#: templates/umap/about_summary.html:27
#: templates/umap/about_summary.html:41
msgid "Embed and share your map"
msgstr ""
#: templates/umap/about_summary.html:37
#: templates/umap/about_summary.html:52
#, python-format
msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr ""
#: templates/umap/about_summary.html:48 templates/umap/navigation.html:42
#: templates/umap/user_dashboard.html:20
#: templates/umap/about_summary.html:63 templates/umap/navigation.html:39
#: templates/umap/user_dashboard.html:40
msgid "Create a map"
msgstr "أنشئ خريطةً"
#: templates/umap/about_summary.html:51
#: templates/umap/about_summary.html:66
msgid "Play with the demo"
msgstr ""
#: templates/umap/content.html:23
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr ""
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
"target=\"_blank\">create an account</a> or <a href=\"%(login_url)s\" "
"target=\"_blank\">log in</a>."
msgstr ""
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr ""
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr ""
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr ""
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr ""
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr ""
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr ""
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr ""
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr ""
#: templates/umap/content.html:26
msgid ""
"This instance of uMap is currently in read only mode, no creation/edit is "
"allowed."
msgstr ""
#: templates/umap/content.html:31
#: templates/umap/content.html:34
#, python-format
msgid ""
"This is a demo instance, used for tests and pre-rolling releases. If you "
@ -282,125 +353,210 @@ msgid ""
"instance, it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr ""
#: templates/umap/home.html:8
msgid "Map of the uMaps"
#: templates/umap/content_footer.html:5
msgid "An OpenStreetMap project"
msgstr ""
#: templates/umap/home.html:13
msgid "Get inspired, browse maps"
#: templates/umap/content_footer.html:6
msgid "version"
msgstr ""
#: templates/umap/login_popup_end.html:2
msgid "You are logged in. Continuing..."
#: templates/umap/content_footer.html:7
msgid "Hosted by"
msgstr ""
#: templates/umap/map_list.html:9 views.py:300
msgid "by"
#: templates/umap/content_footer.html:8
msgid "Contact"
msgstr ""
#: templates/umap/map_list.html:17 templates/umap/map_table.html:39
msgid "More"
msgstr ""
#: templates/umap/map_table.html:6
msgid "Map"
msgstr ""
#: templates/umap/map_table.html:7
msgid "Name"
msgstr ""
#: templates/umap/map_table.html:8
msgid "Who can see / edit"
msgstr ""
#: templates/umap/map_table.html:9
msgid "Last save"
msgstr ""
#: templates/umap/map_table.html:10
msgid "Owner"
msgstr ""
#: templates/umap/map_table.html:11
msgid "Actions"
msgstr ""
#: templates/umap/map_table.html:28
msgid "Share"
msgstr ""
#: templates/umap/map_table.html:29
msgid "Edit"
msgstr ""
#: templates/umap/map_table.html:30
msgid "Download"
msgstr ""
#: templates/umap/navigation.html:15
msgid "Starred maps"
msgstr ""
#: templates/umap/navigation.html:19
msgid "Log in"
msgstr "دخول"
#: templates/umap/navigation.html:19
msgid "Sign in"
msgstr "تسجيل"
#: templates/umap/navigation.html:23
msgid "About"
msgstr ""
#: templates/umap/navigation.html:26
#: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
msgid "Help"
msgstr ""
#: templates/umap/navigation.html:31
#: templates/umap/dashboard_menu.html:6
#, python-format
msgid "My Maps (%(count)s)"
msgstr ""
#: templates/umap/dashboard_menu.html:8
msgid "My Maps"
msgstr ""
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr ""
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr ""
#: templates/umap/home.html:14
msgid "Map of the uMaps"
msgstr ""
#: templates/umap/home.html:24
msgid "Get inspired, browse maps"
msgstr ""
#: templates/umap/login_popup_end.html:4
msgid "You are logged in. Continuing..."
msgstr ""
#: templates/umap/map_list.html:11 views.py:437
msgid "by"
msgstr ""
#: templates/umap/map_list.html:20
msgid "More"
msgstr ""
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
msgid "Name"
msgstr ""
#: templates/umap/map_table.html:11
msgid "Preview"
msgstr ""
#: templates/umap/map_table.html:14
msgid "Who can see"
msgstr ""
#: templates/umap/map_table.html:17
msgid "Who can edit"
msgstr ""
#: templates/umap/map_table.html:20
msgid "Last save"
msgstr ""
#: templates/umap/map_table.html:23
msgid "Owner"
msgstr ""
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
msgid "Actions"
msgstr ""
#: templates/umap/map_table.html:41 templates/umap/map_table.html:43
msgid "Open preview"
msgstr ""
#: templates/umap/map_table.html:72 templates/umap/map_table.html:74
msgid "Share"
msgstr ""
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
msgid "Edit"
msgstr ""
#: templates/umap/map_table.html:84 templates/umap/map_table.html:86
msgid "Download"
msgstr ""
#: templates/umap/map_table.html:90 templates/umap/map_table.html:92
msgid "Clone"
msgstr ""
#: templates/umap/map_table.html:101 templates/umap/map_table.html:103
msgid "Delete"
msgstr ""
#: templates/umap/map_table.html:117
msgid "first"
msgstr ""
#: templates/umap/map_table.html:118
msgid "previous"
msgstr ""
#: templates/umap/map_table.html:126
#, python-format
msgid "Page %(maps_number)s of %(num_pages)s"
msgstr ""
#: templates/umap/map_table.html:131
msgid "next"
msgstr ""
#: templates/umap/map_table.html:132
msgid "last"
msgstr ""
#: templates/umap/map_table.html:140
#, python-format
msgid "Lines per page: %(per_page)s"
msgstr ""
#: templates/umap/map_table.html:145
#, python-format
msgid "%(count)s maps"
msgstr ""
#: templates/umap/navigation.html:11 templates/umap/user_dashboard.html:6
msgid "My Dashboard"
msgstr ""
#: templates/umap/navigation.html:14
msgid "Starred maps"
msgstr ""
#: templates/umap/navigation.html:18
msgid "Log in"
msgstr "دخول"
#: templates/umap/navigation.html:18
msgid "Sign in"
msgstr "تسجيل"
#: templates/umap/navigation.html:22
msgid "About"
msgstr ""
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "غير كلمة السر"
#: templates/umap/navigation.html:35
#: templates/umap/navigation.html:34
msgid "Log out"
msgstr "تسجيل خروج"
#: templates/umap/password_change.html:4
#: templates/umap/password_change.html:7
msgid "Password change"
msgstr ""
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:10
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "الرجاء إدخال كلمة السر القديمة، لغرض الحماية، ثم إدخال كلمة السر الجديدة مرتين للتثبت من حسن رقنها. "
#: templates/umap/password_change.html:13
#: templates/umap/password_change.html:17
msgid "Old password"
msgstr "كلمة السر القديمة"
#: templates/umap/password_change.html:18
#: templates/umap/password_change.html:22
msgid "New password"
msgstr "كلمة السر الجديدة"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password confirmation"
msgstr "تأكيد كلمة السر الجديدة"
#: templates/umap/password_change.html:23
#: templates/umap/password_change.html:27
msgid "Change my password"
msgstr ""
#: templates/umap/password_change_done.html:4
#: templates/umap/password_change_done.html:7
msgid "Password change successful"
msgstr "تغيير ناجح لكلمة السر"
#: templates/umap/password_change_done.html:5
#: templates/umap/password_change_done.html:10
msgid "Your password was changed."
msgstr ""
#: templates/umap/search.html:10
#: templates/umap/search.html:15
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
@ -411,76 +567,129 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
#: templates/umap/search.html:18
#: templates/umap/search.html:24
msgid "No map found."
msgstr ""
#: templates/umap/search.html:21
#: templates/umap/search.html:29
msgid "Latest created maps"
msgstr ""
#: templates/umap/search_bar.html:3
#: templates/umap/search_bar.html:4
msgid "Search maps"
msgstr "البحث عن خرائط"
#: templates/umap/search_bar.html:14
#: templates/umap/search_bar.html:15
msgid "Search"
msgstr "ابحث"
#: templates/umap/user_dashboard.html:7
#: templates/umap/team_detail.html:10
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr ""
#: templates/umap/team_detail.html:22
#, python-format
msgid "%(current_team)s has no public maps."
msgstr ""
#: templates/umap/team_form.html:24
msgid "Delete this team"
msgstr ""
#: templates/umap/team_form.html:47
msgid "Add user"
msgstr ""
#: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
msgid "Search my maps"
msgstr ""
#: templates/umap/user_dashboard.html:10
msgid "My profile"
#: templates/umap/user_dashboard.html:17 templates/umap/user_dashboard.html:22
msgid "Maps title"
msgstr ""
#: templates/umap/user_dashboard.html:20
#: templates/umap/user_dashboard.html:30
#, python-format
msgid "Download %(count)s maps"
msgstr ""
#: templates/umap/user_dashboard.html:40
msgid "You have no map yet."
msgstr ""
#: views.py:305
#: templates/umap/user_teams.html:17
msgid "Users"
msgstr ""
#: templates/umap/user_teams.html:48
msgid "New team"
msgstr ""
#: views.py:234
msgid "Cannot delete a team with more than one member"
msgstr ""
#: views.py:238
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr ""
#: views.py:442
msgid "View the map"
msgstr ""
#: views.py:628
msgid "Map has been updated!"
#: views.py:825
msgid "See full screen"
msgstr ""
#: views.py:653
#: views.py:968
msgid "Map editors updated with success!"
msgstr ""
#: views.py:691
#: views.py:1004
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr ""
#: views.py:694
#: views.py:1007
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr ""
#: views.py:700
#: views.py:1014
#, python-format
msgid "Can't send email to %(email)s"
msgstr ""
#: views.py:1017
#, python-format
msgid "Email sent to %(email)s"
msgstr ""
#: views.py:711
#: views.py:1028
msgid "Only its owner can delete the map."
msgstr "لا يمكن إلا لصاحب الخريطة حذفها."
#: views.py:734
#: views.py:1031
msgid "Map successfully deleted."
msgstr ""
#: views.py:1057
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr ""
#: views.py:739
#: views.py:1062
msgid "Congratulations, your map has been cloned!"
msgstr ""
#: views.py:922
#: views.py:1313
msgid "Layer successfully deleted."
msgstr "تم حذف الطبقة بنجاح."
#: views.py:1335
msgid "Permissions updated with success!"
msgstr ""

Binary file not shown.

View file

@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-15 13:53+0000\n"
"POT-Creation-Date: 2024-12-11 17:05+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Пламен, 2021\n"
"Language-Team: Bulgarian (http://app.transifex.com/openstreetmap/umap/language/bg/)\n"
@ -21,258 +21,316 @@ msgstr ""
"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "Само може да се редактира с тайно редактиран линк"
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "Всеки може да редактира"
#: forms.py:69 models.py:371
msgid "Inherit"
#: admin.py:16
msgid "CSV Export"
msgstr ""
#: middleware.py:13
msgid "Site is readonly for maintenance"
msgstr ""
#: models.py:50
#: models.py:60 models.py:79
msgid "name"
msgstr "име"
#: models.py:81
msgid "details"
msgstr "детайли"
#: models.py:82
msgid "Link to a page where the licence is detailed."
msgstr "Линк към страницата с подробно описание за лиценза."
#: models.py:92
msgid "URL template using OSM tile format"
msgstr "URL шаблон, използван формат OSM плочи"
#: models.py:98
msgid "Order of the tilelayers in the edit box"
msgstr "Поръчка на tilelayers в полето за редактиране"
#: models.py:144 models.py:372
msgid "Everyone"
msgstr ""
#: models.py:145 models.py:151 models.py:373
msgid "Editors only"
msgstr ""
#: models.py:146 models.py:374
msgid "Owner only"
msgstr ""
#: models.py:149
msgid "Everyone (public)"
msgstr ""
#: models.py:150
msgid "Anyone with link"
msgstr ""
#: models.py:152
msgid "Blocked"
msgstr ""
#: models.py:155 models.py:378
#: models.py:62 models.py:475
msgid "description"
msgstr "описание"
#: models.py:156
#: models.py:110
msgid "details"
msgstr "детайли"
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr "Линк към страницата с подробно описание за лиценза."
#: models.py:121
msgid "URL template using OSM tile format"
msgstr "URL шаблон, използван формат OSM плочи"
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr "Поръчка на tilelayers в полето за редактиране"
#: models.py:175 models.py:469
msgid "Only editable with secret edit link"
msgstr "Само може да се редактира с тайно редактиран линк"
#: models.py:176 models.py:470
msgid "Everyone can edit"
msgstr "Всеки може да редактира"
#: models.py:179 models.py:463
msgid "Everyone"
msgstr ""
#: models.py:180 models.py:189 models.py:464
msgid "Editors and team only"
msgstr ""
#: models.py:181 models.py:465
msgid "Owner only"
msgstr ""
#: models.py:184
msgid "Draft (private)"
msgstr ""
#: models.py:185
msgid "Everyone (public)"
msgstr ""
#: models.py:188
msgid "Anyone with link"
msgstr ""
#: models.py:190
msgid "Blocked"
msgstr ""
#: models.py:191
msgid "Deleted"
msgstr ""
#: models.py:194
msgid "center"
msgstr "център"
#: models.py:157
#: models.py:195
msgid "zoom"
msgstr "мащаб"
#: models.py:159
#: models.py:197
msgid "locate"
msgstr "локализирай"
#: models.py:159
#: models.py:197
msgid "Locate user on load?"
msgstr "Локализирай потребител при зареждане?"
#: models.py:163
#: models.py:201
msgid "Choose the map licence."
msgstr "Избери лиценз за картата."
#: models.py:164
#: models.py:202
msgid "licence"
msgstr "лиценз"
#: models.py:175
#: models.py:213
msgid "owner"
msgstr "притежател"
#: models.py:179
#: models.py:217
msgid "editors"
msgstr "редактори"
#: models.py:184 models.py:392
#: models.py:223
msgid "team"
msgstr ""
#: models.py:229 models.py:491
msgid "edit status"
msgstr "статус на редактиране"
#: models.py:189
#: models.py:234
msgid "share status"
msgstr "сподели статус"
#: models.py:192 models.py:387
#: models.py:237 models.py:486
msgid "settings"
msgstr "настройки"
#: models.py:320
#: models.py:402
msgid "Clone of"
msgstr "Клониране на"
#: models.py:382
#: models.py:462 models.py:468
msgid "Inherit"
msgstr ""
#: models.py:481
msgid "display on load"
msgstr "покажи при зареждане"
#: models.py:383
#: models.py:482
msgid "Display this layer on load."
msgstr "Покажи този слой при зареждане"
#: templates/404.html:6
#: templates/404.html:8
msgid "Take me to the home page"
msgstr ""
#: templates/auth/user_detail.html:5
#: templates/auth/user_detail.html:8
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "Разгледай картите на %(current_user)s"
#: templates/auth/user_detail.html:12
#: templates/auth/user_detail.html:17
#, python-format
msgid "%(current_user)s has no maps."
msgstr ""
#: templates/auth/user_form.html:6
msgid "My Maps"
msgstr ""
#: templates/auth/user_form.html:7
msgid "My Profile"
msgstr ""
#: templates/auth/user_form.html:20
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
msgid "Save"
msgstr ""
#: templates/auth/user_form.html:25
#: templates/auth/user_form.html:27
msgid "Your current providers"
msgstr ""
#: templates/auth/user_form.html:31
#: templates/auth/user_form.html:39
msgid "Connect to another provider"
msgstr ""
#: templates/auth/user_form.html:33
#: templates/auth/user_form.html:42
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr ""
#: templates/auth/user_stars.html:5
#: templates/auth/user_stars.html:8
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr ""
#: templates/auth/user_stars.html:12
#: templates/auth/user_stars.html:17
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr ""
#: templates/base.html:12
#: templates/base.html:13
msgid ""
"uMap lets you create maps with OpenStreetMap layers in a minute and embed "
"them in your site."
msgstr ""
#: templates/registration/login.html:16
msgid "Please log in with your account"
msgstr ""
#: templates/registration/login.html:28
msgid "Username"
msgstr "Потр. име"
#: templates/registration/login.html:31
msgid "Password"
msgstr "Парола"
#: templates/registration/login.html:32
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "Вход"
#: templates/registration/login.html:37
msgid "Please choose a provider"
msgstr "Моля изберете провайдер"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr ""
#: templates/umap/about_summary.html:11
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr ""
#: templates/registration/login.html:42
msgid "Username"
msgstr "Потр. име"
#: templates/registration/login.html:45
msgid "Password"
msgstr "Парола"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr ""
#: templates/umap/about_summary.html:12
#, python-format
msgid ""
"uMap lets you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
"layers in a minute and embed them in your site."
msgstr ""
#: templates/umap/about_summary.html:21
#: templates/umap/about_summary.html:23
msgid "Choose the layers of your map"
msgstr "Изберете слоевете на своята карта"
#: templates/umap/about_summary.html:22
#: templates/umap/about_summary.html:26
msgid "Add POIs: markers, lines, polygons..."
msgstr "Добави POIs: маркери, линии, полигони ..."
#: templates/umap/about_summary.html:23
#: templates/umap/about_summary.html:29
msgid "Manage POIs colours and icons"
msgstr "Промени POIs цветове и икони"
#: templates/umap/about_summary.html:24
#: templates/umap/about_summary.html:32
msgid "Manage map options: display a minimap, locate user on load…"
msgstr "Играй с опциите на картата: покажи миникарта, локализирай потребителя при зареждане ..."
#: templates/umap/about_summary.html:25
#: templates/umap/about_summary.html:35
msgid "Batch import geostructured data (geojson, gpx, kml, osm...)"
msgstr "Внасяне на географски данни (geojson, gpx, kml, osm...)"
#: templates/umap/about_summary.html:26
#: templates/umap/about_summary.html:38
msgid "Choose the license for your data"
msgstr "Избери лиценз за своите данни"
#: templates/umap/about_summary.html:27
#: templates/umap/about_summary.html:41
msgid "Embed and share your map"
msgstr "Вгради и сподели картата"
#: templates/umap/about_summary.html:37
#: templates/umap/about_summary.html:52
#, python-format
msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "И това е <a href=\"%(repo_url)s\">отворен код</a>!"
#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38
#: templates/umap/user_dashboard.html:42
#: templates/umap/about_summary.html:63 templates/umap/navigation.html:39
#: templates/umap/user_dashboard.html:40
msgid "Create a map"
msgstr "Създай карта"
#: templates/umap/about_summary.html:51
#: templates/umap/about_summary.html:66
msgid "Play with the demo"
msgstr "Играй си с демото"
#: templates/umap/content.html:22
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
msgid "Close"
msgstr ""
#: templates/umap/components/alerts/alert.html:30
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
"target=\"_blank\">create an account</a> or <a href=\"%(login_url)s\" "
"target=\"_blank\">log in</a>."
msgstr ""
#: templates/umap/components/alerts/alert.html:35
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr ""
#: templates/umap/components/alerts/alert.html:39
msgid "Copy link"
msgstr ""
#: templates/umap/components/alerts/alert.html:46
msgid "Enter your email address to receive the secret link:"
msgstr ""
#: templates/umap/components/alerts/alert.html:52
msgid "Email"
msgstr ""
#: templates/umap/components/alerts/alert.html:55
msgid "Send me the link"
msgstr ""
#: templates/umap/components/alerts/alert.html:79
msgid "See their edits in another tab"
msgstr ""
#: templates/umap/components/alerts/alert.html:82
msgid "Keep your changes and loose theirs"
msgstr ""
#: templates/umap/components/alerts/alert.html:85
msgid "Keep their changes and loose yours"
msgstr ""
#: templates/umap/content.html:26
msgid ""
"This instance of uMap is currently in read only mode, no creation/edit is "
"allowed."
msgstr ""
#: templates/umap/content.html:30
#: templates/umap/content.html:34
#, python-format
msgid ""
"This is a demo instance, used for tests and pre-rolling releases. If you "
@ -281,270 +339,339 @@ msgid ""
"instance, it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "Това е само демо пример, използван за тестове и предварителни издания. Ако имате нужда от стабилна версия, моля използвайте <a href=\"%(stable_url)s\">%(stable_url)s</ A>. Можете също така да бъде хост на вашата собствена версия, това е <a href=\"%(repo_url)s\"> отворен код </ A>!"
#: templates/umap/home.html:8
#: templates/umap/content_footer.html:5
msgid "An OpenStreetMap project"
msgstr ""
#: templates/umap/content_footer.html:6
msgid "version"
msgstr ""
#: templates/umap/content_footer.html:7
msgid "Hosted by"
msgstr ""
#: templates/umap/content_footer.html:8
msgid "Contact"
msgstr ""
#: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
msgid "Help"
msgstr ""
#: templates/umap/dashboard_menu.html:6
#, python-format
msgid "My Maps (%(count)s)"
msgstr ""
#: templates/umap/dashboard_menu.html:8
msgid "My Maps"
msgstr ""
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr ""
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr ""
#: templates/umap/home.html:14
msgid "Map of the uMaps"
msgstr "Карта от картите на uMaps"
#: templates/umap/home.html:14
#: templates/umap/home.html:24
msgid "Get inspired, browse maps"
msgstr "Вдъхнови се, разгледай други карти "
#: templates/umap/login_popup_end.html:2
#: templates/umap/login_popup_end.html:4
msgid "You are logged in. Continuing..."
msgstr "В процес на включване. Продължение..."
#: templates/umap/map_list.html:9 views.py:341
#: templates/umap/map_list.html:11 views.py:433
msgid "by"
msgstr "от"
#: templates/umap/map_list.html:17
#: templates/umap/map_list.html:20
msgid "More"
msgstr "Още"
#: templates/umap/map_table.html:6
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
msgid "Name"
msgstr ""
#: templates/umap/map_table.html:7
#: templates/umap/map_table.html:11
msgid "Preview"
msgstr ""
#: templates/umap/map_table.html:8
#: templates/umap/map_table.html:14
msgid "Who can see"
msgstr ""
#: templates/umap/map_table.html:9
#: templates/umap/map_table.html:17
msgid "Who can edit"
msgstr ""
#: templates/umap/map_table.html:10
#: templates/umap/map_table.html:20
msgid "Last save"
msgstr ""
#: templates/umap/map_table.html:11
#: templates/umap/map_table.html:23
msgid "Owner"
msgstr ""
#: templates/umap/map_table.html:12
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
msgid "Actions"
msgstr ""
#: templates/umap/map_table.html:25 templates/umap/map_table.html:27
#: templates/umap/map_table.html:41 templates/umap/map_table.html:43
msgid "Open preview"
msgstr ""
#: templates/umap/map_table.html:46 templates/umap/map_table.html:48
#: templates/umap/map_table.html:72 templates/umap/map_table.html:74
msgid "Share"
msgstr ""
#: templates/umap/map_table.html:51 templates/umap/map_table.html:53
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
msgid "Edit"
msgstr ""
#: templates/umap/map_table.html:56 templates/umap/map_table.html:58
#: templates/umap/map_table.html:84 templates/umap/map_table.html:86
msgid "Download"
msgstr ""
#: templates/umap/map_table.html:63 templates/umap/map_table.html:65
#: templates/umap/map_table.html:90 templates/umap/map_table.html:92
msgid "Clone"
msgstr ""
#: templates/umap/map_table.html:73 templates/umap/map_table.html:75
#: templates/umap/map_table.html:101 templates/umap/map_table.html:103
msgid "Delete"
msgstr ""
#: templates/umap/map_table.html:88
#: templates/umap/map_table.html:117
msgid "first"
msgstr ""
#: templates/umap/map_table.html:89
#: templates/umap/map_table.html:118
msgid "previous"
msgstr ""
#: templates/umap/map_table.html:98
#: templates/umap/map_table.html:126
#, python-format
msgid "Page %(maps_number)s of %(num_pages)s"
msgstr ""
#: templates/umap/map_table.html:104
#: templates/umap/map_table.html:131
msgid "next"
msgstr ""
#: templates/umap/map_table.html:105
#: templates/umap/map_table.html:132
msgid "last"
msgstr ""
#: templates/umap/map_table.html:113
#: templates/umap/map_table.html:140
#, python-format
msgid "Lines per page: %(per_page)s"
msgstr ""
#: templates/umap/map_table.html:118
#: templates/umap/map_table.html:145
#, python-format
msgid "%(count)s maps"
msgstr ""
#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4
#: templates/umap/navigation.html:11 templates/umap/user_dashboard.html:6
msgid "My Dashboard"
msgstr ""
#: templates/umap/navigation.html:13
#: templates/umap/navigation.html:14
msgid "Starred maps"
msgstr ""
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Log in"
msgstr "Влизане"
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Sign in"
msgstr "Регистрация"
#: templates/umap/navigation.html:21
#: templates/umap/navigation.html:22
msgid "About"
msgstr "Относно"
#: templates/umap/navigation.html:24
msgid "Help"
msgstr ""
#: templates/umap/navigation.html:29
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr ""
#: templates/umap/navigation.html:33
#: templates/umap/navigation.html:34
msgid "Log out"
msgstr "Излизане"
#: templates/umap/password_change.html:4
#: templates/umap/password_change.html:7
msgid "Password change"
msgstr ""
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:10
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr ""
#: templates/umap/password_change.html:13
#: templates/umap/password_change.html:17
msgid "Old password"
msgstr ""
#: templates/umap/password_change.html:18
#: templates/umap/password_change.html:22
msgid "New password"
msgstr ""
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password confirmation"
msgstr ""
#: templates/umap/password_change.html:23
#: templates/umap/password_change.html:27
msgid "Change my password"
msgstr ""
#: templates/umap/password_change_done.html:4
#: templates/umap/password_change_done.html:7
msgid "Password change successful"
msgstr ""
#: templates/umap/password_change_done.html:5
#: templates/umap/password_change_done.html:10
msgid "Your password was changed."
msgstr ""
#: templates/umap/search.html:10
#: templates/umap/search.html:15
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
msgstr[0] ""
msgstr[1] ""
#: templates/umap/search.html:18
#: templates/umap/search.html:24
msgid "No map found."
msgstr ""
#: templates/umap/search.html:21
#: templates/umap/search.html:29
msgid "Latest created maps"
msgstr ""
#: templates/umap/search_bar.html:3
#: templates/umap/search_bar.html:4
msgid "Search maps"
msgstr "Търсене на карти"
#: templates/umap/search_bar.html:14
#: templates/umap/search_bar.html:15
msgid "Search"
msgstr "Търсене"
#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26
#: templates/umap/team_detail.html:10
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr ""
#: templates/umap/team_detail.html:22
#, python-format
msgid "%(current_team)s has no public maps."
msgstr ""
#: templates/umap/team_form.html:24
msgid "Delete this team"
msgstr ""
#: templates/umap/team_form.html:47
msgid "Add user"
msgstr ""
#: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
msgid "Search my maps"
msgstr ""
#: templates/umap/user_dashboard.html:11
#, python-format
msgid "My Maps (%(count)s)"
msgstr ""
#: templates/umap/user_dashboard.html:13
msgid "My profile"
msgstr ""
#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23
#: templates/umap/user_dashboard.html:17 templates/umap/user_dashboard.html:22
msgid "Maps title"
msgstr ""
#: templates/umap/user_dashboard.html:32
#: templates/umap/user_dashboard.html:30
#, python-format
msgid "Download %(count)s maps"
msgstr ""
#: templates/umap/user_dashboard.html:42
#: templates/umap/user_dashboard.html:40
msgid "You have no map yet."
msgstr ""
#: views.py:346
#: templates/umap/user_teams.html:17
msgid "Users"
msgstr ""
#: templates/umap/user_teams.html:48
msgid "New team"
msgstr ""
#: views.py:234
msgid "Cannot delete a team with more than one member"
msgstr ""
#: views.py:238
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr ""
#: views.py:438
msgid "View the map"
msgstr "Виж картата"
#: views.py:704
#: views.py:820
msgid "See full screen"
msgstr ""
#: views.py:803
#: views.py:963
msgid "Map editors updated with success!"
msgstr "Редакторите на картата актуализират с успех!"
#: views.py:841
#: views.py:999
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr ""
#: views.py:844
#: views.py:1002
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr ""
#: views.py:850
#: views.py:1009
#, python-format
msgid "Can't send email to %(email)s"
msgstr ""
#: views.py:1012
#, python-format
msgid "Email sent to %(email)s"
msgstr ""
#: views.py:861
#: views.py:1023
msgid "Only its owner can delete the map."
msgstr "Само собственикът може да изтрие картата."
#: views.py:889
#: views.py:1026
msgid "Map successfully deleted."
msgstr ""
#: views.py:1052
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "Вашата карта е клонирана! Ако искате да редактирате тази карта от друг компютър, моля използвайте този линк: %(anonymous_url)s"
#: views.py:894
#: views.py:1057
msgid "Congratulations, your map has been cloned!"
msgstr "Поздравления, вашата карта е клонирана!"
#: views.py:1130
#: views.py:1308
msgid "Layer successfully deleted."
msgstr "Слоят е изтрит успешно."
#: views.py:1152
#: views.py:1330
msgid "Permissions updated with success!"
msgstr ""

Binary file not shown.

View file

@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Dren ar Frankig <hadrienlouque@gmail.com>, 2023-2024
# Dren ar Frankig <hadrienlouque@gmail.com>, 2023-2025
# Dren ar Frankig <hadrienlouque@gmail.com>, 2023
# Dren ar Frankig <hadrienlouque@gmail.com>, 2023
msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-30 18:23+0000\n"
"POT-Creation-Date: 2025-03-03 14:11+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Dren ar Frankig <hadrienlouque@gmail.com>, 2023-2024\n"
"Last-Translator: Dren ar Frankig <hadrienlouque@gmail.com>, 2023-2025\n"
"Language-Team: Breton (http://app.transifex.com/openstreetmap/umap/language/br/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -20,168 +20,209 @@ msgstr ""
"Language: br\n"
"Plural-Forms: nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "N'haller he c'hemmañ nemet gant ul liamm aozañ kuzh"
#: admin.py:16
msgid "CSV Export"
msgstr "Ezporzhiadur CSV"
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "An holl a c'hall kemmañ"
#: forms.py:69 models.py:423
msgid "Inherit"
msgstr "Dre ziouer"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr "Ar gartenn-mañ n'eo ket publik"
#: middleware.py:13
msgid "Site is readonly for maintenance"
msgstr "Al lec'hienn zo da lenn hepken rak emeur ouzh he c'hempenn"
#: models.py:54 models.py:73
#: models.py:60 models.py:79
msgid "name"
msgstr "anv"
#: models.py:56 models.py:433
#: models.py:62 models.py:485
msgid "description"
msgstr "deskrivadur"
#: models.py:104
#: models.py:110
msgid "details"
msgstr "munudoù"
#: models.py:105
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr "Liamm war-zu ur bajenn a zispleg an aotre-implijout."
#: models.py:115
#: models.py:121
msgid "URL template using OSM tile format"
msgstr "Patrom URL a implij furmad teol OSM"
#: models.py:121
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr ""
#: models.py:167 models.py:424
#: models.py:175 models.py:479
msgid "Only editable with secret edit link"
msgstr "N'haller he c'hemmañ nemet gant ul liamm aozañ kuzh"
#: models.py:176 models.py:480
msgid "Everyone can edit"
msgstr "An holl a c'hall kemmañ"
#: models.py:179 models.py:473
msgid "Everyone"
msgstr "An holl"
#: models.py:168 models.py:174 models.py:425
#: models.py:180 models.py:189 models.py:474
msgid "Editors and team only"
msgstr ""
msgstr "An aozerien hag ar skipailh hepken"
#: models.py:169 models.py:426
#: models.py:181 models.py:475
msgid "Owner only"
msgstr "Ar perc'henner hepken"
#: models.py:172
#: models.py:184
msgid "Draft (private)"
msgstr "Brouilhed (prevez)"
#: models.py:185
msgid "Everyone (public)"
msgstr "An holl (publik)"
#: models.py:173
#: models.py:188
msgid "Anyone with link"
msgstr "Piv bennak en deus ul liamm"
#: models.py:175
#: models.py:190
msgid "Blocked"
msgstr "Stanket"
#: models.py:178
#: models.py:191 models.py:469
msgid "Deleted"
msgstr "Dilemel"
#: models.py:194
msgid "center"
msgstr "kreizañ"
#: models.py:179
#: models.py:195
msgid "zoom"
msgstr "zoumañ"
#: models.py:181
#: models.py:197
msgid "locate"
msgstr "lec'hiañ"
#: models.py:181
#: models.py:197
msgid "Locate user on load?"
msgstr "Lec'hiañ an implijer en ur gargañ?"
#: models.py:185
#: models.py:201
msgid "Choose the map licence."
msgstr "Dibabit aotre-implijout ar gartenn."
#: models.py:186
#: models.py:202
msgid "licence"
msgstr "aotre"
#: models.py:197
#: models.py:213
msgid "owner"
msgstr "perc'henner"
#: models.py:201
#: models.py:217
msgid "editors"
msgstr "aozerien"
#: models.py:207
#: models.py:223
msgid "team"
msgstr ""
msgstr "skipailh"
#: models.py:213 models.py:447
#: models.py:229 models.py:501
msgid "edit status"
msgstr "statud aozañ"
#: models.py:218
#: models.py:234 models.py:506
msgid "share status"
msgstr "digor da biv?"
#: models.py:221 models.py:442
#: models.py:237 models.py:496
msgid "settings"
msgstr "arventennoù"
#: models.py:364
#: models.py:407
msgid "Clone of"
msgstr "Eilenn eus"
#: models.py:437
#: models.py:468 models.py:472 models.py:478
msgid "Inherit"
msgstr "Dre ziouer"
#: models.py:491
msgid "display on load"
msgstr "diskwel pa vez karget"
#: models.py:438
#: models.py:492
msgid "Display this layer on load."
msgstr "Diskwel ar gwiskad-mañ pa vez karget"
#: templates/404.html:8
msgid "Take me to the home page"
msgstr "Distreiñ d'ar bajenn degemer"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr ""
#: templates/auth/user_detail.html:8
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr "← Distreiñ d'ar bajenn degemer"
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr "404 N'eo ket bet kavet ar bajenn"
#: templates/auth/user_detail.html:6
#, python-format
msgid "%(current_user)ss maps"
msgstr "Kartennoù eus %(current_user)s"
#: templates/auth/user_detail.html:12
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "Merdeiñ e kartennoù %(current_user)s"
#: templates/auth/user_detail.html:17
#: templates/auth/user_detail.html:21
#, python-format
msgid "%(current_user)s has no maps."
msgstr "%(current_user)s n'en/he deus kartenn ebet."
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
#: templates/auth/user_form.html:6
msgid "My Profile"
msgstr "Ma frofil"
#: templates/auth/user_form.html:24 templates/umap/team_form.html:25
msgid "Save"
msgstr "Enrollañ"
#: templates/auth/user_form.html:27
#: templates/auth/user_form.html:30
msgid "Your current providers"
msgstr "Ho pourchaserien a-vremañ"
#: templates/auth/user_form.html:39
#: templates/auth/user_form.html:44
msgid "Connect to another provider"
msgstr "Kennaskañ ouzh ur pourchaser all"
#: templates/auth/user_form.html:42
#: templates/auth/user_form.html:47
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr ""
#: templates/auth/user_stars.html:8
#: templates/auth/user_stars.html:6
#, python-format
msgid "%(current_user)ss starred maps"
msgstr "Kartennoù muiañ karet eus %(current_user)s"
#: templates/auth/user_stars.html:12
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr "Merdeiñ e kartennoù spilhennet %(current_user)s"
#: templates/auth/user_stars.html:17
#: templates/auth/user_stars.html:21
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr "%(current_user)s n'en/he deus kartenn spilhennet ebet."
@ -192,25 +233,33 @@ msgid ""
"them in your site."
msgstr "uMap a ro tro deoc'h da grouiñ kartennoù en ur serr-lagad gant foñsoù OpenStreetMap ha d'o enframmañ e-barzh ho lec'hienn."
#: templates/registration/login.html:6 templates/registration/login.html:45
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "Kevreañ"
#: templates/registration/login.html:24
msgid "Please log in with your account"
msgstr "Kevreit gant ho kont mar plij"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr "Evit enrollañ ha kavout ho kartennoù en doare aes, kennaskit mar plij."
#: templates/registration/login.html:41
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr "Kennaskit gant ho kont mar plij:"
#: templates/registration/login.html:42
msgid "Username"
msgstr "Anv implijer"
#: templates/registration/login.html:44
#: templates/registration/login.html:45
msgid "Password"
msgstr "Ger-tremen"
#: templates/registration/login.html:51
msgid "Please choose a provider"
msgstr "Dibabit ur pourchaser mar plij"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr "Dibabit ur pourchaser mar plij:"
#: templates/umap/about.html:5 templates/umap/navigation.html:22
msgid "About"
msgstr "Diwar-benn"
#: templates/umap/about_summary.html:12
#, python-format
@ -261,13 +310,13 @@ msgstr "Krouiñ ur gartenn"
msgid "Play with the demo"
msgstr "Amprouiñ an tañva!"
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr "Serriñ"
#: templates/umap/components/alerts/alert.html:30
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
@ -275,35 +324,35 @@ msgid ""
"target=\"_blank\">log in</a>."
msgstr ""
#: templates/umap/components/alerts/alert.html:35
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr ""
#: templates/umap/components/alerts/alert.html:39
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr "Eilañ al liamm"
#: templates/umap/components/alerts/alert.html:46
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr ""
#: templates/umap/components/alerts/alert.html:52
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr "Postel"
#: templates/umap/components/alerts/alert.html:55
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr "Kas al liamm din"
#: templates/umap/components/alerts/alert.html:79
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr ""
#: templates/umap/components/alerts/alert.html:82
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr "Derc'hel ho kemmoù hag argas o re"
#: templates/umap/components/alerts/alert.html:85
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr "Derc'hel o c'hemmoù hag argas ho re"
@ -324,19 +373,19 @@ msgstr ""
#: templates/umap/content_footer.html:5
msgid "An OpenStreetMap project"
msgstr ""
msgstr "Ur raktres OpenStreetMap"
#: templates/umap/content_footer.html:6
msgid "version"
msgstr ""
msgstr "stumm"
#: templates/umap/content_footer.html:7
msgid "Hosted by"
msgstr ""
msgstr "Herberc'hiet gant"
#: templates/umap/content_footer.html:8
msgid "Contact"
msgstr ""
msgstr "Darempred"
#: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
msgid "Help"
@ -351,13 +400,13 @@ msgstr "Ma c'hartennoù (%(count)s)"
msgid "My Maps"
msgstr "Ma c'hartennoù"
#: templates/umap/dashboard_menu.html:11
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr "Ma frofil"
#: templates/umap/dashboard_menu.html:13
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr ""
msgstr "Ma skipailhoù"
#: templates/umap/home.html:14
msgid "Map of the uMaps"
@ -371,15 +420,15 @@ msgstr "Bezit awenet en ur furchal kartennoù"
msgid "You are logged in. Continuing..."
msgstr "Kevreet oc'h. Gortozit ur pennadig..."
#: templates/umap/map_list.html:10 views.py:433
#: templates/umap/map_list.html:11 views.py:437
msgid "by"
msgstr "gant"
#: templates/umap/map_list.html:18
#: templates/umap/map_list.html:20
msgid "More"
msgstr "Muioc'h"
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:18
msgid "Name"
msgstr "Anv"
@ -403,7 +452,7 @@ msgstr "Enrollet da ziwezhañ"
msgid "Owner"
msgstr "Perc'henner"
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:24
msgid "Actions"
msgstr "Oberoù"
@ -416,7 +465,7 @@ msgid "Share"
msgstr "Rannañ"
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
#: templates/umap/user_teams.html:42 templates/umap/user_teams.html:44
msgid "Edit"
msgstr "Aozañ"
@ -479,10 +528,6 @@ msgstr "Kevreañ"
msgid "Sign in"
msgstr "Krouiñ ur gont"
#: templates/umap/navigation.html:22
msgid "About"
msgstr "Diwar-benn"
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "Cheñch ar ger-tremen"
@ -491,41 +536,47 @@ msgstr "Cheñch ar ger-tremen"
msgid "Log out"
msgstr "Digevreañ"
#: templates/umap/password_change.html:7
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:11
msgid "Password change"
msgstr "Cheñch ar ger-tremen"
#: templates/umap/password_change.html:10
#: templates/umap/password_change.html:14
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "Enankit ho ker-tremen kozh ha div wezh ho ker-tremen nevez war-lerc'h mar plij."
#: templates/umap/password_change.html:17
#: templates/umap/password_change.html:21
msgid "Old password"
msgstr "Ger-tremen kozh"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password"
msgstr "Ger-tremen nevez"
#: templates/umap/password_change.html:26
#: templates/umap/password_change.html:30
msgid "New password confirmation"
msgstr "Kadarnaat ar ger-tremen nevez"
#: templates/umap/password_change.html:27
#: templates/umap/password_change.html:31
msgid "Change my password"
msgstr "Cheñch ar ger-tremen"
#: templates/umap/password_change_done.html:7
#: templates/umap/password_change_done.html:6
#: templates/umap/password_change_done.html:11
msgid "Password change successful"
msgstr "Cheñchet eo bet ar ger-tremen gant berzh"
#: templates/umap/password_change_done.html:10
#: templates/umap/password_change_done.html:14
msgid "Your password was changed."
msgstr "Cheñchet eo bet ho ker-tremen."
#: templates/umap/search.html:15
#: templates/umap/search.html:6
msgid "Explore maps"
msgstr "Ergerzhout ar gartennoù"
#: templates/umap/search.html:19
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
@ -535,11 +586,11 @@ msgstr[2] "%(count)s c'hartenn kavet :"
msgstr[3] "%(count)s kartenn kavet :"
msgstr[4] "%(count)s kartenn kavet :"
#: templates/umap/search.html:24
#: templates/umap/search.html:28
msgid "No map found."
msgstr "Kartenn ebet kavet."
#: templates/umap/search.html:29
#: templates/umap/search.html:33
msgid "Latest created maps"
msgstr "Kartennoù krouet da ziwezhañ"
@ -547,27 +598,40 @@ msgstr "Kartennoù krouet da ziwezhañ"
msgid "Search maps"
msgstr "Klask kartennoù"
#: templates/umap/search_bar.html:15
#: templates/umap/search_bar.html:16
msgid "Search"
msgstr "Klask"
#: templates/umap/team_detail.html:10
#: templates/umap/team_confirm_delete.html:6
msgid "Team deletion"
msgstr "O tilemel ar gartenn"
#: templates/umap/team_detail.html:6
#, python-format
msgid "%(current_team)ss maps"
msgstr "Kartennoù eus %(current_team)s"
#: templates/umap/team_detail.html:14
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr ""
msgstr "Merdeiñ e kartennoù %(current_team)s"
#: templates/umap/team_detail.html:22
#: templates/umap/team_detail.html:26
#, python-format
msgid "%(current_team)s has no public maps."
msgstr ""
msgstr "%(current_team)s n'en deus kartenn publik ebet."
#: templates/umap/team_form.html:24
#: templates/umap/team_form.html:6
msgid "Create or edit a team"
msgstr "Krouiñ pe kemmañ ur skipailh"
#: templates/umap/team_form.html:28
msgid "Delete this team"
msgstr ""
msgstr "Dilemel ar skipailh-mañ"
#: templates/umap/team_form.html:47
#: templates/umap/team_form.html:51
msgid "Add user"
msgstr ""
msgstr "Ouzhpennañ un implijer"
#: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
msgid "Search my maps"
@ -586,78 +650,89 @@ msgstr "Pellgargañ %(count)s a gartennoù"
msgid "You have no map yet."
msgstr "N'ho peus kartenn ebet c'hoazh."
#: templates/umap/user_teams.html:17
#: templates/umap/user_teams.html:6
msgid "My Teams"
msgstr "Ma skipailhoù"
#: templates/umap/user_teams.html:21
msgid "Users"
msgstr ""
msgstr "Implijerien"
#: templates/umap/user_teams.html:48
#: templates/umap/user_teams.html:52
msgid "New team"
msgstr ""
msgstr "Skipailh nevez"
#: views.py:235
#: views.py:234
msgid "Cannot delete a team with more than one member"
msgstr ""
#: views.py:239
#: views.py:238
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr ""
msgstr "Dilamet eo bet ar skipailh “%(name)s”"
#: views.py:438
#: views.py:442
msgid "View the map"
msgstr "Diskouez ar gartenn"
#: views.py:824
#: views.py:838
msgid "See full screen"
msgstr "Gwelet er mod skramm a-bezh"
#: views.py:953
#: views.py:981
msgid "Map editors updated with success!"
msgstr "Aozerien ar gartenn bet hizivaet gant berzh!"
#: views.py:989
#: views.py:1017
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr "Al liamm uMap evit aozañ ho kartenn: %(map_name)s"
#: views.py:992
#: views.py:1020
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr "Setu ho liamm aozañ kuzh: %(link)s"
#: views.py:999
#: views.py:1027
#, python-format
msgid "Can't send email to %(email)s"
msgstr "N'haller ket kas ur postel da %(email)s"
#: views.py:1002
#: views.py:1030
#, python-format
msgid "Email sent to %(email)s"
msgstr "Postel kaset da %(email)s"
#: views.py:1013
#: views.py:1041
msgid "Only its owner can delete the map."
msgstr "N'eus nemet perc'henner ar gartenn a c'hall he dilemel."
#: views.py:1016
#: views.py:1044
msgid "Map successfully deleted."
msgstr "Kartenn dilamet gant berzh."
#: views.py:1042
#: views.py:1070
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "Doublet eo bet ho kartenn! M'ho peus c'hoant d'he c'hemmañ diwar un urzhiataer all, implijit al liamm-mañ: %(anonymous_url)s"
#: views.py:1047
#: views.py:1075
msgid "Congratulations, your map has been cloned!"
msgstr "Doublet eo bet ho kartenn gant berzh!"
#: views.py:1282
#: views.py:1329
msgid "Layer successfully deleted."
msgstr "Gwiskad dilamet gant berzh."
#: views.py:1304
#: views.py:1351
msgid "Permissions updated with success!"
msgstr "Aotreoù hizivaet gant berzh!"
#: views.py:1430
#, python-format
msgid ""
"Using “%(name)s” to authenticate is deprecated. Please configure another "
"provider in your profile page."
msgstr ""

Binary file not shown.

View file

@ -4,15 +4,16 @@
#
# Translators:
# jmontane, 2014
# Joan Montané, 2014,2019
# Joan Montané, 2014,2019,2023
# Joan Montané, 2014,2019
# Joan Montané, 2023
# lenny libre, 2024
# lenny libre, 2024
msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-30 18:23+0000\n"
"POT-Creation-Date: 2024-12-24 08:39+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: lenny libre, 2024\n"
"Language-Team: Catalan (http://app.transifex.com/openstreetmap/umap/language/ca/)\n"
@ -22,133 +23,160 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "Només es pot editar amb l'enllaç d'edició secret"
#: admin.py:16
msgid "CSV Export"
msgstr ""
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "Tothom pot editar"
#: forms.py:69 models.py:423
msgid "Inherit"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr ""
#: middleware.py:13
msgid "Site is readonly for maintenance"
msgstr "El lloc és en mode lectura per manteniment"
#: models.py:54 models.py:73
#: models.py:60 models.py:79
msgid "name"
msgstr "nom"
#: models.py:56 models.py:433
#: models.py:62 models.py:475
msgid "description"
msgstr "descripció"
#: models.py:104
#: models.py:110
msgid "details"
msgstr "detalls"
#: models.py:105
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr "Enllaç a una pàgina on es detalla la llicència."
#: models.py:115
#: models.py:121
msgid "URL template using OSM tile format"
msgstr "La plantilla de l'URL usa el format de tesel·les de l'OSM"
#: models.py:121
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr "Ordre de les capes de tessel·les al quadre d'edició"
#: models.py:167 models.py:424
#: models.py:175 models.py:469
msgid "Only editable with secret edit link"
msgstr "Només es pot editar amb l'enllaç d'edició secret"
#: models.py:176 models.py:470
msgid "Everyone can edit"
msgstr "Tothom pot editar"
#: models.py:179 models.py:463
msgid "Everyone"
msgstr "Tothom"
#: models.py:168 models.py:174 models.py:425
#: models.py:180 models.py:189 models.py:464
msgid "Editors and team only"
msgstr ""
msgstr "Només editors i equip"
#: models.py:169 models.py:426
#: models.py:181 models.py:465
msgid "Owner only"
msgstr "Només el propietari"
#: models.py:172
#: models.py:184
msgid "Draft (private)"
msgstr ""
#: models.py:185
msgid "Everyone (public)"
msgstr "Tothom (públic)"
#: models.py:173
#: models.py:188
msgid "Anyone with link"
msgstr "Qualsevol persona amb enllaç"
#: models.py:175
#: models.py:190
msgid "Blocked"
msgstr ""
#: models.py:178
#: models.py:191
msgid "Deleted"
msgstr ""
#: models.py:194
msgid "center"
msgstr "centre"
#: models.py:179
#: models.py:195
msgid "zoom"
msgstr "escala"
#: models.py:181
#: models.py:197
msgid "locate"
msgstr "ubica"
#: models.py:181
#: models.py:197
msgid "Locate user on load?"
msgstr "Voleu ubicar l'usuari en carregar?"
#: models.py:185
#: models.py:201
msgid "Choose the map licence."
msgstr "Trieu la llicència del mapa."
#: models.py:186
#: models.py:202
msgid "licence"
msgstr "llicència"
#: models.py:197
#: models.py:213
msgid "owner"
msgstr "propietari"
#: models.py:201
#: models.py:217
msgid "editors"
msgstr "editors"
#: models.py:207
#: models.py:223
msgid "team"
msgstr ""
#: models.py:213 models.py:447
#: models.py:229 models.py:491
msgid "edit status"
msgstr "edita l'estat"
#: models.py:218
#: models.py:234
msgid "share status"
msgstr "comparteix l'estat"
#: models.py:221 models.py:442
#: models.py:237 models.py:486
msgid "settings"
msgstr "paràmetres"
#: models.py:364
#: models.py:402
msgid "Clone of"
msgstr "Clon de"
#: models.py:437
#: models.py:462 models.py:468
msgid "Inherit"
msgstr ""
#: models.py:481
msgid "display on load"
msgstr "mostra en carregar"
#: models.py:438
#: models.py:482
msgid "Display this layer on load."
msgstr "Mostra aquesta capa en carregar."
#: templates/404.html:8
msgid "Take me to the home page"
msgstr "Vés a la pàgina d'inici"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr ""
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr ""
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr ""
#: templates/auth/user_detail.html:8
#, python-format
@ -194,25 +222,29 @@ msgid ""
"them in your site."
msgstr "uMap us permet crear mapes amb capes d'OpenStreetMap en un minut i incrustar-los en el vostre lloc web."
#: templates/registration/login.html:6 templates/registration/login.html:45
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "Inicia sessió"
#: templates/registration/login.html:24
msgid "Please log in with your account"
msgstr "Inicieu sessió amb el vostre compte"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr ""
#: templates/registration/login.html:41
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr ""
#: templates/registration/login.html:42
msgid "Username"
msgstr "Nom d'usuari"
#: templates/registration/login.html:44
#: templates/registration/login.html:45
msgid "Password"
msgstr "Contrasenya"
#: templates/registration/login.html:51
msgid "Please choose a provider"
msgstr "Trieu un proveïdor"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr ""
#: templates/umap/about_summary.html:12
#, python-format
@ -263,13 +295,13 @@ msgstr "Crea un mapa"
msgid "Play with the demo"
msgstr "Jugueu amb la demostració"
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr ""
#: templates/umap/components/alerts/alert.html:30
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
@ -277,35 +309,35 @@ msgid ""
"target=\"_blank\">log in</a>."
msgstr ""
#: templates/umap/components/alerts/alert.html:35
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr ""
#: templates/umap/components/alerts/alert.html:39
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr ""
#: templates/umap/components/alerts/alert.html:46
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr ""
#: templates/umap/components/alerts/alert.html:52
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr ""
#: templates/umap/components/alerts/alert.html:55
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr ""
#: templates/umap/components/alerts/alert.html:79
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr ""
#: templates/umap/components/alerts/alert.html:82
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr ""
#: templates/umap/components/alerts/alert.html:85
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr ""
@ -330,7 +362,7 @@ msgstr ""
#: templates/umap/content_footer.html:6
msgid "version"
msgstr ""
msgstr "versió"
#: templates/umap/content_footer.html:7
msgid "Hosted by"
@ -353,11 +385,11 @@ msgstr "Els meus Mapes (%(count)s)"
msgid "My Maps"
msgstr "Els meus mapes"
#: templates/umap/dashboard_menu.html:11
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr "El meu perfil"
#: templates/umap/dashboard_menu.html:13
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr ""
@ -373,11 +405,11 @@ msgstr "Inspireu-vos, exploreu mapes"
msgid "You are logged in. Continuing..."
msgstr "Heu iniciat sessió. S'està continuant..."
#: templates/umap/map_list.html:10 views.py:433
#: templates/umap/map_list.html:11 views.py:437
msgid "by"
msgstr "per"
#: templates/umap/map_list.html:18
#: templates/umap/map_list.html:20
msgid "More"
msgstr "Més"
@ -593,70 +625,70 @@ msgstr ""
msgid "New team"
msgstr ""
#: views.py:235
#: views.py:234
msgid "Cannot delete a team with more than one member"
msgstr ""
#: views.py:239
#: views.py:238
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr ""
#: views.py:438
#: views.py:442
msgid "View the map"
msgstr "Mostra el mapa"
#: views.py:824
#: views.py:825
msgid "See full screen"
msgstr ""
#: views.py:953
#: views.py:968
msgid "Map editors updated with success!"
msgstr "S'han actualitzat els editors del mapa correctament!"
#: views.py:989
#: views.py:1004
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr "L'enllaç d'edició d'uMap per al vostre mapa: %(map_name)s"
#: views.py:992
#: views.py:1007
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr "Aquí teniu l'enllaç secret d'edició: %(link)s"
#: views.py:999
#: views.py:1014
#, python-format
msgid "Can't send email to %(email)s"
msgstr ""
#: views.py:1002
#: views.py:1017
#, python-format
msgid "Email sent to %(email)s"
msgstr "S'ha enviat un correu a %(email)s"
#: views.py:1013
#: views.py:1028
msgid "Only its owner can delete the map."
msgstr "Només el propietari pot suprimir el mapa."
#: views.py:1016
#: views.py:1031
msgid "Map successfully deleted."
msgstr ""
#: views.py:1042
#: views.py:1057
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "S'ha clonat el vostre mapa! Si voleu editar aquest mapa en un altre ordinador, useu aquest enllaç: %(anonymous_url)s"
#: views.py:1047
#: views.py:1062
msgid "Congratulations, your map has been cloned!"
msgstr "Enhorabona, s'ha clonat el vostre mapa!"
#: views.py:1282
#: views.py:1313
msgid "Layer successfully deleted."
msgstr "S'ha suprimit la capa correctament."
#: views.py:1304
#: views.py:1335
msgid "Permissions updated with success!"
msgstr ""

View file

@ -3,11 +3,11 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Aleš Fiala <f.ales1@seznam.cz>, 2023
# Aleš Fiala <f.ales1@seznam.cz>, 2023-2024
# Jakub A. Tesinsky, 2014
# Jakub A. Tesinsky, 2014
# Jiří Podhorecký, 2018-2019
# Jiří Podhorecký <jirka.p@volny.cz>, 2023-2024
# Jiří Podhorecký <jirka.p@volny.cz>, 2018-2019,2023-2025
# Jiří Podhorecký <jirka.p@volny.cz>, 2019
# Jiří Podhorecký <jirka.p@volny.cz>, 2018
# Jiří Podhorecký <jirka.p@volny.cz>, 2018
@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-04 16:35+0000\n"
"POT-Creation-Date: 2025-03-03 17:36+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Jiří Podhorecký <jirka.p@volny.cz>, 2023-2024\n"
"Last-Translator: Jiří Podhorecký <jirka.p@volny.cz>, 2018-2019,2023-2025\n"
"Language-Team: Czech (Czech Republic) (http://app.transifex.com/openstreetmap/umap/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -28,170 +28,215 @@ msgstr ""
#: admin.py:16
msgid "CSV Export"
msgstr ""
msgstr "CSV Export"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "Lze upravovat jen pomocí tajného odkazu"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr "Tato mapa není veřejně dostupná"
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "Kdokoli může editovat"
#: forms.py:69 models.py:441
msgid "Inherit"
msgstr "Zdědit"
#: middleware.py:13
#: middleware.py:19
msgid "Site is readonly for maintenance"
msgstr "Stránka je jen ke čtení kvůli údržbě"
#: models.py:55 models.py:74
#: middleware.py:34
#, python-format
msgid ""
"Using “%(name)s” to authenticate is deprecated and will be removed soon. "
"Please configure another provider below before losing access to your account"
" and maps."
msgstr ""
#: models.py:60 models.py:79
msgid "name"
msgstr "název"
#: models.py:57 models.py:451
#: models.py:62 models.py:485
msgid "description"
msgstr "popis"
#: models.py:105
#: models.py:110
msgid "details"
msgstr "podrobnosti"
#: models.py:106
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr "Odkaz na stránku s podrobnějším popisem licence."
#: models.py:116
#: models.py:121
msgid "URL template using OSM tile format"
msgstr "Vzor URL ve formátu pro dlaždice OSM "
#: models.py:122
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr "Pořadí vrstev při editaci"
#: models.py:168 models.py:442
#: models.py:175 models.py:479
msgid "Only editable with secret edit link"
msgstr "Lze upravovat jen pomocí tajného odkazu"
#: models.py:176 models.py:480
msgid "Everyone can edit"
msgstr "Kdokoli může editovat"
#: models.py:179 models.py:473
msgid "Everyone"
msgstr "Kdokoli"
#: models.py:169 models.py:175 models.py:443
#: models.py:180 models.py:189 models.py:474
msgid "Editors and team only"
msgstr "Pouze pro editory a tým"
#: models.py:170 models.py:444
#: models.py:181 models.py:475
msgid "Owner only"
msgstr "Jen vlastník"
#: models.py:173
#: models.py:184
msgid "Draft (private)"
msgstr "Koncept (soukromý)"
#: models.py:185
msgid "Everyone (public)"
msgstr "Kdokoli (veřejná)"
#: models.py:174
#: models.py:188
msgid "Anyone with link"
msgstr "Kdokoli kdo má odkaz"
#: models.py:176
#: models.py:190
msgid "Blocked"
msgstr "Blokováno"
#: models.py:179
#: models.py:191 models.py:469
msgid "Deleted"
msgstr "Smazáno"
#: models.py:194
msgid "center"
msgstr "střed"
#: models.py:180
#: models.py:195
msgid "zoom"
msgstr "přiblížení"
#: models.py:182
#: models.py:197
msgid "locate"
msgstr "lokalizuj"
#: models.py:182
#: models.py:197
msgid "Locate user on load?"
msgstr "Najdi poluhu uživatele na startu?"
#: models.py:186
#: models.py:201
msgid "Choose the map licence."
msgstr "Vyberte si licenci mapy."
#: models.py:187
#: models.py:202
msgid "licence"
msgstr "licence"
#: models.py:198
#: models.py:213
msgid "owner"
msgstr "vlastník"
#: models.py:202
#: models.py:217
msgid "editors"
msgstr "přispěvovatelé"
#: models.py:208
#: models.py:223
msgid "team"
msgstr "tým"
#: models.py:214 models.py:465
#: models.py:229 models.py:501
msgid "edit status"
msgstr "kdo může provádět úpravy"
#: models.py:219
#: models.py:234 models.py:506
msgid "share status"
msgstr "nastavení sdílení"
#: models.py:222 models.py:460
#: models.py:237 models.py:496
msgid "settings"
msgstr "nastavení"
#: models.py:382
#: models.py:407
msgid "Clone of"
msgstr "Kopie"
#: models.py:455
#: models.py:468 models.py:472 models.py:478
msgid "Inherit"
msgstr "Zdědit"
#: models.py:491
msgid "display on load"
msgstr "zobrazit při startu"
#: models.py:456
#: models.py:492
msgid "Display this layer on load."
msgstr "Zobrazit tuto vrstvu na startu."
#: templates/404.html:8
msgid "Take me to the home page"
msgstr "Vezměte mě na domovskou stránku"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr "<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" target=\"_blank\">Zde naleznete dokumentaci</a> ke správě oprávnění mapy."
#: templates/auth/user_detail.html:8
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr "← Přejít na domovskou stránku"
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr "404 Stránka nenalezena"
#: templates/auth/user_detail.html:6
#, python-format
msgid "%(current_user)ss maps"
msgstr "mapy %(current_user)s"
#: templates/auth/user_detail.html:12
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "Prohlížej si mapy uživatele %(current_user)s'"
#: templates/auth/user_detail.html:17
#: templates/auth/user_detail.html:21
#, python-format
msgid "%(current_user)s has no maps."
msgstr "%(current_user)s nemá mapy."
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
#: templates/auth/user_form.html:6
msgid "My Profile"
msgstr "Můj profil"
#: templates/auth/user_form.html:24 templates/umap/team_form.html:25
msgid "Save"
msgstr "Uložit"
#: templates/auth/user_form.html:27
#: templates/auth/user_form.html:30
msgid "Your current providers"
msgstr "Vaši současní poskytovatelé"
#: templates/auth/user_form.html:39
#: templates/auth/user_form.html:44
msgid "Connect to another provider"
msgstr "Připojit se k jinému poskytovateli"
#: templates/auth/user_form.html:42
#: templates/auth/user_form.html:47
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr "Je dobrým zvykem připojit svůj účet k více poskytovatelům pro případ, že by jeden z nich byl dočasně nebo dokonce trvale nedostupný."
#: templates/auth/user_stars.html:8
#: templates/auth/user_stars.html:6
#, python-format
msgid "%(current_user)ss starred maps"
msgstr "mapy s hvězdičkami %(current_user)s"
#: templates/auth/user_stars.html:12
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr "Prohlížet mapy označené hvězdičkou uživatele %(current_user)s"
#: templates/auth/user_stars.html:17
#: templates/auth/user_stars.html:21
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr "%(current_user)s nemá zatím žádné mapy označené hvězdičkou."
@ -202,25 +247,33 @@ msgid ""
"them in your site."
msgstr "uMap umožňuje vytvářet mapy s vrstvami OpenStreetMap za okamžik a vložit je do svých stránek."
#: templates/registration/login.html:6 templates/registration/login.html:45
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "Přihlásit se"
#: templates/registration/login.html:24
msgid "Please log in with your account"
msgstr "Přihlaste se prosím k účtu"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr "Chcete-li své mapy uložit a snadno je najít, identifikujte se."
#: templates/registration/login.html:41
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr "Přihlaste se prosím k účtu:"
#: templates/registration/login.html:42
msgid "Username"
msgstr "Uživatelské jméno"
#: templates/registration/login.html:44
#: templates/registration/login.html:45
msgid "Password"
msgstr "Heslo"
#: templates/registration/login.html:51
msgid "Please choose a provider"
msgstr "Vyberte poskytovatele mapy"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr "Vyberte poskytovatele mapy:"
#: templates/umap/about.html:5 templates/umap/navigation.html:22
msgid "About"
msgstr "O uMap"
#: templates/umap/about_summary.html:12
#, python-format
@ -271,13 +324,13 @@ msgstr "Vytvořit mapu"
msgid "Play with the demo"
msgstr "Vyzkoušejte si to hned"
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr "Zavřít"
#: templates/umap/components/alerts/alert.html:30
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
@ -285,35 +338,35 @@ msgid ""
"target=\"_blank\">log in</a>."
msgstr "Tip pro uživatele: Chcete-li snadno najít zpět své mapy, <a href=\"%(login_url)s\" target=\"_blank\">vytvořte si účet</a> nebo se <a href=\"%(login_url)s\" target=\"_blank\">přihlaste</a>."
#: templates/umap/components/alerts/alert.html:35
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr "Zde je váš tajný odkaz pro úpravu mapy, prosím, mějte ho v bezpečí:"
#: templates/umap/components/alerts/alert.html:39
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr "Zkopírovat odkaz"
#: templates/umap/components/alerts/alert.html:46
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr "Zadejte svou e-mailovou adresu, abyste obdrželi tajný odkaz:"
#: templates/umap/components/alerts/alert.html:52
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr "E-mail"
#: templates/umap/components/alerts/alert.html:55
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr "Pošlete mi odkaz"
#: templates/umap/components/alerts/alert.html:79
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr "Zobrazit jejich úpravy na jiné kartě"
#: templates/umap/components/alerts/alert.html:82
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr "Ponechte si své změny a opusťte cizí"
#: templates/umap/components/alerts/alert.html:85
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr "Ponechte si jejich změny a opusťte své"
@ -381,7 +434,7 @@ msgstr "Inspirujte se, koukněte na mapy jiných"
msgid "You are logged in. Continuing..."
msgstr "Jste přihlášeni. Jedeme dál ..."
#: templates/umap/map_list.html:11 views.py:433
#: templates/umap/map_list.html:11 views.py:437
msgid "by"
msgstr ", autor:"
@ -389,7 +442,7 @@ msgstr ", autor:"
msgid "More"
msgstr "Více"
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:18
msgid "Name"
msgstr "Název"
@ -413,7 +466,7 @@ msgstr "Poslední uložení"
msgid "Owner"
msgstr "Vlastník"
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:24
msgid "Actions"
msgstr "Akce"
@ -426,7 +479,7 @@ msgid "Share"
msgstr "Sdílet"
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
#: templates/umap/user_teams.html:42 templates/umap/user_teams.html:44
msgid "Edit"
msgstr "Upravit"
@ -489,10 +542,6 @@ msgstr "Přihlásit se"
msgid "Sign in"
msgstr "Registrovat"
#: templates/umap/navigation.html:22
msgid "About"
msgstr "O uMap"
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "Změnit heslo"
@ -501,41 +550,47 @@ msgstr "Změnit heslo"
msgid "Log out"
msgstr "Odhlásit se"
#: templates/umap/password_change.html:7
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:11
msgid "Password change"
msgstr "Změna hesla"
#: templates/umap/password_change.html:10
#: templates/umap/password_change.html:14
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "Z bezpečnostních důvodů zadejte své staré heslo a dvakrát zadejte nové heslo, abychom mohli ověřit, že jste jej zadali správně."
#: templates/umap/password_change.html:17
#: templates/umap/password_change.html:21
msgid "Old password"
msgstr "Staré heslo"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password"
msgstr "Nové heslo"
#: templates/umap/password_change.html:26
#: templates/umap/password_change.html:30
msgid "New password confirmation"
msgstr "Potvrzení nového hesla"
#: templates/umap/password_change.html:27
#: templates/umap/password_change.html:31
msgid "Change my password"
msgstr "Změnit moje heslo"
#: templates/umap/password_change_done.html:7
#: templates/umap/password_change_done.html:6
#: templates/umap/password_change_done.html:11
msgid "Password change successful"
msgstr "Změna hesla byla úspěšná"
#: templates/umap/password_change_done.html:10
#: templates/umap/password_change_done.html:14
msgid "Your password was changed."
msgstr "Vaše heslo bylo změněno."
#: templates/umap/search.html:15
#: templates/umap/search.html:6
msgid "Explore maps"
msgstr "Prozkoumat mapy"
#: templates/umap/search.html:19
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
@ -544,11 +599,11 @@ msgstr[1] "%(count)s nalezené mapy:"
msgstr[2] "%(count)s nalezené mapy:"
msgstr[3] "%(count)s nalezených map:"
#: templates/umap/search.html:24
#: templates/umap/search.html:28
msgid "No map found."
msgstr "Mapa nenalezena."
#: templates/umap/search.html:29
#: templates/umap/search.html:33
msgid "Latest created maps"
msgstr "Nedávno vytvořené mapy"
@ -556,25 +611,38 @@ msgstr "Nedávno vytvořené mapy"
msgid "Search maps"
msgstr "Prohledávejte mapy"
#: templates/umap/search_bar.html:15
#: templates/umap/search_bar.html:16
msgid "Search"
msgstr "Hledej"
#: templates/umap/team_detail.html:10
#: templates/umap/team_confirm_delete.html:6
msgid "Team deletion"
msgstr "Smazání týmu"
#: templates/umap/team_detail.html:6
#, python-format
msgid "%(current_team)ss maps"
msgstr "mapy %(current_team)s"
#: templates/umap/team_detail.html:14
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr "Prohlížet mapy týmu %(current_team)s"
#: templates/umap/team_detail.html:22
#: templates/umap/team_detail.html:26
#, python-format
msgid "%(current_team)s has no public maps."
msgstr "%(current_team)s nemá veřejné mapy."
#: templates/umap/team_form.html:24
#: templates/umap/team_form.html:6
msgid "Create or edit a team"
msgstr "Vytvořit nebo upravit tým"
#: templates/umap/team_form.html:28
msgid "Delete this team"
msgstr "Smazat tento tým"
#: templates/umap/team_form.html:47
#: templates/umap/team_form.html:51
msgid "Add user"
msgstr "Přidat uživatele"
@ -595,78 +663,82 @@ msgstr "Stáhnout %(count)s map"
msgid "You have no map yet."
msgstr "Zatím nemáte žádnou mapu."
#: templates/umap/user_teams.html:17
#: templates/umap/user_teams.html:6
msgid "My Teams"
msgstr "Moje Týmy"
#: templates/umap/user_teams.html:21
msgid "Users"
msgstr "Uživatelé"
#: templates/umap/user_teams.html:48
#: templates/umap/user_teams.html:52
msgid "New team"
msgstr "Nový tým"
#: views.py:235
#: views.py:234
msgid "Cannot delete a team with more than one member"
msgstr "Nelze smazat tým s více než jedním členem"
#: views.py:239
#: views.py:238
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr "Tým \"%(name)s\" byl smazán"
#: views.py:438
#: views.py:442
msgid "View the map"
msgstr "Prohlídnout si tuto mapu"
#: views.py:818
#: views.py:838
msgid "See full screen"
msgstr "Zobrazit celou obrazovku"
#: views.py:950
#: views.py:981
msgid "Map editors updated with success!"
msgstr "Seznam přispěvovatelů byl úspěšně upraven!"
#: views.py:986
#: views.py:1017
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr "Odkaz na úpravu uMap pro vaši mapu: %(map_name)s"
#: views.py:989
#: views.py:1020
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr "Zde je váš tajný odkaz na úpravu: %(link)s"
#: views.py:996
#: views.py:1027
#, python-format
msgid "Can't send email to %(email)s"
msgstr "Nelze odeslat e-mail na %(email)s"
#: views.py:999
#: views.py:1030
#, python-format
msgid "Email sent to %(email)s"
msgstr "E-mail odeslán na %(email)s"
#: views.py:1010
#: views.py:1041
msgid "Only its owner can delete the map."
msgstr "Jen vlastník může vymzat tuto mapu."
#: views.py:1013
#: views.py:1044
msgid "Map successfully deleted."
msgstr "Mapa byla úspěšně smazána."
#: views.py:1039
#: views.py:1070
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "Byla vytvořena kopie mapy! Pokud chcete upravovat tuto mapu z jiného počítače, použijte tento odkaz: %(anonymous_url)s"
#: views.py:1044
#: views.py:1075
msgid "Congratulations, your map has been cloned!"
msgstr "Gratulujeme, byla vytvořena kopie mapy!"
#: views.py:1277
#: views.py:1329
msgid "Layer successfully deleted."
msgstr "Vrstva úspěšně vymazána."
#: views.py:1299
#: views.py:1351
msgid "Permissions updated with success!"
msgstr "Oprávnění úspěšně aktualizována!"

Binary file not shown.

View file

@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-15 13:53+0000\n"
"POT-Creation-Date: 2024-12-24 08:39+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Mikkel Kirkgaard Nielsen <memb_transifex@mikini.dk>, 2018\n"
"Language-Team: Danish (http://app.transifex.com/openstreetmap/umap/language/da/)\n"
@ -21,258 +21,331 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "Er kun redigerbart med et hemmeligt link"
#: admin.py:16
msgid "CSV Export"
msgstr ""
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "Alle kan redigere"
#: forms.py:69 models.py:371
msgid "Inherit"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr ""
#: middleware.py:13
msgid "Site is readonly for maintenance"
msgstr "Webstedet er skrivebeskyttet pga. vedligeholdelse"
#: models.py:50
#: models.py:60 models.py:79
msgid "name"
msgstr "navn"
#: models.py:81
msgid "details"
msgstr "detaljer"
#: models.py:82
msgid "Link to a page where the licence is detailed."
msgstr "Link til en side hvor der er flere oplysninger om licensen."
#: models.py:92
msgid "URL template using OSM tile format"
msgstr "URL-skabelon i OSM flise-format"
#: models.py:98
msgid "Order of the tilelayers in the edit box"
msgstr "Rækkefølge af flise-lag i redigeringsboksen"
#: models.py:144 models.py:372
msgid "Everyone"
msgstr ""
#: models.py:145 models.py:151 models.py:373
msgid "Editors only"
msgstr ""
#: models.py:146 models.py:374
msgid "Owner only"
msgstr ""
#: models.py:149
msgid "Everyone (public)"
msgstr ""
#: models.py:150
msgid "Anyone with link"
msgstr ""
#: models.py:152
msgid "Blocked"
msgstr ""
#: models.py:155 models.py:378
#: models.py:62 models.py:475
msgid "description"
msgstr "beskrivelse"
#: models.py:156
#: models.py:110
msgid "details"
msgstr "detaljer"
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr "Link til en side hvor der er flere oplysninger om licensen."
#: models.py:121
msgid "URL template using OSM tile format"
msgstr "URL-skabelon i OSM flise-format"
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr "Rækkefølge af flise-lag i redigeringsboksen"
#: models.py:175 models.py:469
msgid "Only editable with secret edit link"
msgstr "Er kun redigerbart med et hemmeligt link"
#: models.py:176 models.py:470
msgid "Everyone can edit"
msgstr "Alle kan redigere"
#: models.py:179 models.py:463
msgid "Everyone"
msgstr ""
#: models.py:180 models.py:189 models.py:464
msgid "Editors and team only"
msgstr ""
#: models.py:181 models.py:465
msgid "Owner only"
msgstr ""
#: models.py:184
msgid "Draft (private)"
msgstr ""
#: models.py:185
msgid "Everyone (public)"
msgstr ""
#: models.py:188
msgid "Anyone with link"
msgstr ""
#: models.py:190
msgid "Blocked"
msgstr ""
#: models.py:191
msgid "Deleted"
msgstr ""
#: models.py:194
msgid "center"
msgstr "center"
#: models.py:157
#: models.py:195
msgid "zoom"
msgstr "zoom"
#: models.py:159
#: models.py:197
msgid "locate"
msgstr "lokaliser"
#: models.py:159
#: models.py:197
msgid "Locate user on load?"
msgstr "Lokaliser brugeren ved indlæsning?"
#: models.py:163
#: models.py:201
msgid "Choose the map licence."
msgstr "Vælg kortlicensen."
#: models.py:164
#: models.py:202
msgid "licence"
msgstr "licens"
#: models.py:175
#: models.py:213
msgid "owner"
msgstr "ejer"
#: models.py:179
#: models.py:217
msgid "editors"
msgstr "redaktører"
#: models.py:184 models.py:392
#: models.py:223
msgid "team"
msgstr ""
#: models.py:229 models.py:491
msgid "edit status"
msgstr "redigeringsstatus"
#: models.py:189
#: models.py:234
msgid "share status"
msgstr "delingsstatus"
#: models.py:192 models.py:387
#: models.py:237 models.py:486
msgid "settings"
msgstr "indstillinger"
#: models.py:320
#: models.py:402
msgid "Clone of"
msgstr "Kloning af"
#: models.py:382
#: models.py:462 models.py:468
msgid "Inherit"
msgstr ""
#: models.py:481
msgid "display on load"
msgstr "vis ved indlæsning"
#: models.py:383
#: models.py:482
msgid "Display this layer on load."
msgstr "Vis dette lag ved indlæsning."
#: templates/404.html:6
msgid "Take me to the home page"
msgstr "Før mig til hjemmesiden"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr ""
#: templates/auth/user_detail.html:5
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr ""
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr ""
#: templates/auth/user_detail.html:8
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "Gennemse %(current_user)ss kort"
#: templates/auth/user_detail.html:12
#: templates/auth/user_detail.html:17
#, python-format
msgid "%(current_user)s has no maps."
msgstr "%(current_user)s har ingen kort."
#: templates/auth/user_form.html:6
msgid "My Maps"
msgstr ""
#: templates/auth/user_form.html:7
msgid "My Profile"
msgstr ""
#: templates/auth/user_form.html:20
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
msgid "Save"
msgstr ""
#: templates/auth/user_form.html:25
#: templates/auth/user_form.html:27
msgid "Your current providers"
msgstr ""
#: templates/auth/user_form.html:31
#: templates/auth/user_form.html:39
msgid "Connect to another provider"
msgstr ""
#: templates/auth/user_form.html:33
#: templates/auth/user_form.html:42
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr ""
#: templates/auth/user_stars.html:5
#: templates/auth/user_stars.html:8
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr ""
#: templates/auth/user_stars.html:12
#: templates/auth/user_stars.html:17
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr ""
#: templates/base.html:12
#: templates/base.html:13
msgid ""
"uMap lets you create maps with OpenStreetMap layers in a minute and embed "
"them in your site."
msgstr ""
#: templates/registration/login.html:16
msgid "Please log in with your account"
msgstr "Log på din konto"
#: templates/registration/login.html:28
msgid "Username"
msgstr "Brugernavn"
#: templates/registration/login.html:31
msgid "Password"
msgstr "Adgangskode"
#: templates/registration/login.html:32
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "Log ind"
#: templates/registration/login.html:37
msgid "Please choose a provider"
msgstr "Vælg en udbyder"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr ""
#: templates/umap/about_summary.html:11
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr ""
#: templates/registration/login.html:42
msgid "Username"
msgstr "Brugernavn"
#: templates/registration/login.html:45
msgid "Password"
msgstr "Adgangskode"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr ""
#: templates/umap/about_summary.html:12
#, python-format
msgid ""
"uMap lets you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
"layers in a minute and embed them in your site."
msgstr "uMap gør det muligt at oprette kort med <a href=\"%(osm_url)s\" />OpenStreetMap</a>-lag på et øjeblik, og indlejre dem på dit websted."
#: templates/umap/about_summary.html:21
#: templates/umap/about_summary.html:23
msgid "Choose the layers of your map"
msgstr "Vælg lag til dit kort"
#: templates/umap/about_summary.html:22
#: templates/umap/about_summary.html:26
msgid "Add POIs: markers, lines, polygons..."
msgstr "Tilføj POI'er: markører, linjer, polygoner..."
#: templates/umap/about_summary.html:23
#: templates/umap/about_summary.html:29
msgid "Manage POIs colours and icons"
msgstr "Håndter farver og ikoner for POI'er"
#: templates/umap/about_summary.html:24
#: templates/umap/about_summary.html:32
msgid "Manage map options: display a minimap, locate user on load…"
msgstr "Håndter kortindstillinger: vis et miniaturekort, lokaliser brugeren ved indlæsning..."
#: templates/umap/about_summary.html:25
#: templates/umap/about_summary.html:35
msgid "Batch import geostructured data (geojson, gpx, kml, osm...)"
msgstr "Batchimport af geostrukturerede data (geojson, gpx, kml, osm...)"
#: templates/umap/about_summary.html:26
#: templates/umap/about_summary.html:38
msgid "Choose the license for your data"
msgstr "Vælg en licens til dine geodata"
#: templates/umap/about_summary.html:27
#: templates/umap/about_summary.html:41
msgid "Embed and share your map"
msgstr "Indlejr og del dit kort"
#: templates/umap/about_summary.html:37
#: templates/umap/about_summary.html:52
#, python-format
msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "Og det er <a href=\"%(repo_url)s\">open source</a>!"
#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38
#: templates/umap/user_dashboard.html:42
#: templates/umap/about_summary.html:63 templates/umap/navigation.html:39
#: templates/umap/user_dashboard.html:40
msgid "Create a map"
msgstr "Lav et kort"
#: templates/umap/about_summary.html:51
#: templates/umap/about_summary.html:66
msgid "Play with the demo"
msgstr "Leg med demoen"
#: templates/umap/content.html:22
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr ""
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
"target=\"_blank\">create an account</a> or <a href=\"%(login_url)s\" "
"target=\"_blank\">log in</a>."
msgstr ""
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr ""
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr ""
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr ""
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr ""
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr ""
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr ""
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr ""
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr ""
#: templates/umap/content.html:26
msgid ""
"This instance of uMap is currently in read only mode, no creation/edit is "
"allowed."
msgstr ""
#: templates/umap/content.html:30
#: templates/umap/content.html:34
#, python-format
msgid ""
"This is a demo instance, used for tests and pre-rolling releases. If you "
@ -281,270 +354,339 @@ msgid ""
"instance, it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "Dette er en demo-instans som bruges til test og at forhåndsudrulle frigivelser. Hvis du har brug for en mere stabil instans, så brug <a href=\"%(stable_url)s\">%(stable_url)s</a>. Du kan også drive din helt egen instans, det er <a href=\"%(repo_url)s\">open source</a>!"
#: templates/umap/home.html:8
#: templates/umap/content_footer.html:5
msgid "An OpenStreetMap project"
msgstr ""
#: templates/umap/content_footer.html:6
msgid "version"
msgstr ""
#: templates/umap/content_footer.html:7
msgid "Hosted by"
msgstr ""
#: templates/umap/content_footer.html:8
msgid "Contact"
msgstr ""
#: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
msgid "Help"
msgstr ""
#: templates/umap/dashboard_menu.html:6
#, python-format
msgid "My Maps (%(count)s)"
msgstr ""
#: templates/umap/dashboard_menu.html:8
msgid "My Maps"
msgstr ""
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr ""
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr ""
#: templates/umap/home.html:14
msgid "Map of the uMaps"
msgstr "Kort over uMaps"
#: templates/umap/home.html:14
#: templates/umap/home.html:24
msgid "Get inspired, browse maps"
msgstr "Bliv inspireret, gennemse kort"
#: templates/umap/login_popup_end.html:2
#: templates/umap/login_popup_end.html:4
msgid "You are logged in. Continuing..."
msgstr "Du er logget ind. Fortsætter..."
#: templates/umap/map_list.html:9 views.py:341
#: templates/umap/map_list.html:11 views.py:437
msgid "by"
msgstr "af"
#: templates/umap/map_list.html:17
#: templates/umap/map_list.html:20
msgid "More"
msgstr "Mere"
#: templates/umap/map_table.html:6
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
msgid "Name"
msgstr ""
#: templates/umap/map_table.html:7
#: templates/umap/map_table.html:11
msgid "Preview"
msgstr ""
#: templates/umap/map_table.html:8
#: templates/umap/map_table.html:14
msgid "Who can see"
msgstr ""
#: templates/umap/map_table.html:9
#: templates/umap/map_table.html:17
msgid "Who can edit"
msgstr ""
#: templates/umap/map_table.html:10
#: templates/umap/map_table.html:20
msgid "Last save"
msgstr ""
#: templates/umap/map_table.html:11
#: templates/umap/map_table.html:23
msgid "Owner"
msgstr ""
#: templates/umap/map_table.html:12
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
msgid "Actions"
msgstr ""
#: templates/umap/map_table.html:25 templates/umap/map_table.html:27
#: templates/umap/map_table.html:41 templates/umap/map_table.html:43
msgid "Open preview"
msgstr ""
#: templates/umap/map_table.html:46 templates/umap/map_table.html:48
#: templates/umap/map_table.html:72 templates/umap/map_table.html:74
msgid "Share"
msgstr ""
#: templates/umap/map_table.html:51 templates/umap/map_table.html:53
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
msgid "Edit"
msgstr ""
#: templates/umap/map_table.html:56 templates/umap/map_table.html:58
#: templates/umap/map_table.html:84 templates/umap/map_table.html:86
msgid "Download"
msgstr ""
#: templates/umap/map_table.html:63 templates/umap/map_table.html:65
#: templates/umap/map_table.html:90 templates/umap/map_table.html:92
msgid "Clone"
msgstr ""
#: templates/umap/map_table.html:73 templates/umap/map_table.html:75
#: templates/umap/map_table.html:101 templates/umap/map_table.html:103
msgid "Delete"
msgstr ""
#: templates/umap/map_table.html:88
#: templates/umap/map_table.html:117
msgid "first"
msgstr ""
#: templates/umap/map_table.html:89
#: templates/umap/map_table.html:118
msgid "previous"
msgstr ""
#: templates/umap/map_table.html:98
#: templates/umap/map_table.html:126
#, python-format
msgid "Page %(maps_number)s of %(num_pages)s"
msgstr ""
#: templates/umap/map_table.html:104
#: templates/umap/map_table.html:131
msgid "next"
msgstr ""
#: templates/umap/map_table.html:105
#: templates/umap/map_table.html:132
msgid "last"
msgstr ""
#: templates/umap/map_table.html:113
#: templates/umap/map_table.html:140
#, python-format
msgid "Lines per page: %(per_page)s"
msgstr ""
#: templates/umap/map_table.html:118
#: templates/umap/map_table.html:145
#, python-format
msgid "%(count)s maps"
msgstr ""
#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4
#: templates/umap/navigation.html:11 templates/umap/user_dashboard.html:6
msgid "My Dashboard"
msgstr ""
#: templates/umap/navigation.html:13
#: templates/umap/navigation.html:14
msgid "Starred maps"
msgstr ""
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Log in"
msgstr "Log ind"
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Sign in"
msgstr "Opret konto"
#: templates/umap/navigation.html:21
#: templates/umap/navigation.html:22
msgid "About"
msgstr "Om"
#: templates/umap/navigation.html:24
msgid "Help"
msgstr ""
#: templates/umap/navigation.html:29
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "Skift adgangskode"
#: templates/umap/navigation.html:33
#: templates/umap/navigation.html:34
msgid "Log out"
msgstr "Log ud"
#: templates/umap/password_change.html:4
#: templates/umap/password_change.html:7
msgid "Password change"
msgstr "Ændring af adgangskode"
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:10
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "Af sikkerhedshensyn skal du indtaste din gamle adgangskode, dernæst indtastes den nye adgangskode to gange, så vi kan være sikre på, at du har skrevet den korrekt."
#: templates/umap/password_change.html:13
#: templates/umap/password_change.html:17
msgid "Old password"
msgstr "Gammel adgangskode"
#: templates/umap/password_change.html:18
#: templates/umap/password_change.html:22
msgid "New password"
msgstr "Ny adgangskode"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password confirmation"
msgstr "Bekræft ny adgangskode"
#: templates/umap/password_change.html:23
#: templates/umap/password_change.html:27
msgid "Change my password"
msgstr "Ændr min adgangskode"
#: templates/umap/password_change_done.html:4
#: templates/umap/password_change_done.html:7
msgid "Password change successful"
msgstr "Adgangskode ændret"
#: templates/umap/password_change_done.html:5
#: templates/umap/password_change_done.html:10
msgid "Your password was changed."
msgstr "Din adgangskode blev ændret."
#: templates/umap/search.html:10
#: templates/umap/search.html:15
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
msgstr[0] ""
msgstr[1] ""
#: templates/umap/search.html:18
#: templates/umap/search.html:24
msgid "No map found."
msgstr ""
#: templates/umap/search.html:21
#: templates/umap/search.html:29
msgid "Latest created maps"
msgstr ""
#: templates/umap/search_bar.html:3
#: templates/umap/search_bar.html:4
msgid "Search maps"
msgstr "Søg i kortene"
#: templates/umap/search_bar.html:14
#: templates/umap/search_bar.html:15
msgid "Search"
msgstr "Søg"
#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26
#: templates/umap/team_detail.html:10
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr ""
#: templates/umap/team_detail.html:22
#, python-format
msgid "%(current_team)s has no public maps."
msgstr ""
#: templates/umap/team_form.html:24
msgid "Delete this team"
msgstr ""
#: templates/umap/team_form.html:47
msgid "Add user"
msgstr ""
#: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
msgid "Search my maps"
msgstr ""
#: templates/umap/user_dashboard.html:11
#, python-format
msgid "My Maps (%(count)s)"
msgstr ""
#: templates/umap/user_dashboard.html:13
msgid "My profile"
msgstr ""
#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23
#: templates/umap/user_dashboard.html:17 templates/umap/user_dashboard.html:22
msgid "Maps title"
msgstr ""
#: templates/umap/user_dashboard.html:32
#: templates/umap/user_dashboard.html:30
#, python-format
msgid "Download %(count)s maps"
msgstr ""
#: templates/umap/user_dashboard.html:42
#: templates/umap/user_dashboard.html:40
msgid "You have no map yet."
msgstr ""
#: views.py:346
#: templates/umap/user_teams.html:17
msgid "Users"
msgstr ""
#: templates/umap/user_teams.html:48
msgid "New team"
msgstr ""
#: views.py:234
msgid "Cannot delete a team with more than one member"
msgstr ""
#: views.py:238
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr ""
#: views.py:442
msgid "View the map"
msgstr "Vis kortet"
#: views.py:704
#: views.py:825
msgid "See full screen"
msgstr ""
#: views.py:803
#: views.py:968
msgid "Map editors updated with success!"
msgstr "Kortredaktører blev opdateret!"
#: views.py:841
#: views.py:1004
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr ""
#: views.py:844
#: views.py:1007
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr ""
#: views.py:850
#: views.py:1014
#, python-format
msgid "Can't send email to %(email)s"
msgstr ""
#: views.py:1017
#, python-format
msgid "Email sent to %(email)s"
msgstr ""
#: views.py:861
#: views.py:1028
msgid "Only its owner can delete the map."
msgstr "Kun ejeren kan slette kortet."
#: views.py:889
#: views.py:1031
msgid "Map successfully deleted."
msgstr ""
#: views.py:1057
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "Dit kort er klonet! Hvis du ønsker at redigere kortet fra en anden computer, så brug følgende link: %(anonymous_url)s"
#: views.py:894
#: views.py:1062
msgid "Congratulations, your map has been cloned!"
msgstr "Tillykke, dit kort er klonet!"
#: views.py:1130
#: views.py:1313
msgid "Layer successfully deleted."
msgstr "Lag blev slettet."
#: views.py:1152
#: views.py:1335
msgid "Permissions updated with success!"
msgstr ""

Binary file not shown.

View file

@ -11,6 +11,7 @@
# hno2 <hno2@gmx.net>, 2013-2014
# Jannis Leidel <jannis@leidel.info>, 2016
# gislars, 2024
# Metzor Metzingen, 2025
# pgeo, 2023
# Klumbumbus, 2013-2014,2018-2019
# YOHAN BONIFACE <yb@enix.org>, 2012
@ -18,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-04 14:02+0000\n"
"POT-Creation-Date: 2025-04-04 16:49+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: jakl, 2024\n"
"Last-Translator: Metzor Metzingen, 2025\n"
"Language-Team: German (http://app.transifex.com/openstreetmap/umap/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -28,168 +29,285 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "Nur mit geheimem Bearbeitungslink zu bearbeiten"
#: admin.py:16
msgid "CSV Export"
msgstr "CSV-Export"
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "Jeder kann bearbeiten"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr "Diese Karte ist nicht öffentlich einsehbar"
#: forms.py:69 models.py:423
msgid "Inherit"
msgstr "erben"
#: middleware.py:13
#: middleware.py:19
msgid "Site is readonly for maintenance"
msgstr "Die Seite ist wegen Wartungsarbeiten im Nur-Lesen-Modus."
#: models.py:54 models.py:73
#: middleware.py:34
#, python-format
msgid ""
"Using “%(name)s” to authenticate is deprecated and will be removed soon. "
"Please configure another provider below before losing access to your account"
" and maps. Then, please logout and login again with the new provider."
msgstr "Anmelden mittels “%(name)s” ist veraltet und wird bald nicht mehr möglich sein. Bitte stelle einen anderen Anbieter ein, um den Zugang zum Benutzerkonto und den Karten nicht zu verlieren. Bitte melde dich dann ab und nutze den neuen Anbieter um dich wieder anzumelden."
#: models.py:61 models.py:80
msgid "name"
msgstr "Name"
#: models.py:56 models.py:433
#: models.py:63 models.py:493
msgid "description"
msgstr "Beschreibung"
#: models.py:104
#: models.py:111
msgid "details"
msgstr "Details"
#: models.py:105
#: models.py:112
msgid "Link to a page where the licence is detailed."
msgstr "Verlinke auf eine Seite mit der Lizenz."
#: models.py:115
#: models.py:122
msgid "URL template using OSM tile format"
msgstr "Das URL-Template nutzt das OSM Tile Format"
#: models.py:121
#: models.py:128
msgid "Order of the tilelayers in the edit box"
msgstr "Reihenfolge der Karten-Ebenen in der Bearbeiten-Box"
#: models.py:167 models.py:424
#: models.py:176 models.py:487
msgid "Only editable with secret edit link"
msgstr "Nur mit geheimem Bearbeitungslink zu bearbeiten"
#: models.py:177 models.py:488
msgid "Everyone can edit"
msgstr "Jeder kann bearbeiten"
#: models.py:180 models.py:481
msgid "Everyone"
msgstr "Jeder"
#: models.py:168 models.py:174 models.py:425
#: models.py:181 models.py:190 models.py:482
msgid "Editors and team only"
msgstr "Nur Bearbeiter und Team"
#: models.py:169 models.py:426
#: models.py:182 models.py:483
msgid "Owner only"
msgstr "Nur Ersteller"
#: models.py:172
#: models.py:185
msgid "Draft (private)"
msgstr "Entwurf (privat)"
#: models.py:186
msgid "Everyone (public)"
msgstr "Jeder (Öffentlich)"
#: models.py:173
#: models.py:189
msgid "Anyone with link"
msgstr "Jeder mit Link"
#: models.py:175
#: models.py:191
msgid "Blocked"
msgstr "blockiert"
#: models.py:178
#: models.py:192 models.py:477
msgid "Deleted"
msgstr "Gelöscht"
#: models.py:195
msgid "center"
msgstr "Mittelpunkt"
#: models.py:179
#: models.py:196
msgid "zoom"
msgstr "Zoom"
#: models.py:181
#: models.py:198
msgid "locate"
msgstr "lokalisiere"
#: models.py:181
#: models.py:198
msgid "Locate user on load?"
msgstr "Standort des Benutzers beim Seitenaufruf bestimmen?"
#: models.py:185
#: models.py:202
msgid "Choose the map licence."
msgstr "Kartenlizenz auswählen"
#: models.py:186
#: models.py:203
msgid "licence"
msgstr "Lizenz"
#: models.py:197
#: models.py:214
msgid "owner"
msgstr "Ersteller"
#: models.py:201
#: models.py:218
msgid "editors"
msgstr "Bearbeiter"
#: models.py:207
#: models.py:224
msgid "team"
msgstr "Team"
#: models.py:213 models.py:447
#: models.py:230 models.py:509
msgid "edit status"
msgstr "Bearbeitungsstatus"
#: models.py:218
#: models.py:235 models.py:514
msgid "share status"
msgstr "Teilen-Status"
#: models.py:221 models.py:442
#: models.py:238 models.py:504
msgid "settings"
msgstr "Einstellungen"
#: models.py:364
#: models.py:410
msgid "Clone of"
msgstr "Duplikat von"
#: models.py:437
#: models.py:476 models.py:480 models.py:486
msgid "Inherit"
msgstr "erben"
#: models.py:499
msgid "display on load"
msgstr "Beim Seitenaufruf einblenden"
#: models.py:438
#: models.py:500
msgid "Display this layer on load."
msgstr "Diese Ebene beim Seitenaufruf einblenden."
#: templates/404.html:8
msgid "Take me to the home page"
msgstr "Zur Startseite zurückkehren"
#: settings/base.py:295
msgid "Art and Culture"
msgstr ""
#: templates/auth/user_detail.html:8
#: settings/base.py:296
msgid "Cycling"
msgstr ""
#: settings/base.py:297
msgid "Business"
msgstr ""
#: settings/base.py:298
msgid "Environment"
msgstr ""
#: settings/base.py:299
msgid "Education"
msgstr ""
#: settings/base.py:300
msgid "Food and Agriculture"
msgstr ""
#: settings/base.py:301
msgid "Geopolitics"
msgstr ""
#: settings/base.py:302
msgid "Health"
msgstr ""
#: settings/base.py:303
msgid "Hiking"
msgstr ""
#: settings/base.py:304
msgid "History"
msgstr ""
#: settings/base.py:305
msgid "Public sector"
msgstr ""
#: settings/base.py:306
msgid "Science"
msgstr ""
#: settings/base.py:307
msgid "Shopping"
msgstr ""
#: settings/base.py:308
msgid "Sport and Leisure"
msgstr ""
#: settings/base.py:309
msgid "Travel"
msgstr ""
#: settings/base.py:310
msgid "Transports"
msgstr ""
#: settings/base.py:311
msgid "Tourism"
msgstr ""
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr "<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" target=\"_blank\">Finde hier die Dokumentation</a>wie Berechtigungen der Karte verwaltet werden können."
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr "← Gehe zur Homepage"
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr "404 Seite nicht gefunden"
#: templates/auth/user_detail.html:6
#, python-format
msgid "%(current_user)ss maps"
msgstr "Karten von %(current_user)s"
#: templates/auth/user_detail.html:12
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "Schaue dir %(current_user)s's Karten an"
#: templates/auth/user_detail.html:17
#: templates/auth/user_detail.html:21
#, python-format
msgid "%(current_user)s has no maps."
msgstr "%(current_user)s hat keine Karten."
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
#: templates/auth/user_form.html:6
msgid "My Profile"
msgstr "Mein Profil"
#: templates/auth/user_form.html:24 templates/umap/team_form.html:25
msgid "Save"
msgstr "Speichern"
#: templates/auth/user_form.html:27
#: templates/auth/user_form.html:30
msgid "Your current providers"
msgstr "Deine aktuellen Anbieter"
#: templates/auth/user_form.html:39
#: templates/auth/user_form.html:44
msgid "Connect to another provider"
msgstr "Füge einen weiteren Anbieter hinzu"
#: templates/auth/user_form.html:42
#: templates/auth/user_form.html:47
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr "Es ist eine gute Praxis, das Konto mit mehr als einem Anbieter zu verbinden, für den Fall, dass ein Anbieter vorübergehend oder sogar dauerhaft nicht mehr verfügbar ist."
#: templates/auth/user_stars.html:8
#: templates/auth/user_stars.html:6
#, python-format
msgid "%(current_user)ss starred maps"
msgstr "Schaue dir die favorisierten Karten von %(current_user)s an"
#: templates/auth/user_stars.html:12
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr "Schaue dir %(current_user)s's favorisierten Karten an"
#: templates/auth/user_stars.html:17
#: templates/auth/user_stars.html:21
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr "%(current_user)s hat keine favorisierten Karten."
@ -200,26 +318,34 @@ msgid ""
"them in your site."
msgstr "Mit uMap kannst du Karten mit OpenStreetMap-Ebenen in einer Minute erstellen und in deine Seite einbinden."
#: templates/registration/login.html:6 templates/registration/login.html:45
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "Anmeldung"
#: templates/registration/login.html:24
msgid "Please log in with your account"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr "Um deine Karten einfach zu speichern und wieder zu finden, merke dich an."
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr "Bitte melden Sie sich mit Ihrem Konto an"
#: templates/registration/login.html:41
#: templates/registration/login.html:42
msgid "Username"
msgstr "Benutzername"
#: templates/registration/login.html:44
#: templates/registration/login.html:45
msgid "Password"
msgstr "Passwort"
#: templates/registration/login.html:51
msgid "Please choose a provider"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr "Bitte wähle einen Anbieter"
#: templates/umap/about.html:5 templates/umap/navigation.html:22
msgid "About"
msgstr "Über"
#: templates/umap/about_summary.html:12
#, python-format
msgid ""
@ -269,13 +395,13 @@ msgstr "Erstelle eine Karte"
msgid "Play with the demo"
msgstr "Spiele mit der Demo"
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr "Schließen"
#: templates/umap/components/alerts/alert.html:30
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
@ -283,35 +409,35 @@ msgid ""
"target=\"_blank\">log in</a>."
msgstr "Um auf Deine Karten schnell zugreifen zu können: <a href=\"%(login_url)s\" target=\"_blank\">erstelle ein Konto</a> oder <a href=\"%(login_url)s\" target=\"_blank\">melde dich an</a>."
#: templates/umap/components/alerts/alert.html:35
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr "Hier ist der geheime Link zum Bearbeiten der Karte, bitte bewahre ihn sicher auf:"
#: templates/umap/components/alerts/alert.html:39
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr "Link kopieren"
#: templates/umap/components/alerts/alert.html:46
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr "Gib Deine E-Mail-Adresse ein, um den geheimen Link zu gesendet zu bekommen:"
#: templates/umap/components/alerts/alert.html:52
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr "Email"
#: templates/umap/components/alerts/alert.html:55
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr "Link verschicken"
#: templates/umap/components/alerts/alert.html:79
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr "Die Bearbeitungen in einem anderen Browser-Tab öffnen"
#: templates/umap/components/alerts/alert.html:82
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr "Behalte Deine Änderungen und verwirf die anderen"
#: templates/umap/components/alerts/alert.html:85
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr "Behalte die anderen Änderungen und verwirf Deine"
@ -359,11 +485,11 @@ msgstr "Meine Karten (%(count)s)"
msgid "My Maps"
msgstr "Meine Karten"
#: templates/umap/dashboard_menu.html:11
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr "Mein Profil"
#: templates/umap/dashboard_menu.html:13
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr "Meine Teams"
@ -371,7 +497,7 @@ msgstr "Meine Teams"
msgid "Map of the uMaps"
msgstr "Karte aller „uMap“-Karten"
#: templates/umap/home.html:24
#: templates/umap/home.html:25
msgid "Get inspired, browse maps"
msgstr "Lass dich inspirieren, schau dir diese Karten an."
@ -379,15 +505,19 @@ msgstr "Lass dich inspirieren, schau dir diese Karten an."
msgid "You are logged in. Continuing..."
msgstr "Du bist eingeloggt. Weiterleitung..."
#: templates/umap/map_list.html:11 views.py:433
#: templates/umap/map_list.html:18 views.py:444
msgid "by"
msgstr "von"
#: templates/umap/map_list.html:20
#: templates/umap/map_list.html:22
msgid "See the map"
msgstr ""
#: templates/umap/map_list.html:28
msgid "More"
msgstr "Mehr"
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:18
msgid "Name"
msgstr "Name"
@ -411,7 +541,7 @@ msgstr "zuletzt gespeichert"
msgid "Owner"
msgstr "Ersteller"
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:24
msgid "Actions"
msgstr "Aktionen"
@ -424,7 +554,7 @@ msgid "Share"
msgstr "Teilen"
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
#: templates/umap/user_teams.html:42 templates/umap/user_teams.html:44
msgid "Edit"
msgstr "Bearbeiten"
@ -487,10 +617,6 @@ msgstr "Einloggen"
msgid "Sign in"
msgstr "Anmelden"
#: templates/umap/navigation.html:22
msgid "About"
msgstr "Über"
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "Passwort ändern"
@ -499,52 +625,58 @@ msgstr "Passwort ändern"
msgid "Log out"
msgstr "Ausloggen"
#: templates/umap/password_change.html:7
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:11
msgid "Password change"
msgstr "Passwortänderung"
#: templates/umap/password_change.html:10
#: templates/umap/password_change.html:14
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "Bitte gib aus Sicherheitsgründen dein altes Passwort ein und dann zweimal dein neues, um sicherzustellen, dass du es korrekt eingegeben hast."
#: templates/umap/password_change.html:17
#: templates/umap/password_change.html:21
msgid "Old password"
msgstr "Altes Passwort"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password"
msgstr "Neues Passwort"
#: templates/umap/password_change.html:26
#: templates/umap/password_change.html:30
msgid "New password confirmation"
msgstr "Neues Passwort bestätigen"
#: templates/umap/password_change.html:27
#: templates/umap/password_change.html:31
msgid "Change my password"
msgstr "Mein Passwort ändern"
#: templates/umap/password_change_done.html:7
#: templates/umap/password_change_done.html:6
#: templates/umap/password_change_done.html:11
msgid "Password change successful"
msgstr "Passwortänderung erfolgreich"
#: templates/umap/password_change_done.html:10
#: templates/umap/password_change_done.html:14
msgid "Your password was changed."
msgstr "Ihr Passwort wurde geändert."
#: templates/umap/search.html:15
#: templates/umap/search.html:6
msgid "Explore maps"
msgstr "Karten erkunden"
#: templates/umap/search.html:19
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
msgstr[0] "%(count)s Karte gefunden:"
msgstr[1] "%(count)s Karten gefunden:"
#: templates/umap/search.html:24
#: templates/umap/search.html:30
msgid "No map found."
msgstr "Keine Karte gefunden."
#: templates/umap/search.html:29
#: templates/umap/search.html:35
msgid "Latest created maps"
msgstr "Zuletzt erstellte Karten"
@ -552,25 +684,42 @@ msgstr "Zuletzt erstellte Karten"
msgid "Search maps"
msgstr "Karten suchen"
#: templates/umap/search_bar.html:15
#: templates/umap/search_bar.html:14
msgid "Any category"
msgstr ""
#: templates/umap/search_bar.html:19
msgid "Search"
msgstr "Suchen"
#: templates/umap/team_detail.html:10
#: templates/umap/team_confirm_delete.html:6
msgid "Team deletion"
msgstr "Team löschen"
#: templates/umap/team_detail.html:6
#, python-format
msgid "%(current_team)ss maps"
msgstr "Karten von %(current_team)s"
#: templates/umap/team_detail.html:14
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr "Schaue dir %(current_team)s's Karten an"
#: templates/umap/team_detail.html:22
#: templates/umap/team_detail.html:26
#, python-format
msgid "%(current_team)s has no public maps."
msgstr "%(current_team)s hat keine öffentlichen Karten.."
#: templates/umap/team_form.html:24
#: templates/umap/team_form.html:6
msgid "Create or edit a team"
msgstr "Team erstellen oder bearbeiten"
#: templates/umap/team_form.html:28
msgid "Delete this team"
msgstr "Dieses Team löschen"
#: templates/umap/team_form.html:47
#: templates/umap/team_form.html:51
msgid "Add user"
msgstr "Benutzer hinzufügen"
@ -591,11 +740,15 @@ msgstr "Herunterladen von %(count)s Karten"
msgid "You have no map yet."
msgstr "Du hast noch keine Karte."
#: templates/umap/user_teams.html:17
#: templates/umap/user_teams.html:6
msgid "My Teams"
msgstr "Meine Teams"
#: templates/umap/user_teams.html:21
msgid "Users"
msgstr "Benutzer"
#: templates/umap/user_teams.html:48
#: templates/umap/user_teams.html:52
msgid "New team"
msgstr "Neues Team"
@ -608,61 +761,61 @@ msgstr "Teams mit mehr als einem Mitglied können nicht gelöscht werden"
msgid "Team “%(name)s” has been deleted"
msgstr "Team “%(name)s” wurde gelöscht"
#: views.py:438
#: views.py:449
msgid "View the map"
msgstr "Diese Karte anzeigen"
#: views.py:824
#: views.py:845
msgid "See full screen"
msgstr "Vollbildanzeige"
#: views.py:953
#: views.py:988
msgid "Map editors updated with success!"
msgstr "Bearbeiter erfolgreich geändert"
#: views.py:989
#: views.py:1024
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr "Der uMap-Bearbeitungslink für Deine Karte: %(map_name)s"
#: views.py:992
#: views.py:1027
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr "Dies ist der geheime Bearbeitungslink: %(link)s"
#: views.py:999
#: views.py:1034
#, python-format
msgid "Can't send email to %(email)s"
msgstr "E-Mail kann nicht gesendet werden an %(email)s"
#: views.py:1002
#: views.py:1037
#, python-format
msgid "Email sent to %(email)s"
msgstr "Email gesendet an %(email)s"
#: views.py:1013
#: views.py:1048
msgid "Only its owner can delete the map."
msgstr "Nur der Ersteller kann die Karte löschen."
#: views.py:1016
#: views.py:1051
msgid "Map successfully deleted."
msgstr "Karte erfolgreich gelöscht."
#: views.py:1042
#: views.py:1077
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "Deine Karte wurde kopiert! Wenn du diese Karte von einem anderen Computer aus bearbeiten möchtest, benutze bitte diesen Link: %(anonymous_url)s"
#: views.py:1047
#: views.py:1082
msgid "Congratulations, your map has been cloned!"
msgstr "Glückwunsch, deine Karte wurde kopiert!"
#: views.py:1282
#: views.py:1336
msgid "Layer successfully deleted."
msgstr "Ebene erfolgreich gelöscht."
#: views.py:1304
#: views.py:1358
msgid "Permissions updated with success!"
msgstr "Berechtigungen erfolgreich aktualisiert!"

Binary file not shown.

View file

@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-30 18:23+0000\n"
"POT-Creation-Date: 2025-04-11 15:30+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Yannis Kaskamanidis <kiolalis@gmail.com>, 2021,2023-2024\n"
"Last-Translator: prendi <prendi@openmailbox.org>, 2017\n"
"Language-Team: Greek (http://app.transifex.com/openstreetmap/umap/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -23,168 +23,285 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "Επεξεργάσιμο μόνο με μυστικό σύνδεσμο"
#: admin.py:16
msgid "CSV Export"
msgstr "Εξαγωγή CSV"
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "Όλοι μπορούν να επεξεργαστούν"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr "Αυτός ο χάρτης δεν είναι δημοσίως διαθέσιμος"
#: forms.py:69 models.py:423
msgid "Inherit"
msgstr "Κληρονόμοι"
#: middleware.py:13
#: middleware.py:19
msgid "Site is readonly for maintenance"
msgstr "Λόγω συντήρησης, ο ιστότοπος είναι μόνο για ανάγνωση"
#: models.py:54 models.py:73
#: middleware.py:34
#, python-format
msgid ""
"Using “%(name)s” to authenticate is deprecated and will be removed soon. "
"Please configure another provider below before losing access to your account"
" and maps. Then, please logout and login again with the new provider."
msgstr "Η χρήση του «%(name)s» για τον έλεγχο ταυτότητας έχει ξεπεραστεί και θα καταργηθεί σύντομα. Παρακαλούμε ρυθμίστε έναν άλλο πάροχο παρακάτω πριν χάσετε την πρόσβαση στο λογαριασμό και τους χάρτες σας. Στη συνέχεια, παρακαλούμε αποσυνδεθείτε και συνδεθείτε ξανά με τον νέο πάροχο."
#: models.py:61 models.py:80
msgid "name"
msgstr "όνομα"
#: models.py:56 models.py:433
#: models.py:63 models.py:493
msgid "description"
msgstr "περιγραφή"
#: models.py:104
#: models.py:111
msgid "details"
msgstr "λεπτομέρειες"
#: models.py:105
#: models.py:112
msgid "Link to a page where the licence is detailed."
msgstr "Σύνδεσμος σελίδας αναλυτικής Άδειας Χρήσης."
#: models.py:115
#: models.py:122
msgid "URL template using OSM tile format"
msgstr "Πρότυπο URL που χρησιμοποιεί μορφοποίηση πλακιδίων OSM"
#: models.py:121
#: models.py:128
msgid "Order of the tilelayers in the edit box"
msgstr "Σειρά των υπόβαθρων στο πλαίσιο επεξεργασίας"
#: models.py:167 models.py:424
#: models.py:176 models.py:487
msgid "Only editable with secret edit link"
msgstr "Επεξεργάσιμο μόνο με μυστικό σύνδεσμο"
#: models.py:177 models.py:488
msgid "Everyone can edit"
msgstr "Όλοι μπορούν να επεξεργαστούν"
#: models.py:180 models.py:481
msgid "Everyone"
msgstr "Οποιοσδήποτε"
#: models.py:168 models.py:174 models.py:425
#: models.py:181 models.py:190 models.py:482
msgid "Editors and team only"
msgstr ""
msgstr "Μόνο συντάκτες και ομάδα"
#: models.py:169 models.py:426
#: models.py:182 models.py:483
msgid "Owner only"
msgstr "Μόνο ο κάτοχος"
#: models.py:172
#: models.py:185
msgid "Draft (private)"
msgstr "Πρόχειρο (ιδιωτικό)"
#: models.py:186
msgid "Everyone (public)"
msgstr "Όλοι (δημόσιος)"
#: models.py:173
#: models.py:189
msgid "Anyone with link"
msgstr "Οποιοδήποτε με τον σύνδεσμο"
#: models.py:175
#: models.py:191
msgid "Blocked"
msgstr "Αποκλεισμένος"
#: models.py:178
#: models.py:192 models.py:477
msgid "Deleted"
msgstr "Διαγράφηκε"
#: models.py:195
msgid "center"
msgstr "κέντρο"
#: models.py:179
#: models.py:196
msgid "zoom"
msgstr "εστίαση"
#: models.py:181
#: models.py:198
msgid "locate"
msgstr "εντοπισμός θέσης"
#: models.py:181
#: models.py:198
msgid "Locate user on load?"
msgstr "Εντοπισμός θέσης χρήστη κατά την φόρτωση;"
#: models.py:185
#: models.py:202
msgid "Choose the map licence."
msgstr "Επιλογή άδειας χρήσης του χάρτη."
#: models.py:186
#: models.py:203
msgid "licence"
msgstr "άδεια"
#: models.py:197
#: models.py:214
msgid "owner"
msgstr "ιδιοκτήτης"
#: models.py:201
#: models.py:218
msgid "editors"
msgstr "συντάκτες"
#: models.py:207
#: models.py:224
msgid "team"
msgstr ""
msgstr "ομάδα"
#: models.py:213 models.py:447
#: models.py:230 models.py:509
msgid "edit status"
msgstr "κατάσταση επεξεργασίας"
#: models.py:218
#: models.py:235 models.py:514
msgid "share status"
msgstr "κατάσταση διαμοιρασμού"
#: models.py:221 models.py:442
#: models.py:238 models.py:504
msgid "settings"
msgstr "ρυθμίσεις"
#: models.py:364
#: models.py:410
msgid "Clone of"
msgstr "Κλώνος του"
#: models.py:437
#: models.py:476 models.py:480 models.py:486
msgid "Inherit"
msgstr "Κληρονόμοι"
#: models.py:499
msgid "display on load"
msgstr "εμφάνιση κατά τη φόρτωση"
#: models.py:438
#: models.py:500
msgid "Display this layer on load."
msgstr "Εμφάνιση αυτού του επιπέδου κατά την φόρτωση."
#: templates/404.html:8
msgid "Take me to the home page"
msgstr "Επιστροφή στην αρχική σελίδα"
#: settings/base.py:295
msgid "Art and Culture"
msgstr "Τέχνες και Πολιτισμός"
#: templates/auth/user_detail.html:8
#: settings/base.py:296
msgid "Cycling"
msgstr "Ποδηλασία"
#: settings/base.py:297
msgid "Business"
msgstr "Επιχειρήσεις"
#: settings/base.py:298
msgid "Environment"
msgstr "Περιβάλλον"
#: settings/base.py:299
msgid "Education"
msgstr "Εκπαίδευση"
#: settings/base.py:300
msgid "Food and Agriculture"
msgstr "Διατροφή και Γεωργία"
#: settings/base.py:301
msgid "Geopolitics"
msgstr "Γεωπολιτική"
#: settings/base.py:302
msgid "Health"
msgstr "Υγεία"
#: settings/base.py:303
msgid "Hiking"
msgstr "Πεζοπορία-Ορειβασία"
#: settings/base.py:304
msgid "History"
msgstr "Ιστορία"
#: settings/base.py:305
msgid "Public sector"
msgstr "Δημόσιος τομέας"
#: settings/base.py:306
msgid "Science"
msgstr "Επιστήμες"
#: settings/base.py:307
msgid "Shopping"
msgstr "Ψώνια"
#: settings/base.py:308
msgid "Sport and Leisure"
msgstr "Αθλητισμός και ελεύθερος χρόνος"
#: settings/base.py:309
msgid "Travel"
msgstr "Ταξίδια"
#: settings/base.py:310
msgid "Transports"
msgstr "Μεταφορές"
#: settings/base.py:311
msgid "Tourism"
msgstr "Τουρισμός"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr "<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" target=\"_blank\">Δείτε εδώ την τεκμηρίωση</a> για το πώς να διαχειρίζεστε τα δικαιώματα του χάρτη."
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr "← Μετάβαση στην αρχική σελίδα"
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr "404 Η σελίδα δεν βρέθηκε"
#: templates/auth/user_detail.html:6
#, python-format
msgid "%(current_user)ss maps"
msgstr "%(current_user)ss χάρτες"
#: templates/auth/user_detail.html:12
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "Περιήγηση στους χάρτες του χρήστη %(current_user)s"
#: templates/auth/user_detail.html:17
#: templates/auth/user_detail.html:21
#, python-format
msgid "%(current_user)s has no maps."
msgstr "Ο %(current_user)s χρήστης δεν έχει χάρτες."
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
#: templates/auth/user_form.html:6
msgid "My Profile"
msgstr "Το προφίλ μου"
#: templates/auth/user_form.html:24 templates/umap/team_form.html:25
msgid "Save"
msgstr "Αποθήκευση"
#: templates/auth/user_form.html:27
#: templates/auth/user_form.html:30
msgid "Your current providers"
msgstr "Οι τρέχοντες πάροχοι σας"
#: templates/auth/user_form.html:39
#: templates/auth/user_form.html:44
msgid "Connect to another provider"
msgstr "Σύνδεση σε άλλον πάροχο"
#: templates/auth/user_form.html:42
#: templates/auth/user_form.html:47
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr "Είναι καλή συνήθεια να συνδέετε το λογαριασμό σας σε περισσότερους από έναν παρόχους, σε περίπτωση που ένας πάροχος δεν είναι διαθέσιμος, προσωρινά ή και μόνιμα."
#: templates/auth/user_stars.html:8
#: templates/auth/user_stars.html:6
#, python-format
msgid "%(current_user)ss starred maps"
msgstr "%(current_user)ss χάρτες με αστέρια"
#: templates/auth/user_stars.html:12
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr "Περιήγηση στους χάρτες με αστέρι του χρήστη %(current_user)s"
#: templates/auth/user_stars.html:17
#: templates/auth/user_stars.html:21
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr "Ο %(current_user)s δεν έχει ακόμη χάρτες με αστέρι."
@ -195,25 +312,33 @@ msgid ""
"them in your site."
msgstr "Το uMap σου επιτρέπει να δημιουργήσεις στο λεπτό χάρτες με στρώσεις OpenStreetMap και να τους ενσωματώσεις στον ιστότοπό σου."
#: templates/registration/login.html:6 templates/registration/login.html:45
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "Σύνδεση"
#: templates/registration/login.html:24
msgid "Please log in with your account"
msgstr "Παρακαλώ συνδεθείτε με τον λογαριασμό σας"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr "Για να αποθηκεύσετε και να βρείτε εύκολα τους χάρτες σας, προσδιορίστε τον εαυτό σας."
#: templates/registration/login.html:41
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr "Παρακαλούμε συνδεθείτε με το λογαριασμό σας:"
#: templates/registration/login.html:42
msgid "Username"
msgstr "Όνομα χρήστη"
#: templates/registration/login.html:44
#: templates/registration/login.html:45
msgid "Password"
msgstr "Κωδικός πρόσβασης"
#: templates/registration/login.html:51
msgid "Please choose a provider"
msgstr "Παρακαλώ επιλέξτε έναν πάροχο"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr "Παρακαλώ επιλέξτε έναν πάροχο:"
#: templates/umap/about.html:5 templates/umap/navigation.html:22
msgid "About"
msgstr "Σχετικά"
#: templates/umap/about_summary.html:12
#, python-format
@ -264,13 +389,13 @@ msgstr "Δημιουργία χάρτη"
msgid "Play with the demo"
msgstr "Δοκιμή με την έκδοση επίδειξης"
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr "Κλείσιμο"
#: templates/umap/components/alerts/alert.html:30
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
@ -278,35 +403,35 @@ msgid ""
"target=\"_blank\">log in</a>."
msgstr "Επισήμανση: για να βρίσκετε εύκολα τους χάρτες σας, <a href=\"%(login_url)s\" target=\"_blank\">δημιουργήστε λογαριασμό</a> ή <a href=\"%(login_url)s\" target=\"_blank\">συνδεθείτε</a>."
#: templates/umap/components/alerts/alert.html:35
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr "Αυτός είναι ο μυστικός σας σύνδεσμος για να επεξεργαστείτε τον χάρτη, διατηρήστε τον ασφαλή:"
#: templates/umap/components/alerts/alert.html:39
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr "Αντιγραφή συνδέσμου"
#: templates/umap/components/alerts/alert.html:46
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr "Καταχωρίστε το email σας για να λάβετε τον μυστικό σύνδεσμο:"
#: templates/umap/components/alerts/alert.html:52
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr "Email"
#: templates/umap/components/alerts/alert.html:55
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr "Στείλε μου τον σύνδεσμο"
#: templates/umap/components/alerts/alert.html:79
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr "Δείτε τις επεξεργασίες τους σε άλλη καρτέλα"
#: templates/umap/components/alerts/alert.html:82
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr "Διατηρήστε τις αλλαγές σας και αγνοήστε τις δικές τους"
#: templates/umap/components/alerts/alert.html:85
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr "Κρατήστε τις αλλαγές τους και αγνοήστε τις δικές σας"
@ -327,19 +452,19 @@ msgstr "Αυτή είναι μια έκδοση επίδειξης, που χρ
#: templates/umap/content_footer.html:5
msgid "An OpenStreetMap project"
msgstr ""
msgstr "Ένα έργο OpenStreetMap"
#: templates/umap/content_footer.html:6
msgid "version"
msgstr ""
msgstr "έκδοση"
#: templates/umap/content_footer.html:7
msgid "Hosted by"
msgstr ""
msgstr "Φιλοξενείται από"
#: templates/umap/content_footer.html:8
msgid "Contact"
msgstr ""
msgstr "Επικοινωνία"
#: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
msgid "Help"
@ -354,19 +479,19 @@ msgstr "Οι χάρτες μου (%(count)s)"
msgid "My Maps"
msgstr "Οι χάρτες μου"
#: templates/umap/dashboard_menu.html:11
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr "Το προφίλ μου"
#: templates/umap/dashboard_menu.html:13
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr ""
msgstr "Οι ομάδες μου"
#: templates/umap/home.html:14
msgid "Map of the uMaps"
msgstr "Χάρτης των uMaps"
#: templates/umap/home.html:24
#: templates/umap/home.html:25
msgid "Get inspired, browse maps"
msgstr "Περιηγήσου και αναζήτησε την έμπνευση στους χάρτες!"
@ -374,15 +499,19 @@ msgstr "Περιηγήσου και αναζήτησε την έμπνευση
msgid "You are logged in. Continuing..."
msgstr "Είστε συνδεδεμένοι. Συνέχεια..."
#: templates/umap/map_list.html:10 views.py:433
#: templates/umap/map_list.html:18 views.py:444
msgid "by"
msgstr "από"
#: templates/umap/map_list.html:18
#: templates/umap/map_list.html:22
msgid "See the map"
msgstr "Δες τον χάρτη"
#: templates/umap/map_list.html:28
msgid "More"
msgstr "Περισσότερα"
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:18
msgid "Name"
msgstr "Όνομα"
@ -406,7 +535,7 @@ msgstr "Τελευταία αποθήκευση"
msgid "Owner"
msgstr "Κάτοχος"
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:24
msgid "Actions"
msgstr "Ενέργειες"
@ -419,7 +548,7 @@ msgid "Share"
msgstr "Διαμοιρασμός"
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
#: templates/umap/user_teams.html:42 templates/umap/user_teams.html:44
msgid "Edit"
msgstr "Επεξεργασία"
@ -482,10 +611,6 @@ msgstr "Σύνδεση"
msgid "Sign in"
msgstr "Εγγραφή"
#: templates/umap/navigation.html:22
msgid "About"
msgstr "Σχετικά"
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "Αλλαγή κωδικού πρόσβασης"
@ -494,52 +619,62 @@ msgstr "Αλλαγή κωδικού πρόσβασης"
msgid "Log out"
msgstr "Αποσύνδεση"
#: templates/umap/password_change.html:7
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:11
msgid "Password change"
msgstr "Αλλαγή κωδικού πρόσβασης"
#: templates/umap/password_change.html:10
#: templates/umap/password_change.html:14
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "Παρακαλώ εισάγετε τον παλιό κωδικό πρόσβασης και μετά εισάγετε τον νέο κωδικό πρόσβασης δύο φορές, ώστε να επιβεβαιωθεί ότι πληκτρολογήθηκε σωστά."
#: templates/umap/password_change.html:17
#: templates/umap/password_change.html:21
msgid "Old password"
msgstr "Παλιός κωδικός πρόσβασης"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password"
msgstr "Νέος κωδικός πρόσβασης"
#: templates/umap/password_change.html:26
#: templates/umap/password_change.html:30
msgid "New password confirmation"
msgstr "Επιβεβαίωση νέου κωδικού πρόσβασης"
#: templates/umap/password_change.html:27
#: templates/umap/password_change.html:31
msgid "Change my password"
msgstr "Αλλαγή του κωδικού πρόσβασης"
#: templates/umap/password_change_done.html:7
#: templates/umap/password_change_done.html:6
#: templates/umap/password_change_done.html:11
msgid "Password change successful"
msgstr "Η αλλαγή του κωδικού πρόσβασης ήταν επιτυχημένη"
#: templates/umap/password_change_done.html:10
#: templates/umap/password_change_done.html:14
msgid "Your password was changed."
msgstr "Ο κωδικός πρόσβασής σας άλλαξε."
#: templates/umap/search.html:15
#: templates/umap/search.html:6
msgid "Explore maps"
msgstr "Εξερεύνηση χαρτών"
#: templates/umap/search.html:19
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
msgstr[0] "%(count)s χάρτης βρέθηκε:"
msgstr[1] "%(count)s χάρτες βρέθηκαν:"
#: templates/umap/search.html:24
#: templates/umap/search.html:30
msgid "No map found."
msgstr "Δεν βρέθηκε κανένας χάρτης."
#: templates/umap/search.html:29
#: templates/umap/search.html:36
msgid "Latest created maps in category"
msgstr "Τελευταία δημιουργημένοι χάρτες στην κατηγορία"
#: templates/umap/search.html:43
msgid "Latest created maps"
msgstr "Χάρτες που δημιουργήθηκαν τελευταίοι"
@ -547,27 +682,44 @@ msgstr "Χάρτες που δημιουργήθηκαν τελευταίοι"
msgid "Search maps"
msgstr "Αναζήτηση χαρτών"
#: templates/umap/search_bar.html:15
#: templates/umap/search_bar.html:14
msgid "Any category"
msgstr "Οποιαδήποτε κατηγορία"
#: templates/umap/search_bar.html:19
msgid "Search"
msgstr "Αναζήτηση"
#: templates/umap/team_detail.html:10
#: templates/umap/team_confirm_delete.html:6
msgid "Team deletion"
msgstr "Διαγραφή ομάδας"
#: templates/umap/team_detail.html:6
#, python-format
msgid "%(current_team)ss maps"
msgstr "%(current_team)ss χάρτες"
#: templates/umap/team_detail.html:14
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr ""
msgstr "Περιήγηση στους χάρτες της %(current_team)s"
#: templates/umap/team_detail.html:22
#: templates/umap/team_detail.html:26
#, python-format
msgid "%(current_team)s has no public maps."
msgstr ""
msgstr "%(current_team)s δεν έχει δημόσιους χάρτες."
#: templates/umap/team_form.html:24
#: templates/umap/team_form.html:6
msgid "Create or edit a team"
msgstr "Δημιουργία ή επεξεργασία ομάδας"
#: templates/umap/team_form.html:28
msgid "Delete this team"
msgstr ""
msgstr "Διαγραφή αυτής της ομάδας"
#: templates/umap/team_form.html:47
#: templates/umap/team_form.html:51
msgid "Add user"
msgstr ""
msgstr "Προσθήκη χρήστη"
#: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
msgid "Search my maps"
@ -586,78 +738,82 @@ msgstr "Λήψη%(count)s χαρτών"
msgid "You have no map yet."
msgstr "Δεν έχετε ακόμη χάρτη."
#: templates/umap/user_teams.html:17
msgid "Users"
msgstr ""
#: templates/umap/user_teams.html:6
msgid "My Teams"
msgstr "Οι ομάδες μου"
#: templates/umap/user_teams.html:48
#: templates/umap/user_teams.html:21
msgid "Users"
msgstr "Χρήστες"
#: templates/umap/user_teams.html:52
msgid "New team"
msgstr ""
msgstr "Νέα ομάδα"
#: views.py:235
msgid "Cannot delete a team with more than one member"
msgstr ""
msgstr "Δεν είναι δυνατή η διαγραφή μιας ομάδας που έχει περισσότερα από ένα μέλη"
#: views.py:239
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr ""
msgstr "Η ομάδα «%(name)s» έχει διαγραφεί."
#: views.py:438
#: views.py:449
msgid "View the map"
msgstr "Προβολή του χάρτη"
#: views.py:824
#: views.py:845
msgid "See full screen"
msgstr "Προβολή πλήρους οθόνης"
#: views.py:953
#: views.py:988
msgid "Map editors updated with success!"
msgstr "Η ενημέρωση των συντακτών χάρτη ήταν επιτυχής!"
#: views.py:989
#: views.py:1024
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr "Ο uMap σύνδεσμος επεξεργασίας του χάρτη σας: %(map_name)s"
#: views.py:992
#: views.py:1027
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr "Εδώ είναι ο μυστικός σύνδεσμος επεξεργασίας: %(link)s"
#: views.py:999
#: views.py:1034
#, python-format
msgid "Can't send email to %(email)s"
msgstr "Αδυναμία αποστολής email στο %(email)s"
#: views.py:1002
#: views.py:1037
#, python-format
msgid "Email sent to %(email)s"
msgstr "Μήνυμα email στάλθηκε στο %(email)s"
#: views.py:1013
#: views.py:1048
msgid "Only its owner can delete the map."
msgstr "Μονό ο ιδιοκτήτης μπορεί να διαγράψει αυτό τον χάρτη."
#: views.py:1016
#: views.py:1054
msgid "Map successfully deleted."
msgstr "Ο χάρτης διαγράφηκε με επιτυχία."
#: views.py:1042
#: views.py:1080
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "Ο χάρτης κλωνοποιήθηκε! Αν θέλετε να τον επεξεργαστείτε από κάποιον άλλο υπολογιστή, παρακαλώ χρησιμοποιήστε αυτόν τον σύνδεσμο: %(anonymous_url)s"
#: views.py:1047
#: views.py:1085
msgid "Congratulations, your map has been cloned!"
msgstr "Συγχαρητήρια ο χάρτης σας κλωνοποιήθηκε!"
#: views.py:1282
#: views.py:1339
msgid "Layer successfully deleted."
msgstr "Το επίπεδο διαγράφηκε με επιτυχία."
#: views.py:1304
#: views.py:1361
msgid "Permissions updated with success!"
msgstr "Τα δικαιώματα ενημερώθηκαν με επιτυχία!"

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-04 16:35+0000\n"
"POT-Creation-Date: 2025-04-25 15:38+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -21,168 +21,281 @@ msgstr ""
msgid "CSV Export"
msgstr ""
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr ""
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr ""
#: forms.py:69 models.py:441
msgid "Inherit"
msgstr ""
#: middleware.py:13
#: middleware.py:19
msgid "Site is readonly for maintenance"
msgstr ""
#: models.py:55 models.py:74
#: middleware.py:34
#, python-format
msgid ""
"Using “%(name)s” to authenticate is deprecated and will be removed soon. "
"Please configure another provider below before losing access to your account "
"and maps. Then, please logout and login again with the new provider."
msgstr ""
#: models.py:61 models.py:80
msgid "name"
msgstr ""
#: models.py:57 models.py:451
#: models.py:63 models.py:493
msgid "description"
msgstr ""
#: models.py:105
#: models.py:111
msgid "details"
msgstr ""
#: models.py:106
#: models.py:112
msgid "Link to a page where the licence is detailed."
msgstr ""
#: models.py:116
#: models.py:122
msgid "URL template using OSM tile format"
msgstr ""
#: models.py:122
#: models.py:128
msgid "Order of the tilelayers in the edit box"
msgstr ""
#: models.py:168 models.py:442
#: models.py:176 models.py:487
msgid "Only editable with secret edit link"
msgstr ""
#: models.py:177 models.py:488
msgid "Everyone can edit"
msgstr ""
#: models.py:180 models.py:481
msgid "Everyone"
msgstr ""
#: models.py:169 models.py:175 models.py:443
#: models.py:181 models.py:190 models.py:482
msgid "Editors and team only"
msgstr ""
#: models.py:170 models.py:444
#: models.py:182 models.py:483
msgid "Owner only"
msgstr ""
#: models.py:173
msgid "Everyone (public)"
msgstr ""
#: models.py:174
msgid "Anyone with link"
msgstr ""
#: models.py:176
msgid "Blocked"
msgstr ""
#: models.py:179
msgid "center"
msgstr ""
#: models.py:180
msgid "zoom"
msgstr ""
#: models.py:182
msgid "locate"
msgstr ""
#: models.py:182
msgid "Locate user on load?"
#: models.py:185
msgid "Draft (private)"
msgstr ""
#: models.py:186
msgid "Choose the map licence."
msgid "Everyone (public)"
msgstr ""
#: models.py:187
msgid "licence"
#: models.py:189
msgid "Anyone with link"
msgstr ""
#: models.py:191
msgid "Blocked"
msgstr ""
#: models.py:192 models.py:477
msgid "Deleted"
msgstr ""
#: models.py:195
msgid "center"
msgstr ""
#: models.py:196
msgid "zoom"
msgstr ""
#: models.py:198
msgid "owner"
msgid "locate"
msgstr ""
#: models.py:198
msgid "Locate user on load?"
msgstr ""
#: models.py:202
msgid "Choose the map licence."
msgstr ""
#: models.py:203
msgid "licence"
msgstr ""
#: models.py:214
msgid "owner"
msgstr ""
#: models.py:218
msgid "editors"
msgstr ""
#: models.py:208
#: models.py:224
msgid "team"
msgstr ""
#: models.py:214 models.py:465
#: models.py:230 models.py:509
msgid "edit status"
msgstr ""
#: models.py:219
#: models.py:235 models.py:514
msgid "share status"
msgstr ""
#: models.py:222 models.py:460
#: models.py:238 models.py:504
msgid "settings"
msgstr ""
#: models.py:382
#: models.py:410
msgid "Clone of"
msgstr ""
#: models.py:455
#: models.py:476 models.py:480 models.py:486
msgid "Inherit"
msgstr ""
#: models.py:499
msgid "display on load"
msgstr ""
#: models.py:456
#: models.py:500
msgid "Display this layer on load."
msgstr ""
#: templates/404.html:8
msgid "Take me to the home page"
#: settings/base.py:296
msgid "Art and Culture"
msgstr ""
#: templates/auth/user_detail.html:8
#: settings/base.py:297
msgid "Cycling"
msgstr ""
#: settings/base.py:298
msgid "Business"
msgstr ""
#: settings/base.py:299
msgid "Environment"
msgstr ""
#: settings/base.py:300
msgid "Education"
msgstr ""
#: settings/base.py:301
msgid "Food and Agriculture"
msgstr ""
#: settings/base.py:302
msgid "Geopolitics"
msgstr ""
#: settings/base.py:303
msgid "Health"
msgstr ""
#: settings/base.py:304
msgid "Hiking"
msgstr ""
#: settings/base.py:305
msgid "History"
msgstr ""
#: settings/base.py:306
msgid "Public sector"
msgstr ""
#: settings/base.py:307
msgid "Science"
msgstr ""
#: settings/base.py:308
msgid "Shopping"
msgstr ""
#: settings/base.py:309
msgid "Sport and Leisure"
msgstr ""
#: settings/base.py:310
msgid "Travel"
msgstr ""
#: settings/base.py:311
msgid "Transports"
msgstr ""
#: settings/base.py:312
msgid "Tourism"
msgstr ""
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps "
"permissions."
msgstr ""
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr ""
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr ""
#: templates/auth/user_detail.html:6
#, python-format
msgid "%(current_user)ss maps"
msgstr ""
#: templates/auth/user_detail.html:12
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr ""
#: templates/auth/user_detail.html:17
#: templates/auth/user_detail.html:21
#, python-format
msgid "%(current_user)s has no maps."
msgstr ""
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
#: templates/auth/user_form.html:6
msgid "My Profile"
msgstr ""
#: templates/auth/user_form.html:24 templates/umap/team_form.html:25
msgid "Save"
msgstr ""
#: templates/auth/user_form.html:27
#: templates/auth/user_form.html:30
msgid "Your current providers"
msgstr ""
#: templates/auth/user_form.html:39
#: templates/auth/user_form.html:44
msgid "Connect to another provider"
msgstr ""
#: templates/auth/user_form.html:42
#: templates/auth/user_form.html:47
msgid ""
"It's a good habit to connect your account to more than one provider, in case "
"one provider becomes unavailable, temporarily or even permanently."
msgstr ""
#: templates/auth/user_stars.html:8
#: templates/auth/user_stars.html:6
#, python-format
msgid "%(current_user)ss starred maps"
msgstr ""
#: templates/auth/user_stars.html:12
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr ""
#: templates/auth/user_stars.html:17
#: templates/auth/user_stars.html:21
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr ""
@ -193,24 +306,32 @@ msgid ""
"them in your site."
msgstr ""
#: templates/registration/login.html:6 templates/registration/login.html:45
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr ""
#: templates/registration/login.html:24
msgid "Please log in with your account"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr ""
#: templates/registration/login.html:41
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr ""
#: templates/registration/login.html:42
msgid "Username"
msgstr ""
#: templates/registration/login.html:44
#: templates/registration/login.html:45
msgid "Password"
msgstr ""
#: templates/registration/login.html:51
msgid "Please choose a provider"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr ""
#: templates/umap/about.html:5 templates/umap/navigation.html:22
msgid "About"
msgstr ""
#: templates/umap/about_summary.html:12
@ -262,13 +383,13 @@ msgstr ""
msgid "Play with the demo"
msgstr ""
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr ""
#: templates/umap/components/alerts/alert.html:30
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
@ -276,35 +397,35 @@ msgid ""
"target=\"_blank\">log in</a>."
msgstr ""
#: templates/umap/components/alerts/alert.html:35
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr ""
#: templates/umap/components/alerts/alert.html:39
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr ""
#: templates/umap/components/alerts/alert.html:46
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr ""
#: templates/umap/components/alerts/alert.html:52
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr ""
#: templates/umap/components/alerts/alert.html:55
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr ""
#: templates/umap/components/alerts/alert.html:79
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr ""
#: templates/umap/components/alerts/alert.html:82
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr ""
#: templates/umap/components/alerts/alert.html:85
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr ""
@ -364,7 +485,7 @@ msgstr ""
msgid "Map of the uMaps"
msgstr ""
#: templates/umap/home.html:24
#: templates/umap/home.html:25
msgid "Get inspired, browse maps"
msgstr ""
@ -372,15 +493,19 @@ msgstr ""
msgid "You are logged in. Continuing..."
msgstr ""
#: templates/umap/map_list.html:11 views.py:433
#: templates/umap/map_list.html:18 views.py:444
msgid "by"
msgstr ""
#: templates/umap/map_list.html:20
#: templates/umap/map_list.html:22
msgid "See the map"
msgstr ""
#: templates/umap/map_list.html:28
msgid "More"
msgstr ""
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:18
msgid "Name"
msgstr ""
@ -404,7 +529,7 @@ msgstr ""
msgid "Owner"
msgstr ""
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:24
msgid "Actions"
msgstr ""
@ -417,7 +542,7 @@ msgid "Share"
msgstr ""
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
#: templates/umap/user_teams.html:42 templates/umap/user_teams.html:44
msgid "Edit"
msgstr ""
@ -480,10 +605,6 @@ msgstr ""
msgid "Sign in"
msgstr ""
#: templates/umap/navigation.html:22
msgid "About"
msgstr ""
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr ""
@ -492,52 +613,61 @@ msgstr ""
msgid "Log out"
msgstr ""
#: templates/umap/password_change.html:7
#: templates/umap/password_change.html:6 templates/umap/password_change.html:11
msgid "Password change"
msgstr ""
#: templates/umap/password_change.html:10
#: templates/umap/password_change.html:14
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
#: templates/umap/password_change.html:17
#: templates/umap/password_change.html:21
msgid "Old password"
msgstr ""
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password"
msgstr ""
#: templates/umap/password_change.html:26
#: templates/umap/password_change.html:30
msgid "New password confirmation"
msgstr ""
#: templates/umap/password_change.html:27
#: templates/umap/password_change.html:31
msgid "Change my password"
msgstr ""
#: templates/umap/password_change_done.html:7
#: templates/umap/password_change_done.html:6
#: templates/umap/password_change_done.html:11
msgid "Password change successful"
msgstr ""
#: templates/umap/password_change_done.html:10
#: templates/umap/password_change_done.html:14
msgid "Your password was changed."
msgstr ""
#: templates/umap/search.html:15
#: templates/umap/search.html:6
msgid "Explore maps"
msgstr ""
#: templates/umap/search.html:19
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
msgstr[0] ""
msgstr[1] ""
#: templates/umap/search.html:24
#: templates/umap/search.html:30
msgid "No map found."
msgstr ""
#: templates/umap/search.html:29
#: templates/umap/search.html:36
msgid "Latest created maps in category"
msgstr ""
#: templates/umap/search.html:43
msgid "Latest created maps"
msgstr ""
@ -545,25 +675,42 @@ msgstr ""
msgid "Search maps"
msgstr ""
#: templates/umap/search_bar.html:15
#: templates/umap/search_bar.html:14
msgid "Any category"
msgstr ""
#: templates/umap/search_bar.html:19
msgid "Search"
msgstr ""
#: templates/umap/team_detail.html:10
#: templates/umap/team_confirm_delete.html:6
msgid "Team deletion"
msgstr ""
#: templates/umap/team_detail.html:6
#, python-format
msgid "%(current_team)ss maps"
msgstr ""
#: templates/umap/team_detail.html:14
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr ""
#: templates/umap/team_detail.html:22
#: templates/umap/team_detail.html:26
#, python-format
msgid "%(current_team)s has no public maps."
msgstr ""
#: templates/umap/team_form.html:24
#: templates/umap/team_form.html:6
msgid "Create or edit a team"
msgstr ""
#: templates/umap/team_form.html:28
msgid "Delete this team"
msgstr ""
#: templates/umap/team_form.html:47
#: templates/umap/team_form.html:51
msgid "Add user"
msgstr ""
@ -584,11 +731,15 @@ msgstr ""
msgid "You have no map yet."
msgstr ""
#: templates/umap/user_teams.html:17
#: templates/umap/user_teams.html:6
msgid "My Teams"
msgstr ""
#: templates/umap/user_teams.html:21
msgid "Users"
msgstr ""
#: templates/umap/user_teams.html:48
#: templates/umap/user_teams.html:52
msgid "New team"
msgstr ""
@ -601,61 +752,61 @@ msgstr ""
msgid "Team “%(name)s” has been deleted"
msgstr ""
#: views.py:438
#: views.py:449
msgid "View the map"
msgstr ""
#: views.py:818
#: views.py:845
msgid "See full screen"
msgstr ""
#: views.py:950
#: views.py:988
msgid "Map editors updated with success!"
msgstr ""
#: views.py:986
#: views.py:1024
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr ""
#: views.py:989
#: views.py:1027
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr ""
#: views.py:996
#: views.py:1034
#, python-format
msgid "Can't send email to %(email)s"
msgstr ""
#: views.py:999
#: views.py:1037
#, python-format
msgid "Email sent to %(email)s"
msgstr ""
#: views.py:1010
#: views.py:1048
msgid "Only its owner can delete the map."
msgstr ""
#: views.py:1013
#: views.py:1054
msgid "Map successfully deleted."
msgstr ""
#: views.py:1039
#: views.py:1080
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr ""
#: views.py:1044
#: views.py:1085
msgid "Congratulations, your map has been cloned!"
msgstr ""
#: views.py:1277
#: views.py:1339
msgid "Layer successfully deleted."
msgstr ""
#: views.py:1299
#: views.py:1361
msgid "Permissions updated with success!"
msgstr ""

Binary file not shown.

View file

@ -8,6 +8,7 @@
# Eric Armijo, 2023
# Gonzalo Gabriel Perez <zalitoar@gmail.com>, 2019
# Ignacio L'Episcopo, 2024
# Ignacio L'Episcopo, 2024-2025
# Igor Támara <igor@tamarapatino.org>, 2013
# 3c4f354c26c2c190ba28f9c2666d7fdb_003e9d1 <b28923423b98dace80389ae64c99bf93_129697>, 2014
# 3c4f354c26c2c190ba28f9c2666d7fdb_003e9d1 <b28923423b98dace80389ae64c99bf93_129697>, 2014,2016-2017,2020
@ -16,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-04 16:35+0000\n"
"POT-Creation-Date: 2025-04-11 15:30+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Ignacio L'Episcopo, 2024\n"
"Last-Translator: Ignacio L'Episcopo, 2024-2025\n"
"Language-Team: Spanish (http://app.transifex.com/openstreetmap/umap/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -30,168 +31,281 @@ msgstr ""
msgid "CSV Export"
msgstr "Exportar CSV"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "Solo editable con enlace secreto de edición"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr "Este mapa no está disponible públicamente"
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "Todos pueden editar"
#: forms.py:69 models.py:441
msgid "Inherit"
msgstr "Heredar"
#: middleware.py:13
#: middleware.py:19
msgid "Site is readonly for maintenance"
msgstr "Sitio en modo solo lectura por mantenimiento"
#: models.py:55 models.py:74
#: middleware.py:34
#, python-format
msgid ""
"Using “%(name)s” to authenticate is deprecated and will be removed soon. "
"Please configure another provider below before losing access to your account"
" and maps. Then, please logout and login again with the new provider."
msgstr "El uso de “%(name)s” para autenticar está obsoleto y se eliminará pronto. Por favor, configura otro proveedor a continuación antes de perder acceso a tu cuenta y mapas. Luego, cierra sesión e inicia sesión nuevamente con el nuevo proveedor."
#: models.py:61 models.py:80
msgid "name"
msgstr "nombre"
#: models.py:57 models.py:451
#: models.py:63 models.py:493
msgid "description"
msgstr "descripción"
#: models.py:105
#: models.py:111
msgid "details"
msgstr "detalles"
#: models.py:106
#: models.py:112
msgid "Link to a page where the licence is detailed."
msgstr "Enlace a una página donde se detalla la licencia."
#: models.py:116
#: models.py:122
msgid "URL template using OSM tile format"
msgstr "Plantilla de URL usando el formato de teselas OSM"
#: models.py:122
#: models.py:128
msgid "Order of the tilelayers in the edit box"
msgstr "Orden de las capas de teselas en el cuadro de edición"
#: models.py:168 models.py:442
#: models.py:176 models.py:487
msgid "Only editable with secret edit link"
msgstr "Solo editable con enlace secreto de edición"
#: models.py:177 models.py:488
msgid "Everyone can edit"
msgstr "Todos pueden editar"
#: models.py:180 models.py:481
msgid "Everyone"
msgstr "Todos"
#: models.py:169 models.py:175 models.py:443
#: models.py:181 models.py:190 models.py:482
msgid "Editors and team only"
msgstr "Solo editores y equipo"
#: models.py:170 models.py:444
#: models.py:182 models.py:483
msgid "Owner only"
msgstr "Solo el propietario"
#: models.py:173
#: models.py:185
msgid "Draft (private)"
msgstr "Borrador (privado)"
#: models.py:186
msgid "Everyone (public)"
msgstr "Todos (público)"
#: models.py:174
#: models.py:189
msgid "Anyone with link"
msgstr "Cualquiera con el enlace"
#: models.py:176
#: models.py:191
msgid "Blocked"
msgstr "Bloqueado"
#: models.py:179
#: models.py:192 models.py:477
msgid "Deleted"
msgstr "Eliminado"
#: models.py:195
msgid "center"
msgstr "centro"
#: models.py:180
#: models.py:196
msgid "zoom"
msgstr "zoom"
#: models.py:182
#: models.py:198
msgid "locate"
msgstr "localizar"
#: models.py:182
#: models.py:198
msgid "Locate user on load?"
msgstr "¿Localizar al usuario al cargar?"
#: models.py:186
#: models.py:202
msgid "Choose the map licence."
msgstr "Elige la licencia del mapa."
#: models.py:187
#: models.py:203
msgid "licence"
msgstr "licencia"
#: models.py:198
#: models.py:214
msgid "owner"
msgstr "propietario"
#: models.py:202
#: models.py:218
msgid "editors"
msgstr "editores"
#: models.py:208
#: models.py:224
msgid "team"
msgstr "equipo"
#: models.py:214 models.py:465
#: models.py:230 models.py:509
msgid "edit status"
msgstr "estado de edición"
#: models.py:219
#: models.py:235 models.py:514
msgid "share status"
msgstr "estado de compartir"
#: models.py:222 models.py:460
#: models.py:238 models.py:504
msgid "settings"
msgstr "ajustes"
#: models.py:382
#: models.py:410
msgid "Clone of"
msgstr "Clon de"
#: models.py:455
#: models.py:476 models.py:480 models.py:486
msgid "Inherit"
msgstr "Heredar"
#: models.py:499
msgid "display on load"
msgstr "mostrar al cargar"
#: models.py:456
#: models.py:500
msgid "Display this layer on load."
msgstr "Mostrar esta capa al cargar."
#: templates/404.html:8
msgid "Take me to the home page"
msgstr "Llévame a la página de inicio"
#: settings/base.py:295
msgid "Art and Culture"
msgstr "Arte y cultura"
#: templates/auth/user_detail.html:8
#: settings/base.py:296
msgid "Cycling"
msgstr "Ciclismo"
#: settings/base.py:297
msgid "Business"
msgstr "Negocios"
#: settings/base.py:298
msgid "Environment"
msgstr "Medio ambiente"
#: settings/base.py:299
msgid "Education"
msgstr "Educación"
#: settings/base.py:300
msgid "Food and Agriculture"
msgstr "Alimentos y agricultura"
#: settings/base.py:301
msgid "Geopolitics"
msgstr "Geopolítica"
#: settings/base.py:302
msgid "Health"
msgstr "Salud"
#: settings/base.py:303
msgid "Hiking"
msgstr "Senderismo"
#: settings/base.py:304
msgid "History"
msgstr "Historia"
#: settings/base.py:305
msgid "Public sector"
msgstr "Sector público"
#: settings/base.py:306
msgid "Science"
msgstr "Ciencia"
#: settings/base.py:307
msgid "Shopping"
msgstr "Compras"
#: settings/base.py:308
msgid "Sport and Leisure"
msgstr "Deporte y ocio"
#: settings/base.py:309
msgid "Travel"
msgstr "Viajes"
#: settings/base.py:310
msgid "Transports"
msgstr "Transporte"
#: settings/base.py:311
msgid "Tourism"
msgstr "Turismo"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr "<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" target=\"_blank\">Consulta aquí la documentación</a> sobre cómo gestionar los permisos del mapa."
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr "← Ir a la página principal"
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr "404 Página no encontrada"
#: templates/auth/user_detail.html:6
#, python-format
msgid "%(current_user)ss maps"
msgstr "Mapas de %(current_user)s"
#: templates/auth/user_detail.html:12
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "Explorar los mapas de %(current_user)s"
#: templates/auth/user_detail.html:17
#: templates/auth/user_detail.html:21
#, python-format
msgid "%(current_user)s has no maps."
msgstr "%(current_user)s no tiene mapas."
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
#: templates/auth/user_form.html:6
msgid "My Profile"
msgstr "Mi perfil"
#: templates/auth/user_form.html:24 templates/umap/team_form.html:25
msgid "Save"
msgstr "Guardar"
#: templates/auth/user_form.html:27
#: templates/auth/user_form.html:30
msgid "Your current providers"
msgstr "Tus proveedores actuales"
#: templates/auth/user_form.html:39
#: templates/auth/user_form.html:44
msgid "Connect to another provider"
msgstr "Conectar con otro proveedor"
#: templates/auth/user_form.html:42
#: templates/auth/user_form.html:47
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr "Es un buen hábito conectar tu cuenta a más de un proveedor, en caso de que uno no esté disponible, temporal o permanentemente."
#: templates/auth/user_stars.html:8
#: templates/auth/user_stars.html:6
#, python-format
msgid "%(current_user)ss starred maps"
msgstr "Mapas destacados de %(current_user)s"
#: templates/auth/user_stars.html:12
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr "Explorar los mapas destacados de %(current_user)s"
#: templates/auth/user_stars.html:17
#: templates/auth/user_stars.html:21
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr "%(current_user)s no tiene mapas destacados todavía."
@ -202,25 +316,33 @@ msgid ""
"them in your site."
msgstr "uMap te permite crear mapas con capas de OpenStreetMap en un minuto e integrarlos en tu sitio."
#: templates/registration/login.html:6 templates/registration/login.html:45
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "Iniciar sesión"
#: templates/registration/login.html:24
msgid "Please log in with your account"
msgstr "Por favor, inicia sesión con tu cuenta"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr "Para guardar y encontrar fácilmente tus mapas, identifícate."
#: templates/registration/login.html:41
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr "Por favor, inicia sesión con tu cuenta:"
#: templates/registration/login.html:42
msgid "Username"
msgstr "Nombre de usuario"
#: templates/registration/login.html:44
#: templates/registration/login.html:45
msgid "Password"
msgstr "Contraseña"
#: templates/registration/login.html:51
msgid "Please choose a provider"
msgstr "Por favor, elige un proveedor"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr "Por favor, elige un proveedor:"
#: templates/umap/about.html:5 templates/umap/navigation.html:22
msgid "About"
msgstr "Acerca de"
#: templates/umap/about_summary.html:12
#, python-format
@ -271,13 +393,13 @@ msgstr "Crear un mapa"
msgid "Play with the demo"
msgstr "Juega con la demo"
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr "Cerrar"
#: templates/umap/components/alerts/alert.html:30
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
@ -285,35 +407,35 @@ msgid ""
"target=\"_blank\">log in</a>."
msgstr "Consejo pro: para encontrar fácilmente tus mapas, <a href=\"%(login_url)s\" target=\"_blank\">crea una cuenta</a> o <a href=\"%(login_url)s\" target=\"_blank\">inicia sesión</a>."
#: templates/umap/components/alerts/alert.html:35
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr "Aquí está tu enlace secreto para editar el mapa, guárdalo bien:"
#: templates/umap/components/alerts/alert.html:39
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr "Copiar enlace"
#: templates/umap/components/alerts/alert.html:46
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr "Introduce tu dirección de correo electrónico para recibir el enlace secreto:"
#: templates/umap/components/alerts/alert.html:52
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr "Correo electrónico"
#: templates/umap/components/alerts/alert.html:55
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr "Enviarme el enlace"
#: templates/umap/components/alerts/alert.html:79
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr "Ver sus ediciones en otra pestaña"
#: templates/umap/components/alerts/alert.html:82
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr "Mantén tus cambios y descarta los suyos"
#: templates/umap/components/alerts/alert.html:85
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr "Mantén sus cambios y descarta los tuyos"
@ -373,7 +495,7 @@ msgstr "Mis equipos"
msgid "Map of the uMaps"
msgstr "Mapa de los uMaps"
#: templates/umap/home.html:24
#: templates/umap/home.html:25
msgid "Get inspired, browse maps"
msgstr "Inspírate, navega por los mapas"
@ -381,15 +503,19 @@ msgstr "Inspírate, navega por los mapas"
msgid "You are logged in. Continuing..."
msgstr "Has iniciado sesión. Continuando..."
#: templates/umap/map_list.html:11 views.py:433
#: templates/umap/map_list.html:18 views.py:444
msgid "by"
msgstr "por"
#: templates/umap/map_list.html:20
#: templates/umap/map_list.html:22
msgid "See the map"
msgstr "Ver el mapa"
#: templates/umap/map_list.html:28
msgid "More"
msgstr "Más"
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:18
msgid "Name"
msgstr "Nombre"
@ -413,7 +539,7 @@ msgstr "Último guardado"
msgid "Owner"
msgstr "Dueño"
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:24
msgid "Actions"
msgstr "Acciones"
@ -426,7 +552,7 @@ msgid "Share"
msgstr "Compartir"
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
#: templates/umap/user_teams.html:42 templates/umap/user_teams.html:44
msgid "Edit"
msgstr "Editar"
@ -489,10 +615,6 @@ msgstr "Ingresar"
msgid "Sign in"
msgstr "Regístrarse"
#: templates/umap/navigation.html:22
msgid "About"
msgstr "Acerca de"
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "Cambiar contraseña"
@ -501,41 +623,47 @@ msgstr "Cambiar contraseña"
msgid "Log out"
msgstr "Salir"
#: templates/umap/password_change.html:7
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:11
msgid "Password change"
msgstr "Contraseña cambiada"
#: templates/umap/password_change.html:10
#: templates/umap/password_change.html:14
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "Introduzca su contraseña antigua, por seguridad, y luego introduzca su nueva contraseña dos veces para que podamos verificar si ha escrito correctamente."
#: templates/umap/password_change.html:17
#: templates/umap/password_change.html:21
msgid "Old password"
msgstr "Contraseña antigua"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password"
msgstr "Nueva contraseña"
#: templates/umap/password_change.html:26
#: templates/umap/password_change.html:30
msgid "New password confirmation"
msgstr "Confirmar nueva contraseña"
#: templates/umap/password_change.html:27
#: templates/umap/password_change.html:31
msgid "Change my password"
msgstr "Cambiar mi contraseña"
#: templates/umap/password_change_done.html:7
#: templates/umap/password_change_done.html:6
#: templates/umap/password_change_done.html:11
msgid "Password change successful"
msgstr "Contraseña cambiada con éxito"
#: templates/umap/password_change_done.html:10
#: templates/umap/password_change_done.html:14
msgid "Your password was changed."
msgstr "Su contraseña fue guardada."
#: templates/umap/search.html:15
#: templates/umap/search.html:6
msgid "Explore maps"
msgstr "Explorar mapas"
#: templates/umap/search.html:19
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
@ -543,11 +671,15 @@ msgstr[0] "%(count)s mapa encontrado:"
msgstr[1] "%(count)s mapas encontrados:"
msgstr[2] "%(count)s mapas encontrados:"
#: templates/umap/search.html:24
#: templates/umap/search.html:30
msgid "No map found."
msgstr "No se ha encontrado ningún mapa."
#: templates/umap/search.html:29
#: templates/umap/search.html:36
msgid "Latest created maps in category"
msgstr "Últimos mapas creados en la categoría"
#: templates/umap/search.html:43
msgid "Latest created maps"
msgstr "Últimos mapas creados"
@ -555,25 +687,42 @@ msgstr "Últimos mapas creados"
msgid "Search maps"
msgstr "Buscar mapas"
#: templates/umap/search_bar.html:15
#: templates/umap/search_bar.html:14
msgid "Any category"
msgstr "Cualquier categoría"
#: templates/umap/search_bar.html:19
msgid "Search"
msgstr "Buscar"
#: templates/umap/team_detail.html:10
#: templates/umap/team_confirm_delete.html:6
msgid "Team deletion"
msgstr "Eliminación de equipo"
#: templates/umap/team_detail.html:6
#, python-format
msgid "%(current_team)ss maps"
msgstr "Mapas de %(current_team)s"
#: templates/umap/team_detail.html:14
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr "Explorar los mapas de %(current_team)s"
#: templates/umap/team_detail.html:22
#: templates/umap/team_detail.html:26
#, python-format
msgid "%(current_team)s has no public maps."
msgstr "%(current_team)s no tiene mapas públicos."
#: templates/umap/team_form.html:24
#: templates/umap/team_form.html:6
msgid "Create or edit a team"
msgstr "Crear o editar un equipo"
#: templates/umap/team_form.html:28
msgid "Delete this team"
msgstr "Eliminar este equipo"
#: templates/umap/team_form.html:47
#: templates/umap/team_form.html:51
msgid "Add user"
msgstr "Añadir usuario"
@ -594,11 +743,15 @@ msgstr "Descargar %(count)s mapas"
msgid "You have no map yet."
msgstr "Aún no tiene mapa."
#: templates/umap/user_teams.html:17
#: templates/umap/user_teams.html:6
msgid "My Teams"
msgstr "Mis equipos"
#: templates/umap/user_teams.html:21
msgid "Users"
msgstr "Usuarios"
#: templates/umap/user_teams.html:48
#: templates/umap/user_teams.html:52
msgid "New team"
msgstr "Nuevo equipo"
@ -611,61 +764,61 @@ msgstr "No se puede eliminar un equipo con más de un miembro"
msgid "Team “%(name)s” has been deleted"
msgstr "El equipo “%(name)s” ha sido eliminado"
#: views.py:438
#: views.py:449
msgid "View the map"
msgstr "Ver el mapa"
#: views.py:818
#: views.py:845
msgid "See full screen"
msgstr "Ver en pantalla completa"
#: views.py:950
#: views.py:988
msgid "Map editors updated with success!"
msgstr "¡Los editores del mapas han sido actualizados con éxito!"
#: views.py:986
#: views.py:1024
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr "El enlace de edición de uMap para tu mapa: %(map_name)s"
#: views.py:989
#: views.py:1027
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr "Aquí está tu enlace secreto de edición: %(link)s"
#: views.py:996
#: views.py:1034
#, python-format
msgid "Can't send email to %(email)s"
msgstr "No se puede enviar correo electrónico a %(email)s"
#: views.py:999
#: views.py:1037
#, python-format
msgid "Email sent to %(email)s"
msgstr "Correo electrónico enviado a %(email)s"
#: views.py:1010
#: views.py:1048
msgid "Only its owner can delete the map."
msgstr "Sólo el propietario puede borrar el mapa."
#: views.py:1013
#: views.py:1054
msgid "Map successfully deleted."
msgstr "Mapa eliminado correctamente."
#: views.py:1039
#: views.py:1080
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "¡Tu mapa ha sido clonado! Si quieres editar este mapa desde otro ordenador, usa este enlace: %(anonymous_url)s"
#: views.py:1044
#: views.py:1085
msgid "Congratulations, your map has been cloned!"
msgstr "¡Enhorabuena! ¡Tu mapa ha sido clonado!"
#: views.py:1277
#: views.py:1339
msgid "Layer successfully deleted."
msgstr "Se eliminó la capa con éxito."
#: views.py:1299
#: views.py:1361
msgid "Permissions updated with success!"
msgstr "¡Permisos actualizados con éxito!"

Binary file not shown.

View file

@ -4,14 +4,14 @@
#
# Translators:
# Moon Ika, 2020
# Moon Ika, 2020
# Moon Ika, 2020,2025
msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-15 13:53+0000\n"
"POT-Creation-Date: 2025-03-07 15:18+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Moon Ika, 2020\n"
"Last-Translator: Moon Ika, 2020,2025\n"
"Language-Team: Estonian (http://app.transifex.com/openstreetmap/umap/language/et/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -19,258 +19,357 @@ msgstr ""
"Language: et\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "Muudetav ainult salajase muutmislingiga"
#: admin.py:16
msgid "CSV Export"
msgstr "CSV eksport"
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "Igaüks saab muuta"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr "See kaart pole avalikult kättesaadav"
#: forms.py:69 models.py:371
msgid "Inherit"
msgstr ""
#: middleware.py:13
#: middleware.py:19
msgid "Site is readonly for maintenance"
msgstr "Sait on hoolduseks kirjutuskaitstud"
#: models.py:50
#: middleware.py:34
#, python-format
msgid ""
"Using “%(name)s” to authenticate is deprecated and will be removed soon. "
"Please configure another provider below before losing access to your account"
" and maps. Then, please logout and login again with the new provider."
msgstr ""
#: models.py:60 models.py:79
msgid "name"
msgstr "nimi"
#: models.py:81
msgid "details"
msgstr "detailid"
#: models.py:82
msgid "Link to a page where the licence is detailed."
msgstr "Link litsentsi selgitavale lehele."
#: models.py:92
msgid "URL template using OSM tile format"
msgstr ""
#: models.py:98
msgid "Order of the tilelayers in the edit box"
msgstr ""
#: models.py:144 models.py:372
msgid "Everyone"
msgstr ""
#: models.py:145 models.py:151 models.py:373
msgid "Editors only"
msgstr ""
#: models.py:146 models.py:374
msgid "Owner only"
msgstr ""
#: models.py:149
msgid "Everyone (public)"
msgstr ""
#: models.py:150
msgid "Anyone with link"
msgstr ""
#: models.py:152
msgid "Blocked"
msgstr ""
#: models.py:155 models.py:378
#: models.py:62 models.py:485
msgid "description"
msgstr "kirjeldus"
#: models.py:156
#: models.py:110
msgid "details"
msgstr "detailid"
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr "Link litsentsi selgitavale lehele."
#: models.py:121
msgid "URL template using OSM tile format"
msgstr ""
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr ""
#: models.py:175 models.py:479
msgid "Only editable with secret edit link"
msgstr "Muudetav ainult salajase muutmislingiga"
#: models.py:176 models.py:480
msgid "Everyone can edit"
msgstr "Igaüks saab muuta"
#: models.py:179 models.py:473
msgid "Everyone"
msgstr "Kõik"
#: models.py:180 models.py:189 models.py:474
msgid "Editors and team only"
msgstr "Ainult toimetajad ja meeskond"
#: models.py:181 models.py:475
msgid "Owner only"
msgstr "Ainult omanik"
#: models.py:184
msgid "Draft (private)"
msgstr "Mustand (privaatne)"
#: models.py:185
msgid "Everyone (public)"
msgstr "Kõik (avalik)"
#: models.py:188
msgid "Anyone with link"
msgstr ""
#: models.py:190
msgid "Blocked"
msgstr "Blokeeritud"
#: models.py:191 models.py:469
msgid "Deleted"
msgstr "Kustutatud"
#: models.py:194
msgid "center"
msgstr "tsentreeri"
#: models.py:157
#: models.py:195
msgid "zoom"
msgstr "suurenda"
#: models.py:159
#: models.py:197
msgid "locate"
msgstr "määra asukoht"
#: models.py:159
#: models.py:197
msgid "Locate user on load?"
msgstr "Määra kasutaja asukoht laadimisel?"
msgstr "Määra laadimisel kasutaja asukoht?"
#: models.py:163
#: models.py:201
msgid "Choose the map licence."
msgstr "Vali kaardi litsents."
#: models.py:164
#: models.py:202
msgid "licence"
msgstr "litsents"
#: models.py:175
#: models.py:213
msgid "owner"
msgstr "omanik"
#: models.py:179
#: models.py:217
msgid "editors"
msgstr "toimetajad"
#: models.py:184 models.py:392
#: models.py:223
msgid "team"
msgstr "meeskond"
#: models.py:229 models.py:501
msgid "edit status"
msgstr "muutmise staatus"
#: models.py:189
#: models.py:234 models.py:506
msgid "share status"
msgstr "jagamise staatus"
#: models.py:192 models.py:387
#: models.py:237 models.py:496
msgid "settings"
msgstr "seaded"
#: models.py:320
#: models.py:407
msgid "Clone of"
msgstr "Koopia"
#: models.py:382
#: models.py:468 models.py:472 models.py:478
msgid "Inherit"
msgstr ""
#: models.py:491
msgid "display on load"
msgstr "kuva laadimisel"
#: models.py:383
#: models.py:492
msgid "Display this layer on load."
msgstr "Kuva seda kihti laadimisel"
#: templates/404.html:6
msgid "Take me to the home page"
msgstr "Vii mind avalehele"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr ""
#: templates/auth/user_detail.html:5
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr "← Mine avalehele"
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr "404 Lehte ei leitud"
#: templates/auth/user_detail.html:6
#, python-format
msgid "%(current_user)ss maps"
msgstr ""
#: templates/auth/user_detail.html:12
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "Sirvi kasutaja %(current_user)s kaarte"
#: templates/auth/user_detail.html:12
#: templates/auth/user_detail.html:21
#, python-format
msgid "%(current_user)s has no maps."
msgstr "Kasutajal %(current_user)s pole kaarte."
#: templates/auth/user_form.html:6
msgid "My Maps"
msgstr ""
#: templates/auth/user_form.html:7
msgid "My Profile"
msgstr ""
msgstr "Minu profiil"
#: templates/auth/user_form.html:20
#: templates/auth/user_form.html:24 templates/umap/team_form.html:25
msgid "Save"
msgstr ""
msgstr "Salvesta"
#: templates/auth/user_form.html:25
#: templates/auth/user_form.html:30
msgid "Your current providers"
msgstr ""
#: templates/auth/user_form.html:31
#: templates/auth/user_form.html:44
msgid "Connect to another provider"
msgstr ""
#: templates/auth/user_form.html:33
#: templates/auth/user_form.html:47
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr ""
#: templates/auth/user_stars.html:5
#: templates/auth/user_stars.html:6
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgid "%(current_user)ss starred maps"
msgstr ""
#: templates/auth/user_stars.html:12
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr ""
#: templates/auth/user_stars.html:21
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr ""
#: templates/base.html:12
#: templates/base.html:13
msgid ""
"uMap lets you create maps with OpenStreetMap layers in a minute and embed "
"them in your site."
msgstr ""
#: templates/registration/login.html:16
msgid "Please log in with your account"
msgstr "Logi palun oma kontoga sisse"
#: templates/registration/login.html:28
msgid "Username"
msgstr "Kasutajanimi"
#: templates/registration/login.html:31
msgid "Password"
msgstr "Salasõna"
#: templates/registration/login.html:32
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "Logi sisse"
#: templates/registration/login.html:37
msgid "Please choose a provider"
msgstr "Vali palun teenusepakkuja"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr "Tuvasta end kaartide salvestamiseks ja kiireks leidmiseks."
#: templates/umap/about_summary.html:11
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr "Palun logi oma kontoga sisse:"
#: templates/registration/login.html:42
msgid "Username"
msgstr "Kasutajanimi"
#: templates/registration/login.html:45
msgid "Password"
msgstr "Salasõna"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr "Vali teenusepakkuja:"
#: templates/umap/about.html:5 templates/umap/navigation.html:22
msgid "About"
msgstr "Teave"
#: templates/umap/about_summary.html:12
#, python-format
msgid ""
"uMap lets you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
"layers in a minute and embed them in your site."
msgstr "uMap võimaldab sul hetkega luua <a href=\"%(osm_url)s\" />OpenStreetMap</a> kihtidega kaarte ja manustada neid oma saidil."
#: templates/umap/about_summary.html:21
#: templates/umap/about_summary.html:23
msgid "Choose the layers of your map"
msgstr "Vali oma kaardile kihid"
#: templates/umap/about_summary.html:22
#: templates/umap/about_summary.html:26
msgid "Add POIs: markers, lines, polygons..."
msgstr "Lisa POId: markerid, jooned, hulknurgad..."
#: templates/umap/about_summary.html:23
#: templates/umap/about_summary.html:29
msgid "Manage POIs colours and icons"
msgstr "Halda POIde värve ja ikoone"
#: templates/umap/about_summary.html:24
#: templates/umap/about_summary.html:32
msgid "Manage map options: display a minimap, locate user on load…"
msgstr "Halda kaardi suvandeid: kuva minikaart, määra laadimisel kasutaja asukoht..."
#: templates/umap/about_summary.html:25
#: templates/umap/about_summary.html:35
msgid "Batch import geostructured data (geojson, gpx, kml, osm...)"
msgstr "Geostruktureeritud andmete hulgiimport (geojson, gpx, kml, osm...)"
#: templates/umap/about_summary.html:26
#: templates/umap/about_summary.html:38
msgid "Choose the license for your data"
msgstr "Vali oma andmetele litsents"
#: templates/umap/about_summary.html:27
#: templates/umap/about_summary.html:41
msgid "Embed and share your map"
msgstr "Manusta ja jaga oma kaarti"
#: templates/umap/about_summary.html:37
#: templates/umap/about_summary.html:52
#, python-format
msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "Ja see kõik on <a href=\"%(repo_url)s\">avatud lähtekoodiga</a>!"
#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38
#: templates/umap/user_dashboard.html:42
#: templates/umap/about_summary.html:63 templates/umap/navigation.html:39
#: templates/umap/user_dashboard.html:40
msgid "Create a map"
msgstr "Loo kaart"
#: templates/umap/about_summary.html:51
#: templates/umap/about_summary.html:66
msgid "Play with the demo"
msgstr "Mängi demoga"
#: templates/umap/content.html:22
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr ""
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
"target=\"_blank\">create an account</a> or <a href=\"%(login_url)s\" "
"target=\"_blank\">log in</a>."
msgstr ""
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr "Siin on sinu salalink kaardi toimetamiseks, hoia seda salajas:"
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr "Kopeeri link"
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr "Sisesta salalingi saamiseks oma e-posti aadress:"
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr "E-post"
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr "Saada mulle link"
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr ""
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr ""
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr ""
#: templates/umap/content.html:26
msgid ""
"This instance of uMap is currently in read only mode, no creation/edit is "
"allowed."
msgstr ""
#: templates/umap/content.html:30
#: templates/umap/content.html:34
#, python-format
msgid ""
"This is a demo instance, used for tests and pre-rolling releases. If you "
@ -279,270 +378,358 @@ msgid ""
"instance, it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr ""
#: templates/umap/home.html:8
msgid "Map of the uMaps"
msgstr "uMaps'i kaart"
#: templates/umap/content_footer.html:5
msgid "An OpenStreetMap project"
msgstr "OpenStreetMapi projekt"
#: templates/umap/content_footer.html:6
msgid "version"
msgstr "versioon"
#: templates/umap/content_footer.html:7
msgid "Hosted by"
msgstr ""
#: templates/umap/content_footer.html:8
msgid "Contact"
msgstr "Kontakt"
#: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
msgid "Help"
msgstr "Abi"
#: templates/umap/dashboard_menu.html:6
#, python-format
msgid "My Maps (%(count)s)"
msgstr "Minu kaardid (%(count)s)"
#: templates/umap/dashboard_menu.html:8
msgid "My Maps"
msgstr "Minu kaardid"
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr "Minu profiil"
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr "Minu meeskonnad"
#: templates/umap/home.html:14
msgid "Map of the uMaps"
msgstr "uMapsi kaart"
#: templates/umap/home.html:24
msgid "Get inspired, browse maps"
msgstr "Sirvi kaarte ja ammuta inspiratsiooni"
#: templates/umap/login_popup_end.html:2
#: templates/umap/login_popup_end.html:4
msgid "You are logged in. Continuing..."
msgstr "Oled sisse logitud. Jätkamine..."
#: templates/umap/map_list.html:9 views.py:341
#: templates/umap/map_list.html:11 views.py:438
msgid "by"
msgstr "kasutajalt"
#: templates/umap/map_list.html:17
#: templates/umap/map_list.html:20
msgid "More"
msgstr "Rohkem"
#: templates/umap/map_table.html:6
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:18
msgid "Name"
msgstr ""
#: templates/umap/map_table.html:7
msgid "Preview"
msgstr ""
#: templates/umap/map_table.html:8
msgid "Who can see"
msgstr ""
#: templates/umap/map_table.html:9
msgid "Who can edit"
msgstr ""
#: templates/umap/map_table.html:10
msgid "Last save"
msgstr ""
msgstr "Nimi"
#: templates/umap/map_table.html:11
msgid "Owner"
msgstr ""
msgid "Preview"
msgstr "Eelvaade"
#: templates/umap/map_table.html:12
#: templates/umap/map_table.html:14
msgid "Who can see"
msgstr "Kes saavad vaadata"
#: templates/umap/map_table.html:17
msgid "Who can edit"
msgstr "Kes saavad toimetada"
#: templates/umap/map_table.html:20
msgid "Last save"
msgstr "Viimane salvestamine"
#: templates/umap/map_table.html:23
msgid "Owner"
msgstr "Omanik"
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:24
msgid "Actions"
msgstr ""
#: templates/umap/map_table.html:25 templates/umap/map_table.html:27
#: templates/umap/map_table.html:41 templates/umap/map_table.html:43
msgid "Open preview"
msgstr ""
#: templates/umap/map_table.html:46 templates/umap/map_table.html:48
#: templates/umap/map_table.html:72 templates/umap/map_table.html:74
msgid "Share"
msgstr ""
msgstr "Jaga"
#: templates/umap/map_table.html:51 templates/umap/map_table.html:53
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:42 templates/umap/user_teams.html:44
msgid "Edit"
msgstr ""
msgstr "Redigeeri"
#: templates/umap/map_table.html:56 templates/umap/map_table.html:58
#: templates/umap/map_table.html:84 templates/umap/map_table.html:86
msgid "Download"
msgstr ""
msgstr "Laadi alla"
#: templates/umap/map_table.html:63 templates/umap/map_table.html:65
#: templates/umap/map_table.html:90 templates/umap/map_table.html:92
msgid "Clone"
msgstr ""
#: templates/umap/map_table.html:73 templates/umap/map_table.html:75
#: templates/umap/map_table.html:101 templates/umap/map_table.html:103
msgid "Delete"
msgstr ""
msgstr "Kustuta"
#: templates/umap/map_table.html:88
#: templates/umap/map_table.html:117
msgid "first"
msgstr ""
#: templates/umap/map_table.html:89
msgid "previous"
msgstr ""
#: templates/umap/map_table.html:98
#, python-format
msgid "Page %(maps_number)s of %(num_pages)s"
msgstr ""
#: templates/umap/map_table.html:104
msgid "next"
msgstr ""
#: templates/umap/map_table.html:105
msgid "last"
msgstr ""
#: templates/umap/map_table.html:113
#, python-format
msgid "Lines per page: %(per_page)s"
msgstr ""
msgstr "esimene"
#: templates/umap/map_table.html:118
msgid "previous"
msgstr "eelmine"
#: templates/umap/map_table.html:126
#, python-format
msgid "Page %(maps_number)s of %(num_pages)s"
msgstr "%(maps_number)s. lehekülg %(num_pages)s-st"
#: templates/umap/map_table.html:131
msgid "next"
msgstr "järgmine"
#: templates/umap/map_table.html:132
msgid "last"
msgstr "viimane"
#: templates/umap/map_table.html:140
#, python-format
msgid "Lines per page: %(per_page)s"
msgstr "Jooni leheküljel: %(per_page)s"
#: templates/umap/map_table.html:145
#, python-format
msgid "%(count)s maps"
msgstr ""
msgstr "%(count)s kaarti"
#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4
#: templates/umap/navigation.html:11 templates/umap/user_dashboard.html:6
msgid "My Dashboard"
msgstr ""
#: templates/umap/navigation.html:13
#: templates/umap/navigation.html:14
msgid "Starred maps"
msgstr ""
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Log in"
msgstr "Logi sisse"
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Sign in"
msgstr "Loo konto"
#: templates/umap/navigation.html:21
msgid "About"
msgstr "Teave"
#: templates/umap/navigation.html:24
msgid "Help"
msgstr ""
#: templates/umap/navigation.html:29
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "Muuda salasõna"
#: templates/umap/navigation.html:33
#: templates/umap/navigation.html:34
msgid "Log out"
msgstr "Logi välja"
#: templates/umap/password_change.html:4
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:11
msgid "Password change"
msgstr "Salasõna vahetamine"
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:14
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "Sisesta palun oma vana salasõna, seejärel kaks korda uus salasõna."
#: templates/umap/password_change.html:13
#: templates/umap/password_change.html:21
msgid "Old password"
msgstr "Vana salasõna"
#: templates/umap/password_change.html:18
#: templates/umap/password_change.html:26
msgid "New password"
msgstr "Uus salasõna"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:30
msgid "New password confirmation"
msgstr "Uue salasõna kinnitamine"
#: templates/umap/password_change.html:23
#: templates/umap/password_change.html:31
msgid "Change my password"
msgstr "Muuda salasõna"
#: templates/umap/password_change_done.html:4
#: templates/umap/password_change_done.html:6
#: templates/umap/password_change_done.html:11
msgid "Password change successful"
msgstr "Salasõna vahetamine õnnestus"
#: templates/umap/password_change_done.html:5
#: templates/umap/password_change_done.html:14
msgid "Your password was changed."
msgstr "Sinu salasõna on muudetud."
#: templates/umap/search.html:10
#: templates/umap/search.html:6
msgid "Explore maps"
msgstr ""
#: templates/umap/search.html:19
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
msgstr[0] ""
msgstr[1] ""
#: templates/umap/search.html:18
#: templates/umap/search.html:28
msgid "No map found."
msgstr ""
msgstr "Kaarti ei leitud."
#: templates/umap/search.html:21
#: templates/umap/search.html:33
msgid "Latest created maps"
msgstr ""
msgstr "Viimati loodud kaardid."
#: templates/umap/search_bar.html:3
#: templates/umap/search_bar.html:4
msgid "Search maps"
msgstr "Otsi kaarte"
#: templates/umap/search_bar.html:14
#: templates/umap/search_bar.html:16
msgid "Search"
msgstr "Otsi"
#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26
msgid "Search my maps"
#: templates/umap/team_confirm_delete.html:6
msgid "Team deletion"
msgstr ""
#: templates/umap/user_dashboard.html:11
#: templates/umap/team_detail.html:6
#, python-format
msgid "My Maps (%(count)s)"
msgid "%(current_team)ss maps"
msgstr ""
#: templates/umap/user_dashboard.html:13
msgid "My profile"
#: templates/umap/team_detail.html:14
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr ""
#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23
#: templates/umap/team_detail.html:26
#, python-format
msgid "%(current_team)s has no public maps."
msgstr ""
#: templates/umap/team_form.html:6
msgid "Create or edit a team"
msgstr ""
#: templates/umap/team_form.html:28
msgid "Delete this team"
msgstr "Kustuta see meeskond"
#: templates/umap/team_form.html:51
msgid "Add user"
msgstr "Lisa kasutaja"
#: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
msgid "Search my maps"
msgstr "Otsi minu kaarte"
#: templates/umap/user_dashboard.html:17 templates/umap/user_dashboard.html:22
msgid "Maps title"
msgstr ""
msgstr "Kaardi pealkiri"
#: templates/umap/user_dashboard.html:32
#: templates/umap/user_dashboard.html:30
#, python-format
msgid "Download %(count)s maps"
msgstr ""
#: templates/umap/user_dashboard.html:42
#: templates/umap/user_dashboard.html:40
msgid "You have no map yet."
msgstr ""
#: views.py:346
#: templates/umap/user_teams.html:6
msgid "My Teams"
msgstr "Minu meeskonnad"
#: templates/umap/user_teams.html:21
msgid "Users"
msgstr "Kasutajad"
#: templates/umap/user_teams.html:52
msgid "New team"
msgstr "Uus meeskond"
#: views.py:235
msgid "Cannot delete a team with more than one member"
msgstr ""
#: views.py:239
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr "Meeskond “%(name)s” on kustutatud"
#: views.py:443
msgid "View the map"
msgstr "Vaata kaarti"
#: views.py:704
#: views.py:839
msgid "See full screen"
msgstr ""
msgstr "Vaata täisekraanil"
#: views.py:803
#: views.py:982
msgid "Map editors updated with success!"
msgstr "Kaardi toimetajaid uuendati edukalt!"
#: views.py:841
#: views.py:1018
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr ""
msgstr "Redigeerimislink sinu uMapi kaardile: %(map_name)s"
#: views.py:844
#: views.py:1021
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr ""
msgstr "Siin on sinu salajane redigeerimislink: %(link)s"
#: views.py:850
#: views.py:1028
#, python-format
msgid "Can't send email to %(email)s"
msgstr "Ei saa saata e-kirja aadressile %(email)s"
#: views.py:1031
#, python-format
msgid "Email sent to %(email)s"
msgstr ""
msgstr "E-kiri saadetud aadressile %(email)s"
#: views.py:861
#: views.py:1042
msgid "Only its owner can delete the map."
msgstr "Kaarti saab kustutada vaid selle omanik."
msgstr "Kaardi saab kustutada vaid selle omanik."
#: views.py:889
#: views.py:1045
msgid "Map successfully deleted."
msgstr "Kaart on kustutatud."
#: views.py:1071
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "Sinu kaart on kopeeritud! Kui sa soovid oma kaarti muuta teisest arvutist, kasuta palun seda linki: %(anonymous_url)s"
#: views.py:894
#: views.py:1076
msgid "Congratulations, your map has been cloned!"
msgstr "Sinu kaart on kopeeritud!"
#: views.py:1130
#: views.py:1330
msgid "Layer successfully deleted."
msgstr "Kiht on kustutatud."
#: views.py:1152
#: views.py:1352
msgid "Permissions updated with success!"
msgstr ""

Binary file not shown.

View file

@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Alexander Gabilondo <alexgabi@disroot.org>, 2024
# Alexander Gabilondo <alexgabi@disroot.org>, 2024-2025
# Mikel Larreategi <mlarreategi@codesyntax.com>, 2023
msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-30 18:23+0000\n"
"POT-Creation-Date: 2025-03-07 15:18+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Alexander Gabilondo <alexgabi@disroot.org>, 2024\n"
"Last-Translator: Alexander Gabilondo <alexgabi@disroot.org>, 2024-2025\n"
"Language-Team: Basque (http://app.transifex.com/openstreetmap/umap/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -19,168 +19,217 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "Bakarrik esteka sekretuarekin bakarrik editatu daiteke"
#: admin.py:16
msgid "CSV Export"
msgstr "CSV esportazioa"
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "Edonork editatu dezake"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr "Mapa hau ez dago publikoki erabilgarri"
#: forms.py:69 models.py:423
msgid "Inherit"
msgstr "Heredatu"
#: middleware.py:13
#: middleware.py:19
msgid "Site is readonly for maintenance"
msgstr "Webgunea irakurtzeko moduan dago mantentze-lanak direla-eta"
#: models.py:54 models.py:73
#: middleware.py:34
#, python-format
msgid ""
"Using “%(name)s” to authenticate is deprecated and will be removed soon. "
"Please configure another provider below before losing access to your account"
" and maps. Then, please logout and login again with the new provider."
msgstr ""
#: models.py:60 models.py:79
msgid "name"
msgstr "izena"
#: models.py:56 models.py:433
#: models.py:62 models.py:485
msgid "description"
msgstr "deskribapena"
#: models.py:104
#: models.py:110
msgid "details"
msgstr "xehetasunak"
#: models.py:105
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr "Estekatu lizentzia zehazten den orrialde batera."
#: models.py:115
#: models.py:121
msgid "URL template using OSM tile format"
msgstr "URLaren txantiloia OSMren lauzen formatua erabiliz"
#: models.py:121
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr "Lauzen geruzek edizio kutxan duten ordena"
#: models.py:167 models.py:424
#: models.py:175 models.py:479
msgid "Only editable with secret edit link"
msgstr "Bakarrik esteka sekretuarekin bakarrik editatu daiteke"
#: models.py:176 models.py:480
msgid "Everyone can edit"
msgstr "Edonork editatu dezake"
#: models.py:179 models.py:473
msgid "Everyone"
msgstr "Edonork"
#: models.py:168 models.py:174 models.py:425
#: models.py:180 models.py:189 models.py:474
msgid "Editors and team only"
msgstr ""
msgstr "Editoreak eta taldea soilik"
#: models.py:169 models.py:426
#: models.py:181 models.py:475
msgid "Owner only"
msgstr "Jabea bakarrik"
#: models.py:172
#: models.py:184
msgid "Draft (private)"
msgstr "Zirriborroa (pribatua)"
#: models.py:185
msgid "Everyone (public)"
msgstr "Edonork (publikoa)"
#: models.py:173
#: models.py:188
msgid "Anyone with link"
msgstr "Esteka duen edonork"
#: models.py:175
#: models.py:190
msgid "Blocked"
msgstr "Blokeatuta"
#: models.py:178
#: models.py:191 models.py:469
msgid "Deleted"
msgstr "Ezabatua"
#: models.py:194
msgid "center"
msgstr "erdiko puntua"
#: models.py:179
#: models.py:195
msgid "zoom"
msgstr "zooma"
#: models.py:181
#: models.py:197
msgid "locate"
msgstr "kokatu"
#: models.py:181
#: models.py:197
msgid "Locate user on load?"
msgstr "Kokatu erabiltzailea mapa kargatzen denean?"
#: models.py:185
#: models.py:201
msgid "Choose the map licence."
msgstr "Aukeratu maparen lizentzia."
#: models.py:186
#: models.py:202
msgid "licence"
msgstr "lizentzia"
#: models.py:197
#: models.py:213
msgid "owner"
msgstr "jabea"
#: models.py:201
#: models.py:217
msgid "editors"
msgstr "editoreak"
#: models.py:207
#: models.py:223
msgid "team"
msgstr ""
msgstr "taldea"
#: models.py:213 models.py:447
#: models.py:229 models.py:501
msgid "edit status"
msgstr "editatu egoera"
#: models.py:218
#: models.py:234 models.py:506
msgid "share status"
msgstr "partekatu egoera"
#: models.py:221 models.py:442
#: models.py:237 models.py:496
msgid "settings"
msgstr "ezarpenak"
#: models.py:364
#: models.py:407
msgid "Clone of"
msgstr "Beste honen klona"
#: models.py:437
#: models.py:468 models.py:472 models.py:478
msgid "Inherit"
msgstr "Heredatu"
#: models.py:491
msgid "display on load"
msgstr "erakutsi kargatzean"
#: models.py:438
#: models.py:492
msgid "Display this layer on load."
msgstr "Erakutsi geruza hau kargatzean"
#: templates/404.html:8
msgid "Take me to the home page"
msgstr "Eraman nazazu hasiera orrialdera"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr " <a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" target=\"_blank\">Ikusi hemen</a> maparen baimenak kudeatzeko dokumentazioa."
#: templates/auth/user_detail.html:8
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr "← Joan hasierara"
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr "404 Ez da orrialdea aurkitu"
#: templates/auth/user_detail.html:6
#, python-format
msgid "%(current_user)ss maps"
msgstr "%(current_user)s-ren mapak"
#: templates/auth/user_detail.html:12
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "Arakatu %(current_user)s erabiltzailearen mapak"
#: templates/auth/user_detail.html:17
#: templates/auth/user_detail.html:21
#, python-format
msgid "%(current_user)s has no maps."
msgstr "%(current_user)s erabiltzaileak ez du maparik."
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
#: templates/auth/user_form.html:6
msgid "My Profile"
msgstr "Nire profila"
#: templates/auth/user_form.html:24 templates/umap/team_form.html:25
msgid "Save"
msgstr "Gorde"
#: templates/auth/user_form.html:27
#: templates/auth/user_form.html:30
msgid "Your current providers"
msgstr "Zure egungo hornitzaileak"
#: templates/auth/user_form.html:39
#: templates/auth/user_form.html:44
msgid "Connect to another provider"
msgstr "Konektatu beste hornitzaile batekin"
#: templates/auth/user_form.html:42
#: templates/auth/user_form.html:47
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr "Ohitura ona da zure kontua hornitzaile bati baino gehiagori konektatzea, hornitzaileren bat erabilgarri ez badago, aldi baterako edo baita betiko."
#: templates/auth/user_stars.html:8
#: templates/auth/user_stars.html:6
#, python-format
msgid "%(current_user)ss starred maps"
msgstr "%(current_user)s-ren mapa izardunak"
#: templates/auth/user_stars.html:12
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr "Arakatu %(current_user)s erabiltzailearen gogoko mapak"
#: templates/auth/user_stars.html:17
#: templates/auth/user_stars.html:21
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr "%(current_user)s erabiltzaileak ez du gogoko maparik oraindik."
@ -191,25 +240,33 @@ msgid ""
"them in your site."
msgstr "uMap-ek OpenStreetMap geruzekin mapak minutu batean sortzeko eta zure webgunean txertatzeko aukera ematen dizu."
#: templates/registration/login.html:6 templates/registration/login.html:45
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "Sartu"
#: templates/registration/login.html:24
msgid "Please log in with your account"
msgstr "Sartu zure kontua erabiliz"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr "Zure mapak gordetzeko eta erraz aurkitzeko, identifikatu zaitez."
#: templates/registration/login.html:41
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr "Hasi saioa zure kontuarekin:"
#: templates/registration/login.html:42
msgid "Username"
msgstr "Erabiltzaile izena"
#: templates/registration/login.html:44
#: templates/registration/login.html:45
msgid "Password"
msgstr "Pasahitza"
#: templates/registration/login.html:51
msgid "Please choose a provider"
msgstr "Aukeratu hornitzaile bat"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr "Aukeratu hornitzaile bat:"
#: templates/umap/about.html:5 templates/umap/navigation.html:22
msgid "About"
msgstr "Honi buruz"
#: templates/umap/about_summary.html:12
#, python-format
@ -260,13 +317,13 @@ msgstr "Sortu mapa bat"
msgid "Play with the demo"
msgstr "Jolastu probatako ingurunean"
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr "Itxi"
#: templates/umap/components/alerts/alert.html:30
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
@ -274,35 +331,35 @@ msgid ""
"target=\"_blank\">log in</a>."
msgstr "Aholkua: zure mapak erraz aurkitzeko, <a href=\"%(login_url)s\" target=\"_blank\">kontu bat sortu</a> edo<a href=\"%(login_url)s\" target=\"_blank\">saioa hasi</a>."
#: templates/umap/components/alerts/alert.html:35
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr "Hona hemen mapa editatzeko zure esteka sekretua, gorde ezazu seguru:"
#: templates/umap/components/alerts/alert.html:39
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr "Kopiatu esteka"
#: templates/umap/components/alerts/alert.html:46
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr "Sartu zure helbide elektronikoa esteka sekretua jasotzeko:"
#: templates/umap/components/alerts/alert.html:52
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr "Helbide elektronikoa"
#: templates/umap/components/alerts/alert.html:55
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr "Bidalidazu esteka"
#: templates/umap/components/alerts/alert.html:79
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr "Ikusi haien aldaketak beste fitxa batean"
#: templates/umap/components/alerts/alert.html:82
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr "Mantendu zure aldaketak eta baztertu haienak"
#: templates/umap/components/alerts/alert.html:85
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr "Mantendu haien aldaketak eta baztertu zureak"
@ -323,19 +380,19 @@ msgstr "Hau probatako ingurunea da, testak egin eta argitaratu aurreko bertsioak
#: templates/umap/content_footer.html:5
msgid "An OpenStreetMap project"
msgstr ""
msgstr "OpenStreetMap proiektu bat"
#: templates/umap/content_footer.html:6
msgid "version"
msgstr ""
msgstr "bertsioa"
#: templates/umap/content_footer.html:7
msgid "Hosted by"
msgstr ""
msgstr "Ostalaria"
#: templates/umap/content_footer.html:8
msgid "Contact"
msgstr ""
msgstr "Harremanetan jarri"
#: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
msgid "Help"
@ -350,13 +407,13 @@ msgstr "Nire mapak (%(count)s)"
msgid "My Maps"
msgstr "Nire mapak"
#: templates/umap/dashboard_menu.html:11
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr "Nire profila"
#: templates/umap/dashboard_menu.html:13
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr ""
msgstr "Nire taldeak"
#: templates/umap/home.html:14
msgid "Map of the uMaps"
@ -370,15 +427,15 @@ msgstr "Inspira zaitez dauden mapak arakatzen"
msgid "You are logged in. Continuing..."
msgstr "Sartu egin zara. Jarraitu..."
#: templates/umap/map_list.html:10 views.py:433
#: templates/umap/map_list.html:11 views.py:438
msgid "by"
msgstr "nork eginda"
#: templates/umap/map_list.html:18
#: templates/umap/map_list.html:20
msgid "More"
msgstr "Gehiago"
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:18
msgid "Name"
msgstr "Izena"
@ -396,13 +453,13 @@ msgstr "Nork edita dezake"
#: templates/umap/map_table.html:20
msgid "Last save"
msgstr "Azken gordetzea"
msgstr "Gordetako azkena"
#: templates/umap/map_table.html:23
msgid "Owner"
msgstr "Jabea"
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:24
msgid "Actions"
msgstr "Ekintzak"
@ -415,7 +472,7 @@ msgid "Share"
msgstr "Partekatu"
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
#: templates/umap/user_teams.html:42 templates/umap/user_teams.html:44
msgid "Edit"
msgstr "Editatu"
@ -478,10 +535,6 @@ msgstr "Sartu"
msgid "Sign in"
msgstr "Izena eman"
#: templates/umap/navigation.html:22
msgid "About"
msgstr "Honi buruz"
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "Aldatu pasahitza"
@ -490,52 +543,58 @@ msgstr "Aldatu pasahitza"
msgid "Log out"
msgstr "Irten"
#: templates/umap/password_change.html:7
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:11
msgid "Password change"
msgstr "Pasahiz aldaketa"
#: templates/umap/password_change.html:10
#: templates/umap/password_change.html:14
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "Idatzi zure pasahitz zaharra, eta ondoren zure pasahitz berria birritan, horrela ondo sartu duzula egiaztatuko dugu."
#: templates/umap/password_change.html:17
#: templates/umap/password_change.html:21
msgid "Old password"
msgstr "Pasahitz zaharra"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password"
msgstr "Pasahitz berria"
#: templates/umap/password_change.html:26
#: templates/umap/password_change.html:30
msgid "New password confirmation"
msgstr "Pasahitz berriaren egiaztapena"
#: templates/umap/password_change.html:27
#: templates/umap/password_change.html:31
msgid "Change my password"
msgstr "Aldatu nire pasahitza"
#: templates/umap/password_change_done.html:7
#: templates/umap/password_change_done.html:6
#: templates/umap/password_change_done.html:11
msgid "Password change successful"
msgstr "Pasahitza ondo aldatu da"
#: templates/umap/password_change_done.html:10
#: templates/umap/password_change_done.html:14
msgid "Your password was changed."
msgstr "Zure pasahitza aldatu egin da"
#: templates/umap/search.html:15
#: templates/umap/search.html:6
msgid "Explore maps"
msgstr "Arakatu mapak"
#: templates/umap/search.html:19
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
msgstr[0] "mapa %(count)s aurkitu da:"
msgstr[1] "%(count)s mapa aurkitu dira:"
#: templates/umap/search.html:24
#: templates/umap/search.html:28
msgid "No map found."
msgstr "Ez da maparik aurkitu"
#: templates/umap/search.html:29
#: templates/umap/search.html:33
msgid "Latest created maps"
msgstr "Sortutako azken mapak"
@ -543,27 +602,40 @@ msgstr "Sortutako azken mapak"
msgid "Search maps"
msgstr "Bilatu mapak"
#: templates/umap/search_bar.html:15
#: templates/umap/search_bar.html:16
msgid "Search"
msgstr "Bilatu"
#: templates/umap/team_detail.html:10
#: templates/umap/team_confirm_delete.html:6
msgid "Team deletion"
msgstr "Taldea ezabatzea"
#: templates/umap/team_detail.html:6
#, python-format
msgid "%(current_team)ss maps"
msgstr "%(current_team)s-ren mapak"
#: templates/umap/team_detail.html:14
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr ""
msgstr "Arakatu %(current_team)s-ren mapak"
#: templates/umap/team_detail.html:22
#: templates/umap/team_detail.html:26
#, python-format
msgid "%(current_team)s has no public maps."
msgstr ""
msgstr "%(current_team)s-k ez dauka mapa publikorik."
#: templates/umap/team_form.html:24
#: templates/umap/team_form.html:6
msgid "Create or edit a team"
msgstr "Sortu edo editatu talde bat"
#: templates/umap/team_form.html:28
msgid "Delete this team"
msgstr ""
msgstr "Ezabatu talde hau"
#: templates/umap/team_form.html:47
#: templates/umap/team_form.html:51
msgid "Add user"
msgstr ""
msgstr "Gehitu erabiltzailea"
#: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
msgid "Search my maps"
@ -582,78 +654,82 @@ msgstr "Deskargatu %(count)s mapa"
msgid "You have no map yet."
msgstr "Oraindik ez daukazu maparik."
#: templates/umap/user_teams.html:17
msgid "Users"
msgstr ""
#: templates/umap/user_teams.html:6
msgid "My Teams"
msgstr "Nire taldeak"
#: templates/umap/user_teams.html:48
#: templates/umap/user_teams.html:21
msgid "Users"
msgstr "Erabiltzaileak"
#: templates/umap/user_teams.html:52
msgid "New team"
msgstr ""
msgstr "Talde berria"
#: views.py:235
msgid "Cannot delete a team with more than one member"
msgstr ""
msgstr "Ezin da ezabatu kide bat baino gehiago dituen talde bat"
#: views.py:239
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr ""
msgstr "“%(name)s” taldea ezabatu da"
#: views.py:438
#: views.py:443
msgid "View the map"
msgstr "Mapa ikusi"
#: views.py:824
#: views.py:839
msgid "See full screen"
msgstr "Ikusi pantaila osoan"
#: views.py:953
#: views.py:982
msgid "Map editors updated with success!"
msgstr "Maparen editoreak ondo eguneratu dira!"
#: views.py:989
#: views.py:1018
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr "Zure mapa editatzeko uMap-en esteka: %(map_name)s"
#: views.py:992
#: views.py:1021
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr "Hona hemen zure editatzeko esteka sekretua:: %(link)s"
#: views.py:999
#: views.py:1028
#, python-format
msgid "Can't send email to %(email)s"
msgstr "Ezin da posta elektronikorik bidali %(email)s-ri"
#: views.py:1002
#: views.py:1031
#, python-format
msgid "Email sent to %(email)s"
msgstr "Posta elektronikoa bidalita %(email)s-ri"
#: views.py:1013
#: views.py:1042
msgid "Only its owner can delete the map."
msgstr "Jabeak bakarrik ezabatu dezake mapa."
#: views.py:1016
#: views.py:1045
msgid "Map successfully deleted."
msgstr "Mapa behar bezala ezabatu da."
#: views.py:1042
#: views.py:1071
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "Zure mapa klonatu egin da! Mapa hau beste nabigatzaile batetik editatzeko erabili esteka hau: %(anonymous_url)s"
#: views.py:1047
#: views.py:1076
msgid "Congratulations, your map has been cloned!"
msgstr "Zorionak, zure mapa ondo klonatu da!"
#: views.py:1282
#: views.py:1330
msgid "Layer successfully deleted."
msgstr "Geruza ondo ezabatu da."
#: views.py:1304
#: views.py:1352
msgid "Permissions updated with success!"
msgstr "Baimenak behar bezala eguneratu dira!"

View file

@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-04 14:02+0000\n"
"POT-Creation-Date: 2024-12-24 08:39+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: imni <iriman@chmail.ir>, 2024\n"
"Language-Team: Persian (Iran) (http://app.transifex.com/openstreetmap/umap/language/fa_IR/)\n"
@ -22,133 +22,160 @@ msgstr ""
"Language: fa_IR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "فقط با پیوند محرمانهٔ ویرایش، ویرایش می‌شود"
#: admin.py:16
msgid "CSV Export"
msgstr ""
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "همه می‌توانند ویرایش کنند"
#: forms.py:69 models.py:423
msgid "Inherit"
msgstr "ارث‌بردن"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr ""
#: middleware.py:13
msgid "Site is readonly for maintenance"
msgstr "سایت برای امور نگهداری در حالت فقط‌خواندنی قرار دارد"
#: models.py:54 models.py:73
#: models.py:60 models.py:79
msgid "name"
msgstr "نام"
#: models.py:56 models.py:433
#: models.py:62 models.py:475
msgid "description"
msgstr "توضیحات"
#: models.py:104
#: models.py:110
msgid "details"
msgstr "جزئیات"
#: models.py:105
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr "پیوند به صفحه‌ای که شرح مجوز در آن آمده است."
#: models.py:115
#: models.py:121
msgid "URL template using OSM tile format"
msgstr "الگوی نشانی اینترنتی با توجه به قالب کاشی OSM"
#: models.py:121
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr "ترتیب لایه‌های کاشی در جعبهٔ ویرایش"
#: models.py:167 models.py:424
#: models.py:175 models.py:469
msgid "Only editable with secret edit link"
msgstr "فقط با پیوند محرمانهٔ ویرایش، ویرایش می‌شود"
#: models.py:176 models.py:470
msgid "Everyone can edit"
msgstr "همه می‌توانند ویرایش کنند"
#: models.py:179 models.py:463
msgid "Everyone"
msgstr "همه"
#: models.py:168 models.py:174 models.py:425
#: models.py:180 models.py:189 models.py:464
msgid "Editors and team only"
msgstr ""
#: models.py:169 models.py:426
#: models.py:181 models.py:465
msgid "Owner only"
msgstr "فقط مالک"
#: models.py:172
#: models.py:184
msgid "Draft (private)"
msgstr ""
#: models.py:185
msgid "Everyone (public)"
msgstr "همه (عمومی)"
#: models.py:173
#: models.py:188
msgid "Anyone with link"
msgstr "هر کسی با پیوند"
#: models.py:175
#: models.py:190
msgid "Blocked"
msgstr ""
#: models.py:178
#: models.py:191
msgid "Deleted"
msgstr ""
#: models.py:194
msgid "center"
msgstr "مرکز"
#: models.py:179
#: models.py:195
msgid "zoom"
msgstr "زوم"
#: models.py:181
#: models.py:197
msgid "locate"
msgstr "مکان‌یابی"
#: models.py:181
#: models.py:197
msgid "Locate user on load?"
msgstr "کاربر هنگام بارشدن مکان‌یابی شود؟"
#: models.py:185
#: models.py:201
msgid "Choose the map licence."
msgstr "مجوز نقشه را انتخاب کنید."
#: models.py:186
#: models.py:202
msgid "licence"
msgstr "مجوز"
#: models.py:197
#: models.py:213
msgid "owner"
msgstr "مالک"
#: models.py:201
#: models.py:217
msgid "editors"
msgstr "ویرایشگران"
#: models.py:207
#: models.py:223
msgid "team"
msgstr ""
#: models.py:213 models.py:447
#: models.py:229 models.py:491
msgid "edit status"
msgstr "ویرایش وضعیت"
#: models.py:218
#: models.py:234
msgid "share status"
msgstr "وضعیت همرسانی"
#: models.py:221 models.py:442
#: models.py:237 models.py:486
msgid "settings"
msgstr "تنظیمات"
#: models.py:364
#: models.py:402
msgid "Clone of"
msgstr "همانندسازی‌شده از"
#: models.py:437
#: models.py:462 models.py:468
msgid "Inherit"
msgstr "ارث‌بردن"
#: models.py:481
msgid "display on load"
msgstr "نمایش هنگام بارشدن"
#: models.py:438
#: models.py:482
msgid "Display this layer on load."
msgstr "این لایه هنگام بارشدن نمایش داده شود."
#: templates/404.html:8
msgid "Take me to the home page"
msgstr "مرا به صفحه اصلی ببر"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr ""
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr ""
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr ""
#: templates/auth/user_detail.html:8
#, python-format
@ -194,25 +221,29 @@ msgid ""
"them in your site."
msgstr "در uMap می‌توانید با لایه‌های اوپن‌استریت‌مپ خیلی سریع یک نقشه بسازید و در وبسایت خود جاسازی کنید."
#: templates/registration/login.html:6 templates/registration/login.html:45
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "ورود"
#: templates/registration/login.html:24
msgid "Please log in with your account"
msgstr "لطفاً با حساب خود وارد شوید"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr ""
#: templates/registration/login.html:41
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr ""
#: templates/registration/login.html:42
msgid "Username"
msgstr "نام کاربری"
#: templates/registration/login.html:44
#: templates/registration/login.html:45
msgid "Password"
msgstr "گذرواژه"
#: templates/registration/login.html:51
msgid "Please choose a provider"
msgstr "لطفاً یک خدمات‌دهنده را انتخاب کنید"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr ""
#: templates/umap/about_summary.html:12
#, python-format
@ -263,13 +294,13 @@ msgstr "ساخت نقشه"
msgid "Play with the demo"
msgstr "با نسخهٔ نمایشی کار کنید"
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr "بستن"
#: templates/umap/components/alerts/alert.html:30
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
@ -277,35 +308,35 @@ msgid ""
"target=\"_blank\">log in</a>."
msgstr "نکتهٔ طلایی: برای اینکه نقشه‌های خود را به آسانی پیدا کنید، <a href=\"%(login_url)s\" target=\"_blank\">حساب کاربری بسازید</a> یا <a href=\"%(login_url)s\" target=\"_blank\">وارد شوید</a>."
#: templates/umap/components/alerts/alert.html:35
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr "این پیوند محرمانهٔ شما برای ویرایش نقشه است. لطفاً در جای امنی نگهش دارید:"
#: templates/umap/components/alerts/alert.html:39
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr "کپی پیوند"
#: templates/umap/components/alerts/alert.html:46
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr "رایانامهٔ خود را وارد کنید تا پیوند محرمانه را دریافت کنید:"
#: templates/umap/components/alerts/alert.html:52
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr "رایانامه"
#: templates/umap/components/alerts/alert.html:55
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr "پیوند را برایم بفرست"
#: templates/umap/components/alerts/alert.html:79
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr "ویرایش‌هایشان را در زبانهٔ دیگری ببینید"
#: templates/umap/components/alerts/alert.html:82
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr "تغییرات خود را نگه دارید و از آن‌ها را رها کنید"
#: templates/umap/components/alerts/alert.html:85
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr "تغییرات آن‌ها را نگه دارید و از خودتان را رها کنید"
@ -353,11 +384,11 @@ msgstr "نقشه‌های من (%(count)s)"
msgid "My Maps"
msgstr "نقشه‌های من"
#: templates/umap/dashboard_menu.html:11
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr "نمایهٔ من"
#: templates/umap/dashboard_menu.html:13
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr ""
@ -373,7 +404,7 @@ msgstr "الهام بگیرید، نقشه‌ها را مرور کنید"
msgid "You are logged in. Continuing..."
msgstr "شما وارد شده‌اید. ادامه..."
#: templates/umap/map_list.html:11 views.py:433
#: templates/umap/map_list.html:11 views.py:437
msgid "by"
msgstr "ساختهٔ"
@ -593,70 +624,70 @@ msgstr ""
msgid "New team"
msgstr ""
#: views.py:235
#: views.py:234
msgid "Cannot delete a team with more than one member"
msgstr ""
#: views.py:239
#: views.py:238
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr ""
#: views.py:438
#: views.py:442
msgid "View the map"
msgstr "مشاهدهٔ نقشه"
#: views.py:824
#: views.py:825
msgid "See full screen"
msgstr "تمام‌صفحه ببینید"
#: views.py:953
#: views.py:968
msgid "Map editors updated with success!"
msgstr "ویرایشگران نقشه با موفقیت روزآمد شد!"
#: views.py:989
#: views.py:1004
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr "پیوند ویرایش uMap برای نقشهٔ شما: %(map_name)s"
#: views.py:992
#: views.py:1007
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr "این پیوند محرمانهٔ ویرایش برای شماست: %(link)s"
#: views.py:999
#: views.py:1014
#, python-format
msgid "Can't send email to %(email)s"
msgstr "رایانامه به %(email)s فرستاده نشد"
#: views.py:1002
#: views.py:1017
#, python-format
msgid "Email sent to %(email)s"
msgstr "رایانامه به %(email)s فرستاده شد"
#: views.py:1013
#: views.py:1028
msgid "Only its owner can delete the map."
msgstr "فقط مالک آن می‌تواند نقشه را حذف کند."
#: views.py:1016
#: views.py:1031
msgid "Map successfully deleted."
msgstr "نقشه با موفقیت حذف شد."
#: views.py:1042
#: views.py:1057
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "از نقشهٔ شما همانندسازی شد! اگر می‌خواهید این نقشه را از رایانهٔ دیگری ویرایش کنید، لطفاً از این پیوند استفاده کنید: %(anonymous_url)s"
#: views.py:1047
#: views.py:1062
msgid "Congratulations, your map has been cloned!"
msgstr "تبریک، نقشهٔ شما همانندسازی شد!"
#: views.py:1282
#: views.py:1313
msgid "Layer successfully deleted."
msgstr "لایه با موفقیت حذف شد."
#: views.py:1304
#: views.py:1335
msgid "Permissions updated with success!"
msgstr "مجوزها با موفقیت روزآمد شد!"

Binary file not shown.

View file

@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-15 13:53+0000\n"
"POT-Creation-Date: 2024-12-11 17:05+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Jaakko Helleranta <jaakko@helleranta.com>, 2013\n"
"Language-Team: Finnish (http://app.transifex.com/openstreetmap/umap/language/fi/)\n"
@ -22,258 +22,316 @@ msgstr ""
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "Muokattavissa vain salaisella muokkauslinkillä"
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "Kuka tahansa saa muokata"
#: forms.py:69 models.py:371
msgid "Inherit"
#: admin.py:16
msgid "CSV Export"
msgstr ""
#: middleware.py:13
msgid "Site is readonly for maintenance"
msgstr ""
#: models.py:50
#: models.py:60 models.py:79
msgid "name"
msgstr "nimi"
#: models.py:81
msgid "details"
msgstr "tarkemmat tiedot"
#: models.py:82
msgid "Link to a page where the licence is detailed."
msgstr "Linkki sivulle, jossa lisenssi on määritetty yksityiskohtaisesti."
#: models.py:92
msgid "URL template using OSM tile format"
msgstr "OSM-karttatiiliformaattia mukaileva URL-sapluuna"
#: models.py:98
msgid "Order of the tilelayers in the edit box"
msgstr "Taustakarttojen järjestys muokkauslaatikossa"
#: models.py:144 models.py:372
msgid "Everyone"
msgstr ""
#: models.py:145 models.py:151 models.py:373
msgid "Editors only"
msgstr ""
#: models.py:146 models.py:374
msgid "Owner only"
msgstr ""
#: models.py:149
msgid "Everyone (public)"
msgstr ""
#: models.py:150
msgid "Anyone with link"
msgstr ""
#: models.py:152
msgid "Blocked"
msgstr ""
#: models.py:155 models.py:378
#: models.py:62 models.py:475
msgid "description"
msgstr "kuvaus"
#: models.py:156
#: models.py:110
msgid "details"
msgstr "tarkemmat tiedot"
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr "Linkki sivulle, jossa lisenssi on määritetty yksityiskohtaisesti."
#: models.py:121
msgid "URL template using OSM tile format"
msgstr "OSM-karttatiiliformaattia mukaileva URL-sapluuna"
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr "Taustakarttojen järjestys muokkauslaatikossa"
#: models.py:175 models.py:469
msgid "Only editable with secret edit link"
msgstr "Muokattavissa vain salaisella muokkauslinkillä"
#: models.py:176 models.py:470
msgid "Everyone can edit"
msgstr "Kuka tahansa saa muokata"
#: models.py:179 models.py:463
msgid "Everyone"
msgstr ""
#: models.py:180 models.py:189 models.py:464
msgid "Editors and team only"
msgstr ""
#: models.py:181 models.py:465
msgid "Owner only"
msgstr ""
#: models.py:184
msgid "Draft (private)"
msgstr ""
#: models.py:185
msgid "Everyone (public)"
msgstr ""
#: models.py:188
msgid "Anyone with link"
msgstr ""
#: models.py:190
msgid "Blocked"
msgstr ""
#: models.py:191
msgid "Deleted"
msgstr ""
#: models.py:194
msgid "center"
msgstr "keskitä"
#: models.py:157
#: models.py:195
msgid "zoom"
msgstr "zoomaa"
#: models.py:159
#: models.py:197
msgid "locate"
msgstr "paikanna"
#: models.py:159
#: models.py:197
msgid "Locate user on load?"
msgstr "Paikanna käyttäjä sivua ladattaessa?"
#: models.py:163
#: models.py:201
msgid "Choose the map licence."
msgstr "Valitse kartan lisenssi"
#: models.py:164
#: models.py:202
msgid "licence"
msgstr "lisenssi"
#: models.py:175
#: models.py:213
msgid "owner"
msgstr "omistaja"
#: models.py:179
#: models.py:217
msgid "editors"
msgstr "julkaisija"
#: models.py:184 models.py:392
#: models.py:223
msgid "team"
msgstr ""
#: models.py:229 models.py:491
msgid "edit status"
msgstr "muokkaa tilaa"
#: models.py:189
#: models.py:234
msgid "share status"
msgstr "jaa status"
#: models.py:192 models.py:387
#: models.py:237 models.py:486
msgid "settings"
msgstr "asetukset"
#: models.py:320
#: models.py:402
msgid "Clone of"
msgstr "Kloonattu kartasta"
#: models.py:382
#: models.py:462 models.py:468
msgid "Inherit"
msgstr ""
#: models.py:481
msgid "display on load"
msgstr "näytä ladattaessa"
#: models.py:383
#: models.py:482
msgid "Display this layer on load."
msgstr "Näytä tämä kerros ladattaessa."
#: templates/404.html:6
#: templates/404.html:8
msgid "Take me to the home page"
msgstr ""
#: templates/auth/user_detail.html:5
#: templates/auth/user_detail.html:8
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "Selaa %(current_user)s:n karttoja"
#: templates/auth/user_detail.html:12
#: templates/auth/user_detail.html:17
#, python-format
msgid "%(current_user)s has no maps."
msgstr ""
#: templates/auth/user_form.html:6
msgid "My Maps"
msgstr ""
#: templates/auth/user_form.html:7
msgid "My Profile"
msgstr ""
#: templates/auth/user_form.html:20
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
msgid "Save"
msgstr ""
#: templates/auth/user_form.html:25
#: templates/auth/user_form.html:27
msgid "Your current providers"
msgstr ""
#: templates/auth/user_form.html:31
#: templates/auth/user_form.html:39
msgid "Connect to another provider"
msgstr ""
#: templates/auth/user_form.html:33
#: templates/auth/user_form.html:42
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr ""
#: templates/auth/user_stars.html:5
#: templates/auth/user_stars.html:8
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr ""
#: templates/auth/user_stars.html:12
#: templates/auth/user_stars.html:17
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr ""
#: templates/base.html:12
#: templates/base.html:13
msgid ""
"uMap lets you create maps with OpenStreetMap layers in a minute and embed "
"them in your site."
msgstr ""
#: templates/registration/login.html:16
msgid "Please log in with your account"
msgstr ""
#: templates/registration/login.html:28
msgid "Username"
msgstr ""
#: templates/registration/login.html:31
msgid "Password"
msgstr ""
#: templates/registration/login.html:32
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr ""
#: templates/registration/login.html:37
msgid "Please choose a provider"
msgstr "Valitse mieleisesi palveluntarjoaja"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr ""
#: templates/umap/about_summary.html:11
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr ""
#: templates/registration/login.html:42
msgid "Username"
msgstr ""
#: templates/registration/login.html:45
msgid "Password"
msgstr ""
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr ""
#: templates/umap/about_summary.html:12
#, python-format
msgid ""
"uMap lets you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
"layers in a minute and embed them in your site."
msgstr ""
#: templates/umap/about_summary.html:21
#: templates/umap/about_summary.html:23
msgid "Choose the layers of your map"
msgstr "Valitse karttaasi sopivat taustakartat ja data-kerrokset"
#: templates/umap/about_summary.html:22
#: templates/umap/about_summary.html:26
msgid "Add POIs: markers, lines, polygons..."
msgstr "Lisää tarvittavat POIt: karttamerkkejä, viivoja, monikulmioita..."
#: templates/umap/about_summary.html:23
#: templates/umap/about_summary.html:29
msgid "Manage POIs colours and icons"
msgstr "Valitse ja hallinnoi POI-merkintöjen värit ja karttakuvakkeet"
#: templates/umap/about_summary.html:24
#: templates/umap/about_summary.html:32
msgid "Manage map options: display a minimap, locate user on load…"
msgstr "Hallitse kartta-optiot: näytä mini-kartta, paikanna käyttäjä sivun latauksessa, ..."
#: templates/umap/about_summary.html:25
#: templates/umap/about_summary.html:35
msgid "Batch import geostructured data (geojson, gpx, kml, osm...)"
msgstr "Geostrukturoidun datan (geojson, gpx, kml, osm...) tuonti eräajona "
#: templates/umap/about_summary.html:26
#: templates/umap/about_summary.html:38
msgid "Choose the license for your data"
msgstr "Valitse tiedoillesi lisenssi"
#: templates/umap/about_summary.html:27
#: templates/umap/about_summary.html:41
msgid "Embed and share your map"
msgstr "Jaa karttasi muille ja/tai liitä se muihin sivustoihin"
#: templates/umap/about_summary.html:37
#: templates/umap/about_summary.html:52
#, python-format
msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "<a href=\"%(repo_url)s\">Avoin lähdekoodi</a> rulettaa!"
#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38
#: templates/umap/user_dashboard.html:42
#: templates/umap/about_summary.html:63 templates/umap/navigation.html:39
#: templates/umap/user_dashboard.html:40
msgid "Create a map"
msgstr "Luo uusi kartta"
#: templates/umap/about_summary.html:51
#: templates/umap/about_summary.html:66
msgid "Play with the demo"
msgstr "Tongi demoa sielusi kyllyydestä!"
#: templates/umap/content.html:22
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
msgid "Close"
msgstr ""
#: templates/umap/components/alerts/alert.html:30
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
"target=\"_blank\">create an account</a> or <a href=\"%(login_url)s\" "
"target=\"_blank\">log in</a>."
msgstr ""
#: templates/umap/components/alerts/alert.html:35
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr ""
#: templates/umap/components/alerts/alert.html:39
msgid "Copy link"
msgstr ""
#: templates/umap/components/alerts/alert.html:46
msgid "Enter your email address to receive the secret link:"
msgstr ""
#: templates/umap/components/alerts/alert.html:52
msgid "Email"
msgstr ""
#: templates/umap/components/alerts/alert.html:55
msgid "Send me the link"
msgstr ""
#: templates/umap/components/alerts/alert.html:79
msgid "See their edits in another tab"
msgstr ""
#: templates/umap/components/alerts/alert.html:82
msgid "Keep your changes and loose theirs"
msgstr ""
#: templates/umap/components/alerts/alert.html:85
msgid "Keep their changes and loose yours"
msgstr ""
#: templates/umap/content.html:26
msgid ""
"This instance of uMap is currently in read only mode, no creation/edit is "
"allowed."
msgstr ""
#: templates/umap/content.html:30
#: templates/umap/content.html:34
#, python-format
msgid ""
"This is a demo instance, used for tests and pre-rolling releases. If you "
@ -282,270 +340,339 @@ msgid ""
"instance, it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "Tämä on uMapin demo-instanssi, jota käytetään testaamiseen ja väliversioille. Jos tarvitset vakaan version, niin käytäthän <a href=\"%(stable_url)s\">%(stable_url)s</a> :a. Voit myös tarjota oman instanssin - <a href=\"%(repo_url)s\">avoin lähdekoodi</a> rulettaa!"
#: templates/umap/home.html:8
#: templates/umap/content_footer.html:5
msgid "An OpenStreetMap project"
msgstr ""
#: templates/umap/content_footer.html:6
msgid "version"
msgstr ""
#: templates/umap/content_footer.html:7
msgid "Hosted by"
msgstr ""
#: templates/umap/content_footer.html:8
msgid "Contact"
msgstr ""
#: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
msgid "Help"
msgstr ""
#: templates/umap/dashboard_menu.html:6
#, python-format
msgid "My Maps (%(count)s)"
msgstr ""
#: templates/umap/dashboard_menu.html:8
msgid "My Maps"
msgstr ""
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr ""
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr ""
#: templates/umap/home.html:14
msgid "Map of the uMaps"
msgstr "Kartta uMapeista"
#: templates/umap/home.html:14
#: templates/umap/home.html:24
msgid "Get inspired, browse maps"
msgstr "Inspiroidu selaamalla karttoja"
#: templates/umap/login_popup_end.html:2
#: templates/umap/login_popup_end.html:4
msgid "You are logged in. Continuing..."
msgstr "Sisäänkirjautumisesi onnistui. Jatketahan..."
#: templates/umap/map_list.html:9 views.py:341
#: templates/umap/map_list.html:11 views.py:433
msgid "by"
msgstr "taholta"
#: templates/umap/map_list.html:17
#: templates/umap/map_list.html:20
msgid "More"
msgstr "Lisää"
#: templates/umap/map_table.html:6
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
msgid "Name"
msgstr ""
#: templates/umap/map_table.html:7
#: templates/umap/map_table.html:11
msgid "Preview"
msgstr ""
#: templates/umap/map_table.html:8
#: templates/umap/map_table.html:14
msgid "Who can see"
msgstr ""
#: templates/umap/map_table.html:9
#: templates/umap/map_table.html:17
msgid "Who can edit"
msgstr ""
#: templates/umap/map_table.html:10
#: templates/umap/map_table.html:20
msgid "Last save"
msgstr ""
#: templates/umap/map_table.html:11
#: templates/umap/map_table.html:23
msgid "Owner"
msgstr ""
#: templates/umap/map_table.html:12
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
msgid "Actions"
msgstr ""
#: templates/umap/map_table.html:25 templates/umap/map_table.html:27
#: templates/umap/map_table.html:41 templates/umap/map_table.html:43
msgid "Open preview"
msgstr ""
#: templates/umap/map_table.html:46 templates/umap/map_table.html:48
#: templates/umap/map_table.html:72 templates/umap/map_table.html:74
msgid "Share"
msgstr ""
#: templates/umap/map_table.html:51 templates/umap/map_table.html:53
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
msgid "Edit"
msgstr ""
#: templates/umap/map_table.html:56 templates/umap/map_table.html:58
#: templates/umap/map_table.html:84 templates/umap/map_table.html:86
msgid "Download"
msgstr ""
#: templates/umap/map_table.html:63 templates/umap/map_table.html:65
#: templates/umap/map_table.html:90 templates/umap/map_table.html:92
msgid "Clone"
msgstr ""
#: templates/umap/map_table.html:73 templates/umap/map_table.html:75
#: templates/umap/map_table.html:101 templates/umap/map_table.html:103
msgid "Delete"
msgstr ""
#: templates/umap/map_table.html:88
#: templates/umap/map_table.html:117
msgid "first"
msgstr ""
#: templates/umap/map_table.html:89
#: templates/umap/map_table.html:118
msgid "previous"
msgstr ""
#: templates/umap/map_table.html:98
#: templates/umap/map_table.html:126
#, python-format
msgid "Page %(maps_number)s of %(num_pages)s"
msgstr ""
#: templates/umap/map_table.html:104
#: templates/umap/map_table.html:131
msgid "next"
msgstr ""
#: templates/umap/map_table.html:105
#: templates/umap/map_table.html:132
msgid "last"
msgstr ""
#: templates/umap/map_table.html:113
#: templates/umap/map_table.html:140
#, python-format
msgid "Lines per page: %(per_page)s"
msgstr ""
#: templates/umap/map_table.html:118
#: templates/umap/map_table.html:145
#, python-format
msgid "%(count)s maps"
msgstr ""
#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4
#: templates/umap/navigation.html:11 templates/umap/user_dashboard.html:6
msgid "My Dashboard"
msgstr ""
#: templates/umap/navigation.html:13
#: templates/umap/navigation.html:14
msgid "Starred maps"
msgstr ""
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Log in"
msgstr "Kirjaudu palveluun"
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Sign in"
msgstr "Kirjaudu palveluun"
#: templates/umap/navigation.html:21
#: templates/umap/navigation.html:22
msgid "About"
msgstr "Tietoja"
#: templates/umap/navigation.html:24
msgid "Help"
msgstr ""
#: templates/umap/navigation.html:29
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr ""
#: templates/umap/navigation.html:33
#: templates/umap/navigation.html:34
msgid "Log out"
msgstr "Kirjaudu ulos palvelusta"
#: templates/umap/password_change.html:4
#: templates/umap/password_change.html:7
msgid "Password change"
msgstr ""
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:10
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr ""
#: templates/umap/password_change.html:13
#: templates/umap/password_change.html:17
msgid "Old password"
msgstr ""
#: templates/umap/password_change.html:18
#: templates/umap/password_change.html:22
msgid "New password"
msgstr ""
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password confirmation"
msgstr ""
#: templates/umap/password_change.html:23
#: templates/umap/password_change.html:27
msgid "Change my password"
msgstr ""
#: templates/umap/password_change_done.html:4
#: templates/umap/password_change_done.html:7
msgid "Password change successful"
msgstr ""
#: templates/umap/password_change_done.html:5
#: templates/umap/password_change_done.html:10
msgid "Your password was changed."
msgstr ""
#: templates/umap/search.html:10
#: templates/umap/search.html:15
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
msgstr[0] ""
msgstr[1] ""
#: templates/umap/search.html:18
#: templates/umap/search.html:24
msgid "No map found."
msgstr ""
#: templates/umap/search.html:21
#: templates/umap/search.html:29
msgid "Latest created maps"
msgstr ""
#: templates/umap/search_bar.html:3
#: templates/umap/search_bar.html:4
msgid "Search maps"
msgstr "Etsi karttoja"
#: templates/umap/search_bar.html:14
#: templates/umap/search_bar.html:15
msgid "Search"
msgstr "Etsi"
#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26
#: templates/umap/team_detail.html:10
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr ""
#: templates/umap/team_detail.html:22
#, python-format
msgid "%(current_team)s has no public maps."
msgstr ""
#: templates/umap/team_form.html:24
msgid "Delete this team"
msgstr ""
#: templates/umap/team_form.html:47
msgid "Add user"
msgstr ""
#: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
msgid "Search my maps"
msgstr ""
#: templates/umap/user_dashboard.html:11
#, python-format
msgid "My Maps (%(count)s)"
msgstr ""
#: templates/umap/user_dashboard.html:13
msgid "My profile"
msgstr ""
#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23
#: templates/umap/user_dashboard.html:17 templates/umap/user_dashboard.html:22
msgid "Maps title"
msgstr ""
#: templates/umap/user_dashboard.html:32
#: templates/umap/user_dashboard.html:30
#, python-format
msgid "Download %(count)s maps"
msgstr ""
#: templates/umap/user_dashboard.html:42
#: templates/umap/user_dashboard.html:40
msgid "You have no map yet."
msgstr ""
#: views.py:346
#: templates/umap/user_teams.html:17
msgid "Users"
msgstr ""
#: templates/umap/user_teams.html:48
msgid "New team"
msgstr ""
#: views.py:234
msgid "Cannot delete a team with more than one member"
msgstr ""
#: views.py:238
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr ""
#: views.py:438
msgid "View the map"
msgstr "Katso karttaa"
#: views.py:704
#: views.py:820
msgid "See full screen"
msgstr ""
#: views.py:803
#: views.py:963
msgid "Map editors updated with success!"
msgstr "Kartan toimittajat päivitetty onnistuneesti!"
#: views.py:841
#: views.py:999
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr ""
#: views.py:844
#: views.py:1002
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr ""
#: views.py:850
#: views.py:1009
#, python-format
msgid "Can't send email to %(email)s"
msgstr ""
#: views.py:1012
#, python-format
msgid "Email sent to %(email)s"
msgstr ""
#: views.py:861
#: views.py:1023
msgid "Only its owner can delete the map."
msgstr "Vain kartan omistaja voi poistaa kartan."
#: views.py:889
#: views.py:1026
msgid "Map successfully deleted."
msgstr ""
#: views.py:1052
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "Karttasi on kloonattu! Jos haluat muokata tätä karttaa joltain muulta tietokoneelta, käytä tätä linkkiä: %(anonymous_url)s"
#: views.py:894
#: views.py:1057
msgid "Congratulations, your map has been cloned!"
msgstr "Onneksi olkoon! Karttasi on kloonattu!"
#: views.py:1130
#: views.py:1308
msgid "Layer successfully deleted."
msgstr "Kerros onnistuneesti poistettu. Pysyvästi."
#: views.py:1152
#: views.py:1330
msgid "Permissions updated with success!"
msgstr ""

Binary file not shown.

View file

@ -17,16 +17,16 @@
# spf, 2019
# Syl Martin, 2023
# Philippe Verdy, 2017
# yohanboniface <yohanboniface@free.fr>, 2013-2014,2018-2019,2023-2024
# yohanboniface <yohanboniface@free.fr>, 2013-2014,2018-2019,2023-2025
# YOHAN BONIFACE <yb@enix.org>, 2012
# yohanboniface <yohanboniface@free.fr>, 2014,2016
msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-04 16:35+0000\n"
"POT-Creation-Date: 2025-04-11 15:30+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: yohanboniface <yohanboniface@free.fr>, 2013-2014,2018-2019,2023-2024\n"
"Last-Translator: yohanboniface <yohanboniface@free.fr>, 2013-2014,2018-2019,2023-2025\n"
"Language-Team: French (http://app.transifex.com/openstreetmap/umap/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -38,168 +38,281 @@ msgstr ""
msgid "CSV Export"
msgstr "Export CSV"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "Modifiable seulement avec le lien de modification secret"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr "Cette carte n'est pas publique"
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "Tout le monde peut modifier"
#: forms.py:69 models.py:441
msgid "Inherit"
msgstr "Par défaut"
#: middleware.py:13
#: middleware.py:19
msgid "Site is readonly for maintenance"
msgstr "Le site est en lecture seule pour maintenance."
#: models.py:55 models.py:74
#: middleware.py:34
#, python-format
msgid ""
"Using “%(name)s” to authenticate is deprecated and will be removed soon. "
"Please configure another provider below before losing access to your account"
" and maps. Then, please logout and login again with the new provider."
msgstr "Lutilisation de “%(name)s” pour sauthentifier est dépréciée et sera bientôt rendue impossible. Veuillez configurer un nouveau fournisseur ci-dessous avant de perdre laccès à votre compte et à vos cartes. Puis veuillez vous déconnecter et reconnecter avec le nouveau fournisseur."
#: models.py:61 models.py:80
msgid "name"
msgstr "nom"
#: models.py:57 models.py:451
#: models.py:63 models.py:493
msgid "description"
msgstr "description"
#: models.py:105
#: models.py:111
msgid "details"
msgstr "détails"
#: models.py:106
#: models.py:112
msgid "Link to a page where the licence is detailed."
msgstr "Lien vers une page détaillant la licence."
#: models.py:116
#: models.py:122
msgid "URL template using OSM tile format"
msgstr "Modèle d'URL au format des tuiles OSM"
#: models.py:122
#: models.py:128
msgid "Order of the tilelayers in the edit box"
msgstr "Ordre des calques de tuiles dans le panneau de modification"
#: models.py:168 models.py:442
#: models.py:176 models.py:487
msgid "Only editable with secret edit link"
msgstr "Modifiable seulement avec le lien de modification secret"
#: models.py:177 models.py:488
msgid "Everyone can edit"
msgstr "Tout le monde peut modifier"
#: models.py:180 models.py:481
msgid "Everyone"
msgstr "Tout le monde"
#: models.py:169 models.py:175 models.py:443
#: models.py:181 models.py:190 models.py:482
msgid "Editors and team only"
msgstr "Éditeurs et équipe seulement"
#: models.py:170 models.py:444
#: models.py:182 models.py:483
msgid "Owner only"
msgstr "Propriétaire uniquement"
#: models.py:173
#: models.py:185
msgid "Draft (private)"
msgstr "Brouillon (privé)"
#: models.py:186
msgid "Everyone (public)"
msgstr "Tout le monde (public)"
#: models.py:174
#: models.py:189
msgid "Anyone with link"
msgstr "Quiconque a le lien"
#: models.py:176
#: models.py:191
msgid "Blocked"
msgstr "Bloquée"
#: models.py:179
#: models.py:192 models.py:477
msgid "Deleted"
msgstr "Supprimé"
#: models.py:195
msgid "center"
msgstr "centre"
#: models.py:180
#: models.py:196
msgid "zoom"
msgstr "zoom"
#: models.py:182
#: models.py:198
msgid "locate"
msgstr "géolocaliser"
#: models.py:182
#: models.py:198
msgid "Locate user on load?"
msgstr "Géolocaliser l'utilisateur au chargement ?"
#: models.py:186
#: models.py:202
msgid "Choose the map licence."
msgstr "Choisir une licence pour la carte"
#: models.py:187
#: models.py:203
msgid "licence"
msgstr "licence"
#: models.py:198
#: models.py:214
msgid "owner"
msgstr "créateur"
#: models.py:202
#: models.py:218
msgid "editors"
msgstr "éditeurs"
#: models.py:208
#: models.py:224
msgid "team"
msgstr "équipe"
#: models.py:214 models.py:465
#: models.py:230 models.py:509
msgid "edit status"
msgstr "statut de modification"
#: models.py:219
#: models.py:235 models.py:514
msgid "share status"
msgstr "qui a accès"
#: models.py:222 models.py:460
#: models.py:238 models.py:504
msgid "settings"
msgstr "réglages"
#: models.py:382
#: models.py:410
msgid "Clone of"
msgstr "Clone de"
#: models.py:455
#: models.py:476 models.py:480 models.py:486
msgid "Inherit"
msgstr "Par défaut"
#: models.py:499
msgid "display on load"
msgstr "afficher au chargement."
#: models.py:456
#: models.py:500
msgid "Display this layer on load."
msgstr "Afficher ce calque au chargement."
#: templates/404.html:8
msgid "Take me to the home page"
msgstr "Retour à la page d'accueil"
#: settings/base.py:295
msgid "Art and Culture"
msgstr "Art et culture"
#: templates/auth/user_detail.html:8
#: settings/base.py:296
msgid "Cycling"
msgstr "Vélo"
#: settings/base.py:297
msgid "Business"
msgstr "Économie"
#: settings/base.py:298
msgid "Environment"
msgstr "Environnement"
#: settings/base.py:299
msgid "Education"
msgstr "Éducation"
#: settings/base.py:300
msgid "Food and Agriculture"
msgstr "Nourriture et agriculture"
#: settings/base.py:301
msgid "Geopolitics"
msgstr "Géopolitique"
#: settings/base.py:302
msgid "Health"
msgstr "Santé"
#: settings/base.py:303
msgid "Hiking"
msgstr "Rando"
#: settings/base.py:304
msgid "History"
msgstr "Histoire"
#: settings/base.py:305
msgid "Public sector"
msgstr "Secteur public"
#: settings/base.py:306
msgid "Science"
msgstr "Science"
#: settings/base.py:307
msgid "Shopping"
msgstr "Commerces"
#: settings/base.py:308
msgid "Sport and Leisure"
msgstr "Sport et loisirs"
#: settings/base.py:309
msgid "Travel"
msgstr "Voyage"
#: settings/base.py:310
msgid "Transports"
msgstr "Transports"
#: settings/base.py:311
msgid "Tourism"
msgstr "Tourisme"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr "Vous pouvez <a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" target=\"_blank\">consulter la documentation</a> sur la gestion des permissions de la carte."
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr "← Retour à la page d'accueil"
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr "404 Page Non Trouvée"
#: templates/auth/user_detail.html:6
#, python-format
msgid "%(current_user)ss maps"
msgstr "Cartes de %(current_user)s"
#: templates/auth/user_detail.html:12
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "Consulter les cartes de %(current_user)s"
#: templates/auth/user_detail.html:17
#: templates/auth/user_detail.html:21
#, python-format
msgid "%(current_user)s has no maps."
msgstr "%(current_user)s n'a aucune carte."
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
#: templates/auth/user_form.html:6
msgid "My Profile"
msgstr "Mon profil"
#: templates/auth/user_form.html:24 templates/umap/team_form.html:25
msgid "Save"
msgstr "Enregistrer"
#: templates/auth/user_form.html:27
#: templates/auth/user_form.html:30
msgid "Your current providers"
msgstr "Vos fournisseurs associés"
#: templates/auth/user_form.html:39
#: templates/auth/user_form.html:44
msgid "Connect to another provider"
msgstr "Associer un autre fournisseur"
#: templates/auth/user_form.html:42
#: templates/auth/user_form.html:47
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr "C'est une bonne habitude d'avoir plusieurs fournisseurs d'identité, notamment dans le cas où l'un d'eux deviendrait inaccessible, temporairement ou même définitivement."
#: templates/auth/user_stars.html:8
#: templates/auth/user_stars.html:6
#, python-format
msgid "%(current_user)ss starred maps"
msgstr "Favoris de %(current_user)s"
#: templates/auth/user_stars.html:12
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr "Consulter les cartes favorites de %(current_user)s"
#: templates/auth/user_stars.html:17
#: templates/auth/user_stars.html:21
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr "%(current_user)s n'a aucune carte favorite."
@ -210,25 +323,33 @@ msgid ""
"them in your site."
msgstr "uMap permet de créer des cartes personnalisées sur des fonds OpenStreetMap en un instant et les afficher dans votre site."
#: templates/registration/login.html:6 templates/registration/login.html:45
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "Connexion"
#: templates/registration/login.html:24
msgid "Please log in with your account"
msgstr "Identifiez-vous"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr "Pour enregistrer et retrouver vos cartes, identifiez-vous."
#: templates/registration/login.html:41
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr "Identifiez-vous avec votre compte :"
#: templates/registration/login.html:42
msgid "Username"
msgstr "Nom d'utilisateur"
#: templates/registration/login.html:44
#: templates/registration/login.html:45
msgid "Password"
msgstr "Mot de passe"
#: templates/registration/login.html:51
msgid "Please choose a provider"
msgstr "Merci de choisir un fournisseur"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr "Choisissez un fournisseur :"
#: templates/umap/about.html:5 templates/umap/navigation.html:22
msgid "About"
msgstr "À propos"
#: templates/umap/about_summary.html:12
#, python-format
@ -279,13 +400,13 @@ msgstr "Créer une carte"
msgid "Play with the demo"
msgstr "Tester la démo"
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr "Fermer"
#: templates/umap/components/alerts/alert.html:30
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
@ -293,35 +414,35 @@ msgid ""
"target=\"_blank\">log in</a>."
msgstr "Astuce : pour retrouver facilement vos cartes, <a href=\"%(login_url)s\" target=\"_blank\">créez un compte</a> ou <a href=\"%(login_url)s\" target=\"_blank\">identifiez-vous</a>."
#: templates/umap/components/alerts/alert.html:35
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr "Ceci est le lien d'édition secret, gardez-le en lieu sûr :"
#: templates/umap/components/alerts/alert.html:39
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr "Copier le lien"
#: templates/umap/components/alerts/alert.html:46
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr "Entrez votre courriel pour recevoir le lien secret :"
#: templates/umap/components/alerts/alert.html:52
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr "Courriel"
#: templates/umap/components/alerts/alert.html:55
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr "Envoyer le lien"
#: templates/umap/components/alerts/alert.html:79
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr "Voir leurs changements dans un nouvel onglet"
#: templates/umap/components/alerts/alert.html:82
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr "Garder mes changements et écraser les leurs"
#: templates/umap/components/alerts/alert.html:85
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr "Garder leurs changements et écraser les miens"
@ -381,7 +502,7 @@ msgstr "Mes équipes"
msgid "Map of the uMaps"
msgstr "La carte des uMaps"
#: templates/umap/home.html:24
#: templates/umap/home.html:25
msgid "Get inspired, browse maps"
msgstr "Naviguer dans les cartes"
@ -389,15 +510,19 @@ msgstr "Naviguer dans les cartes"
msgid "You are logged in. Continuing..."
msgstr "Vous êtes maintenant identifié. Merci de patienter..."
#: templates/umap/map_list.html:11 views.py:433
#: templates/umap/map_list.html:18 views.py:444
msgid "by"
msgstr "par"
#: templates/umap/map_list.html:20
#: templates/umap/map_list.html:22
msgid "See the map"
msgstr "Voir la carte"
#: templates/umap/map_list.html:28
msgid "More"
msgstr "Plus"
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:18
msgid "Name"
msgstr "Nom"
@ -421,7 +546,7 @@ msgstr "Dernière modification"
msgid "Owner"
msgstr "Propriétaire"
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:24
msgid "Actions"
msgstr "Actions"
@ -434,7 +559,7 @@ msgid "Share"
msgstr "Partager"
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
#: templates/umap/user_teams.html:42 templates/umap/user_teams.html:44
msgid "Edit"
msgstr "Éditer"
@ -497,10 +622,6 @@ msgstr "Connexion"
msgid "Sign in"
msgstr "Créer un compte"
#: templates/umap/navigation.html:22
msgid "About"
msgstr "À propos"
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "Changer le mot de passe"
@ -509,41 +630,47 @@ msgstr "Changer le mot de passe"
msgid "Log out"
msgstr "Déconnexion"
#: templates/umap/password_change.html:7
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:11
msgid "Password change"
msgstr "Changer le mot de passe"
#: templates/umap/password_change.html:10
#: templates/umap/password_change.html:14
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "Merci de renseigner votre mot de passe actuel, puis deux fois le nouveau."
#: templates/umap/password_change.html:17
#: templates/umap/password_change.html:21
msgid "Old password"
msgstr "Ancien mot de passe"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password"
msgstr "Nouveau mot de passe"
#: templates/umap/password_change.html:26
#: templates/umap/password_change.html:30
msgid "New password confirmation"
msgstr "Confirmation du nouveau mot de passe"
#: templates/umap/password_change.html:27
#: templates/umap/password_change.html:31
msgid "Change my password"
msgstr "Changer de mot de passe"
#: templates/umap/password_change_done.html:7
#: templates/umap/password_change_done.html:6
#: templates/umap/password_change_done.html:11
msgid "Password change successful"
msgstr "Le mot de passe a été modifié"
#: templates/umap/password_change_done.html:10
#: templates/umap/password_change_done.html:14
msgid "Your password was changed."
msgstr "Votre mot de passe a été modifié"
#: templates/umap/search.html:15
#: templates/umap/search.html:6
msgid "Explore maps"
msgstr "Explorer les cartes"
#: templates/umap/search.html:19
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
@ -551,11 +678,15 @@ msgstr[0] "%(count)s carte trouvée:"
msgstr[1] "%(count)s cartes trouvées:"
msgstr[2] "%(count)s cartes trouvées :"
#: templates/umap/search.html:24
#: templates/umap/search.html:30
msgid "No map found."
msgstr "Aucune carte trouvée."
#: templates/umap/search.html:29
#: templates/umap/search.html:36
msgid "Latest created maps in category"
msgstr "Dernières cartes créées dans la catégorie"
#: templates/umap/search.html:43
msgid "Latest created maps"
msgstr "Dernières cartes créées."
@ -563,25 +694,42 @@ msgstr "Dernières cartes créées."
msgid "Search maps"
msgstr "Chercher des cartes"
#: templates/umap/search_bar.html:15
#: templates/umap/search_bar.html:14
msgid "Any category"
msgstr "Toutes catégories"
#: templates/umap/search_bar.html:19
msgid "Search"
msgstr "Chercher"
#: templates/umap/team_detail.html:10
#: templates/umap/team_confirm_delete.html:6
msgid "Team deletion"
msgstr "Suppression d'équipe"
#: templates/umap/team_detail.html:6
#, python-format
msgid "%(current_team)ss maps"
msgstr "Cartes de %(current_team)s"
#: templates/umap/team_detail.html:14
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr "Les cartes de %(current_team)s"
#: templates/umap/team_detail.html:22
#: templates/umap/team_detail.html:26
#, python-format
msgid "%(current_team)s has no public maps."
msgstr "%(current_team)s n'a pas de cartes publiques"
#: templates/umap/team_form.html:24
#: templates/umap/team_form.html:6
msgid "Create or edit a team"
msgstr "Créer ou modifier une équipe"
#: templates/umap/team_form.html:28
msgid "Delete this team"
msgstr "Supprimer cette équipe"
#: templates/umap/team_form.html:47
#: templates/umap/team_form.html:51
msgid "Add user"
msgstr "Ajouter un membre"
@ -602,11 +750,15 @@ msgstr "Télécharger %(count)s cartes"
msgid "You have no map yet."
msgstr "Vous n'avez pas encore de carte."
#: templates/umap/user_teams.html:17
#: templates/umap/user_teams.html:6
msgid "My Teams"
msgstr "Mes équipes"
#: templates/umap/user_teams.html:21
msgid "Users"
msgstr "Membres"
#: templates/umap/user_teams.html:48
#: templates/umap/user_teams.html:52
msgid "New team"
msgstr "Nouvelle équipe"
@ -619,61 +771,61 @@ msgstr "Impossible de supprimer une équipe ayant plus d'un membre"
msgid "Team “%(name)s” has been deleted"
msgstr "L'équipe «%(name)s» a été supprimée"
#: views.py:438
#: views.py:449
msgid "View the map"
msgstr "Voir la carte"
#: views.py:818
#: views.py:845
msgid "See full screen"
msgstr "Plein écran"
#: views.py:950
#: views.py:988
msgid "Map editors updated with success!"
msgstr "Éditeurs de la carte mis à jour !"
#: views.py:986
#: views.py:1024
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr "Le lien d'édition uMap pour votre carte : %(map_name)s"
#: views.py:989
#: views.py:1027
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr "Voici votre lien d'édition secret : %(link)s"
#: views.py:996
#: views.py:1034
#, python-format
msgid "Can't send email to %(email)s"
msgstr "Impossible d'envoyer un courriel vers %(email)s"
#: views.py:999
#: views.py:1037
#, python-format
msgid "Email sent to %(email)s"
msgstr "Courriel envoyé à %(email)s"
#: views.py:1010
#: views.py:1048
msgid "Only its owner can delete the map."
msgstr "Seul le créateur de la carte peut la supprimer."
#: views.py:1013
#: views.py:1054
msgid "Map successfully deleted."
msgstr "La carte a bien été supprimée."
#: views.py:1039
#: views.py:1080
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "Votre carte a été dupliquée ! Si vous souhaitez la modifier depuis un autre ordinateur, veuillez utiliser ce lien : %(anonymous_url)s"
#: views.py:1044
#: views.py:1085
msgid "Congratulations, your map has been cloned!"
msgstr "Votre carte a été dupliquée !"
#: views.py:1277
#: views.py:1339
msgid "Layer successfully deleted."
msgstr "Calque supprimé."
#: views.py:1299
#: views.py:1361
msgid "Permissions updated with success!"
msgstr "Les permissions ont bien été modifiées !"

Binary file not shown.

View file

@ -5,6 +5,7 @@
# Translators:
# Navhy, 2019
# Navhy, 2019
# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2025
# Navhy, 2019
# Nemigo Galiza <lescamposines@gmail.com>, 2017
# Rafael Ávila Coya <ravilacoya@gmail.com>, 2014
@ -12,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-15 13:53+0000\n"
"POT-Creation-Date: 2025-03-03 17:36+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Rafael Ávila Coya <ravilacoya@gmail.com>, 2014\n"
"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>, 2025\n"
"Language-Team: Galician (http://app.transifex.com/openstreetmap/umap/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -22,530 +23,717 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "Só pode editarse ca ligazón secreta de edición"
#: admin.py:16
msgid "CSV Export"
msgstr "Exportar CSV"
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "Calquera pode editar"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr "Este mapa non está dispoñíbel publicamente"
#: forms.py:69 models.py:371
msgid "Inherit"
#: middleware.py:19
msgid "Site is readonly for maintenance"
msgstr "O sitio é só de lectura por mantemento"
#: middleware.py:34
#, python-format
msgid ""
"Using “%(name)s” to authenticate is deprecated and will be removed soon. "
"Please configure another provider below before losing access to your account"
" and maps."
msgstr ""
#: middleware.py:13
msgid "Site is readonly for maintenance"
msgstr "O sitio está só para o mantemento"
#: models.py:50
#: models.py:60 models.py:79
msgid "name"
msgstr "nome"
#: models.py:81
msgid "details"
msgstr "detalles"
#: models.py:82
msgid "Link to a page where the licence is detailed."
msgstr "Ligazón a unha páxina web onde se detalla a licenza."
#: models.py:92
msgid "URL template using OSM tile format"
msgstr "Modelo de URL que usa o formato de teselas de OSM"
#: models.py:98
msgid "Order of the tilelayers in the edit box"
msgstr "Orde das capas base na caixa de edición"
#: models.py:144 models.py:372
msgid "Everyone"
msgstr ""
#: models.py:145 models.py:151 models.py:373
msgid "Editors only"
msgstr ""
#: models.py:146 models.py:374
msgid "Owner only"
msgstr ""
#: models.py:149
msgid "Everyone (public)"
msgstr ""
#: models.py:150
msgid "Anyone with link"
msgstr ""
#: models.py:152
msgid "Blocked"
msgstr ""
#: models.py:155 models.py:378
#: models.py:62 models.py:485
msgid "description"
msgstr "descrición"
#: models.py:156
#: models.py:110
msgid "details"
msgstr "detalles"
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr "Ligazón a unha páxina web onde se detalla a licenza."
#: models.py:121
msgid "URL template using OSM tile format"
msgstr "Modelo de URL que usa o formato de teselas de OSM"
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr "Orde das capas base na caixa de edición"
#: models.py:175 models.py:479
msgid "Only editable with secret edit link"
msgstr "Só é posíbel editalo coa ligazón secreta de edición"
#: models.py:176 models.py:480
msgid "Everyone can edit"
msgstr "Calquera pode editalo"
#: models.py:179 models.py:473
msgid "Everyone"
msgstr "Calquera"
#: models.py:180 models.py:189 models.py:474
msgid "Editors and team only"
msgstr "Só editores e equipo"
#: models.py:181 models.py:475
msgid "Owner only"
msgstr "Só o propietario"
#: models.py:184
msgid "Draft (private)"
msgstr "Borrador (privado)"
#: models.py:185
msgid "Everyone (public)"
msgstr "Calquera (público)"
#: models.py:188
msgid "Anyone with link"
msgstr "Calquera con ligazón"
#: models.py:190
msgid "Blocked"
msgstr "Bloqueado"
#: models.py:191 models.py:469
msgid "Deleted"
msgstr "Eliminado"
#: models.py:194
msgid "center"
msgstr "centrar"
#: models.py:157
#: models.py:195
msgid "zoom"
msgstr "achegar/afastar"
msgstr "zoom"
#: models.py:159
#: models.py:197
msgid "locate"
msgstr "localizar"
#: models.py:159
#: models.py:197
msgid "Locate user on load?"
msgstr "Localizar o usuario na carga?"
#: models.py:163
#: models.py:201
msgid "Choose the map licence."
msgstr "Escolle a licenza do mapa."
#: models.py:164
#: models.py:202
msgid "licence"
msgstr "licenza"
#: models.py:175
#: models.py:213
msgid "owner"
msgstr "dono"
msgstr "propietario"
#: models.py:179
#: models.py:217
msgid "editors"
msgstr "editores"
#: models.py:184 models.py:392
#: models.py:223
msgid "team"
msgstr "equipo"
#: models.py:229 models.py:501
msgid "edit status"
msgstr "estado da edición"
#: models.py:189
#: models.py:234 models.py:506
msgid "share status"
msgstr "compartir o estado"
#: models.py:192 models.py:387
#: models.py:237 models.py:496
msgid "settings"
msgstr "axustes"
#: models.py:320
#: models.py:407
msgid "Clone of"
msgstr "Clon de"
#: models.py:382
#: models.py:468 models.py:472 models.py:478
msgid "Inherit"
msgstr "Herdar"
#: models.py:491
msgid "display on load"
msgstr "amosar na carga"
#: models.py:383
#: models.py:492
msgid "Display this layer on load."
msgstr "Amosar esta capa na carga."
#: templates/404.html:6
msgid "Take me to the home page"
msgstr "Lévame á páxina de inicio"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr "<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" target=\"_blank\">Consulta aquí a documentación</a> sobre como xestionar os permisos dos mapas."
#: templates/auth/user_detail.html:5
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr "← Ir á páxina de inicio"
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr "404 Páxina non atopada"
#: templates/auth/user_detail.html:6
#, python-format
msgid "%(current_user)ss maps"
msgstr "Mapas de %(current_user)s"
#: templates/auth/user_detail.html:12
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "Navegador %(current_user)s dos mapas"
#: templates/auth/user_detail.html:12
#: templates/auth/user_detail.html:21
#, python-format
msgid "%(current_user)s has no maps."
msgstr "%(current_user)s non ten mapas."
#: templates/auth/user_form.html:6
msgid "My Maps"
msgstr ""
#: templates/auth/user_form.html:7
msgid "My Profile"
msgstr ""
msgstr "O meu perfil"
#: templates/auth/user_form.html:20
#: templates/auth/user_form.html:24 templates/umap/team_form.html:25
msgid "Save"
msgstr ""
msgstr "Gardar"
#: templates/auth/user_form.html:25
#: templates/auth/user_form.html:30
msgid "Your current providers"
msgstr ""
msgstr "Os teus provedores actuais"
#: templates/auth/user_form.html:31
#: templates/auth/user_form.html:44
msgid "Connect to another provider"
msgstr ""
msgstr "Conecta con outro provedor"
#: templates/auth/user_form.html:33
#: templates/auth/user_form.html:47
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr ""
msgstr "É un bo hábito conectar a túa conta a máis dun provedor, no caso de que un provedor non estea dispoñíbel, de xeito temporal ou incluso permanente."
#: templates/auth/user_stars.html:5
#: templates/auth/user_stars.html:6
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr ""
msgid "%(current_user)ss starred maps"
msgstr "Mapas destacados de %(current_user)s"
#: templates/auth/user_stars.html:12
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr ""
msgid "Browse %(current_user)s's starred maps"
msgstr "Consultar os mapas favoritos de %(current_user)s"
#: templates/base.html:12
#: templates/auth/user_stars.html:21
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr "%(current_user)s aínda non ten mapas destacados con estrela."
#: templates/base.html:13
msgid ""
"uMap lets you create maps with OpenStreetMap layers in a minute and embed "
"them in your site."
msgstr ""
msgstr "uMap permíteche crear mapas con capas de OpenStreetMap nun minuto e incrustalos no teu sitio web."
#: templates/registration/login.html:16
msgid "Please log in with your account"
msgstr "Fai o favor de loguearte ca túa conta"
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "Acceder"
#: templates/registration/login.html:28
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr "Para gardar e atopar doadamente os seus mapas, identifíquese."
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr "Accede coa túa conta"
#: templates/registration/login.html:42
msgid "Username"
msgstr "Nome de usuario"
#: templates/registration/login.html:31
#: templates/registration/login.html:45
msgid "Password"
msgstr "Contrasinal"
#: templates/registration/login.html:32
msgid "Login"
msgstr "Sesión iniciada"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr "Escolle un provedor"
#: templates/registration/login.html:37
msgid "Please choose a provider"
msgstr "Escolle un fornecedor"
#: templates/umap/about.html:5 templates/umap/navigation.html:22
msgid "About"
msgstr "Sobre"
#: templates/umap/about_summary.html:11
#: templates/umap/about_summary.html:12
#, python-format
msgid ""
"uMap lets you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
"layers in a minute and embed them in your site."
msgstr "O uMap permíteche crear mapas con capas do <a href=\"%(osm_url)s\" />OpenStreetMap</a> nun minuto e poñelos na túa páxina web."
msgstr "uMap permíteche crear mapas con capas de <a href=\"%(osm_url)s\" />OpenStreetMap</a> nun minuto e incrustalos no teu sitio web."
#: templates/umap/about_summary.html:21
#: templates/umap/about_summary.html:23
msgid "Choose the layers of your map"
msgstr "Escoller as capas do teu mapa"
#: templates/umap/about_summary.html:22
#: templates/umap/about_summary.html:26
msgid "Add POIs: markers, lines, polygons..."
msgstr "Engadir PDI: marcaxes, liñas, polígonos..."
#: templates/umap/about_summary.html:23
#: templates/umap/about_summary.html:29
msgid "Manage POIs colours and icons"
msgstr "Xestionar as cores e as iconas dos PDI"
#: templates/umap/about_summary.html:24
#: templates/umap/about_summary.html:32
msgid "Manage map options: display a minimap, locate user on load…"
msgstr "Xestionar as opcións do mapa: amosar un minimapa, atopar ó usuario na carga..."
#: templates/umap/about_summary.html:25
#: templates/umap/about_summary.html:35
msgid "Batch import geostructured data (geojson, gpx, kml, osm...)"
msgstr "Importación por feixes de datos xeostructurados (geojson, gpx, kml, osm...)"
#: templates/umap/about_summary.html:26
#: templates/umap/about_summary.html:38
msgid "Choose the license for your data"
msgstr "Escolle a licenza dos teus datos"
#: templates/umap/about_summary.html:27
#: templates/umap/about_summary.html:41
msgid "Embed and share your map"
msgstr "Inserir en páxina e compartir o teu mapa"
#: templates/umap/about_summary.html:37
#: templates/umap/about_summary.html:52
#, python-format
msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "E isto é de <a href=\"%(repo_url)s\">código aberto</a>!"
#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38
#: templates/umap/user_dashboard.html:42
#: templates/umap/about_summary.html:63 templates/umap/navigation.html:39
#: templates/umap/user_dashboard.html:40
msgid "Create a map"
msgstr "Facer un mapa"
#: templates/umap/about_summary.html:51
#: templates/umap/about_summary.html:66
msgid "Play with the demo"
msgstr "Xogar ca versión de proba"
#: templates/umap/content.html:22
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr "Pechar"
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
"target=\"_blank\">create an account</a> or <a href=\"%(login_url)s\" "
"target=\"_blank\">log in</a>."
msgstr "Consello pro: para atopar doadamente os teus mapas, <a href=\"%(login_url)s\" target=\"_blank\">crea unha conta</a> ou <a href=\"%(login_url)s\" target=\"_blank\">accede</a>."
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr "Aquí tes a túa ligazón secreta para editar o mapa, gárdeo a seguro:"
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr "Copiar a ligazón"
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr "Introduce o teu enderezo de correo para recibir a ligazón secreta:"
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr "Correo"
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr "Enviádeme a ligazón"
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr "Consulta as súas edicións noutra lapela"
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr "Conserva os teus cambios e deixa os seus"
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr "Conserva os seus cambios e deixa os teus"
#: templates/umap/content.html:26
msgid ""
"This instance of uMap is currently in read only mode, no creation/edit is "
"allowed."
msgstr ""
msgstr "Esta instancia de uMap está actualmente en modo de só lectura, non se permite a creación ou edición."
#: templates/umap/content.html:30
#: templates/umap/content.html:34
#, python-format
msgid ""
"This is a demo instance, used for tests and pre-rolling releases. If you "
"need a stable instance, please use <a "
"href=\"%(stable_url)s\">%(stable_url)s</a>. You can also host your own "
"instance, it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "Esta é unha instancia de proba, empregada para probas e lanzamentos previos. Se precisas unha instancia estábel, emprega <a href=\"%(stable_url)s\">%(stable_url)s</a>. Tamén podes ter a túa propia instancia, é de <a href=\"%(repo_url)s\">código aberto</a>!"
msgstr "Esta é unha instancia de demostración, empregada para probas e publicacións previas. Se precisas unha instancia estábel, emprega <a href=\"%(stable_url)s\">%(stable_url)s</a>. Tamén podes aloxar a túa propia instancia, é de <a href=\"%(repo_url)s\">código aberto</a>!"
#: templates/umap/home.html:8
#: templates/umap/content_footer.html:5
msgid "An OpenStreetMap project"
msgstr "Un proxecto de OpenStreetMap"
#: templates/umap/content_footer.html:6
msgid "version"
msgstr "versión"
#: templates/umap/content_footer.html:7
msgid "Hosted by"
msgstr "Aloxado por"
#: templates/umap/content_footer.html:8
msgid "Contact"
msgstr "Contacto"
#: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
msgid "Help"
msgstr "Axuda"
#: templates/umap/dashboard_menu.html:6
#, python-format
msgid "My Maps (%(count)s)"
msgstr "Os meus mapas (%(count)s)"
#: templates/umap/dashboard_menu.html:8
msgid "My Maps"
msgstr "Os meus mapas"
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr "O meu perfil"
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr "Os meus equipos"
#: templates/umap/home.html:14
msgid "Map of the uMaps"
msgstr "Mapa do uMaps"
#: templates/umap/home.html:14
#: templates/umap/home.html:24
msgid "Get inspired, browse maps"
msgstr "Inspírate e procura mapas"
msgstr "Inspírate, consulta mapas"
#: templates/umap/login_popup_end.html:2
#: templates/umap/login_popup_end.html:4
msgid "You are logged in. Continuing..."
msgstr "Iniciaches a sesión. Estase a continuar..."
#: templates/umap/map_list.html:9 views.py:341
#: templates/umap/map_list.html:11 views.py:437
msgid "by"
msgstr "por"
#: templates/umap/map_list.html:17
#: templates/umap/map_list.html:20
msgid "More"
msgstr "Máis"
#: templates/umap/map_table.html:6
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:18
msgid "Name"
msgstr ""
#: templates/umap/map_table.html:7
msgid "Preview"
msgstr ""
#: templates/umap/map_table.html:8
msgid "Who can see"
msgstr ""
#: templates/umap/map_table.html:9
msgid "Who can edit"
msgstr ""
#: templates/umap/map_table.html:10
msgid "Last save"
msgstr ""
msgstr "Nome"
#: templates/umap/map_table.html:11
msgid "Preview"
msgstr "Vista previa"
#: templates/umap/map_table.html:14
msgid "Who can see"
msgstr "Quen pode ver"
#: templates/umap/map_table.html:17
msgid "Who can edit"
msgstr "Quen pode editar"
#: templates/umap/map_table.html:20
msgid "Last save"
msgstr "Última modificación"
#: templates/umap/map_table.html:23
msgid "Owner"
msgstr ""
msgstr "Propietario"
#: templates/umap/map_table.html:12
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:24
msgid "Actions"
msgstr ""
msgstr "Accións"
#: templates/umap/map_table.html:25 templates/umap/map_table.html:27
#: templates/umap/map_table.html:41 templates/umap/map_table.html:43
msgid "Open preview"
msgstr ""
msgstr "Abrir a vista previa"
#: templates/umap/map_table.html:46 templates/umap/map_table.html:48
#: templates/umap/map_table.html:72 templates/umap/map_table.html:74
msgid "Share"
msgstr ""
msgstr "Compartir"
#: templates/umap/map_table.html:51 templates/umap/map_table.html:53
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:42 templates/umap/user_teams.html:44
msgid "Edit"
msgstr ""
msgstr "Editar"
#: templates/umap/map_table.html:56 templates/umap/map_table.html:58
#: templates/umap/map_table.html:84 templates/umap/map_table.html:86
msgid "Download"
msgstr ""
msgstr "Descargar"
#: templates/umap/map_table.html:63 templates/umap/map_table.html:65
#: templates/umap/map_table.html:90 templates/umap/map_table.html:92
msgid "Clone"
msgstr ""
msgstr "Clonar"
#: templates/umap/map_table.html:73 templates/umap/map_table.html:75
#: templates/umap/map_table.html:101 templates/umap/map_table.html:103
msgid "Delete"
msgstr ""
msgstr "Eliminar"
#: templates/umap/map_table.html:88
#: templates/umap/map_table.html:117
msgid "first"
msgstr ""
#: templates/umap/map_table.html:89
msgid "previous"
msgstr ""
#: templates/umap/map_table.html:98
#, python-format
msgid "Page %(maps_number)s of %(num_pages)s"
msgstr ""
#: templates/umap/map_table.html:104
msgid "next"
msgstr ""
#: templates/umap/map_table.html:105
msgid "last"
msgstr ""
#: templates/umap/map_table.html:113
#, python-format
msgid "Lines per page: %(per_page)s"
msgstr ""
msgstr "primeira"
#: templates/umap/map_table.html:118
msgid "previous"
msgstr "anterior"
#: templates/umap/map_table.html:126
#, python-format
msgid "Page %(maps_number)s of %(num_pages)s"
msgstr "Páxina %(maps_number)s de %(num_pages)s"
#: templates/umap/map_table.html:131
msgid "next"
msgstr "seguinte"
#: templates/umap/map_table.html:132
msgid "last"
msgstr "última"
#: templates/umap/map_table.html:140
#, python-format
msgid "Lines per page: %(per_page)s"
msgstr "Liñas por páxina: %(per_page)s"
#: templates/umap/map_table.html:145
#, python-format
msgid "%(count)s maps"
msgstr ""
msgstr "%(count)s mapas"
#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4
#: templates/umap/navigation.html:11 templates/umap/user_dashboard.html:6
msgid "My Dashboard"
msgstr ""
msgstr "O meu taboleiro"
#: templates/umap/navigation.html:13
#: templates/umap/navigation.html:14
msgid "Starred maps"
msgstr ""
msgstr "Mapas destacados con estrelas"
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Log in"
msgstr "Iniciar a sesión"
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Sign in"
msgstr "Rexistrarse"
#: templates/umap/navigation.html:21
msgid "About"
msgstr "Acerca de"
#: templates/umap/navigation.html:24
msgid "Help"
msgstr ""
#: templates/umap/navigation.html:29
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "Mudar contrasinal"
msgstr "Cambiar o contrasinal"
#: templates/umap/navigation.html:33
#: templates/umap/navigation.html:34
msgid "Log out"
msgstr "Saír"
#: templates/umap/password_change.html:4
msgid "Password change"
msgstr "Contrasinal mudada"
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:11
msgid "Password change"
msgstr "Contrasinal cambiado"
#: templates/umap/password_change.html:14
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "Insire o teu contrasinal antigo, por seguranza, e despois insire o teu novo contrasinal dúas veces para que poidamos verificar se o escribiches de xeito correcto."
msgstr "Introduce o teu contrasinal antigo, por seguranza, e após introduce o teu novo contrasinal dúas veces para que poidamos verificar que o escribiches de xeito correcto."
#: templates/umap/password_change.html:13
#: templates/umap/password_change.html:21
msgid "Old password"
msgstr "Contrasinal antigo"
#: templates/umap/password_change.html:18
#: templates/umap/password_change.html:26
msgid "New password"
msgstr "Novo contrasinal"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:30
msgid "New password confirmation"
msgstr "Confirmar novo contrasinal"
#: templates/umap/password_change.html:23
#: templates/umap/password_change.html:31
msgid "Change my password"
msgstr "Mudar o meu contrasinal"
msgstr "Cambiar o meu contrasinal"
#: templates/umap/password_change_done.html:4
#: templates/umap/password_change_done.html:6
#: templates/umap/password_change_done.html:11
msgid "Password change successful"
msgstr "O contrasinal foi mudado de xeito correcto"
msgstr "O contrasinal foi cambiado correctamente"
#: templates/umap/password_change_done.html:5
#: templates/umap/password_change_done.html:14
msgid "Your password was changed."
msgstr "O seu contrasinal foi mudado."
msgstr "O teu contrasinal foi cambiado."
#: templates/umap/search.html:10
#: templates/umap/search.html:6
msgid "Explore maps"
msgstr "Examinar mapas"
#: templates/umap/search.html:19
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Atopouse %(count)s mapa:"
msgstr[1] "Atopáronse %(count)s mapas:"
#: templates/umap/search.html:18
#: templates/umap/search.html:28
msgid "No map found."
msgstr ""
msgstr "Non se atopou ningún mapa."
#: templates/umap/search.html:21
#: templates/umap/search.html:33
msgid "Latest created maps"
msgstr ""
msgstr "Últimos mapas creados"
#: templates/umap/search_bar.html:3
#: templates/umap/search_bar.html:4
msgid "Search maps"
msgstr "Procurar mapas"
msgstr "Buscar mapas"
#: templates/umap/search_bar.html:14
#: templates/umap/search_bar.html:16
msgid "Search"
msgstr "Procurar"
msgstr "Buscar"
#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26
msgid "Search my maps"
msgstr ""
#: templates/umap/team_confirm_delete.html:6
msgid "Team deletion"
msgstr "Eliminación do equipo"
#: templates/umap/user_dashboard.html:11
#: templates/umap/team_detail.html:6
#, python-format
msgid "My Maps (%(count)s)"
msgstr ""
msgid "%(current_team)ss maps"
msgstr "Mapas de %(current_team)s"
#: templates/umap/user_dashboard.html:13
msgid "My profile"
msgstr ""
#: templates/umap/team_detail.html:14
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr "Os mapas de %(current_team)s"
#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23
#: templates/umap/team_detail.html:26
#, python-format
msgid "%(current_team)s has no public maps."
msgstr "%(current_team)s non ten mapas públicos"
#: templates/umap/team_form.html:6
msgid "Create or edit a team"
msgstr "Crear ou editar un equipo"
#: templates/umap/team_form.html:28
msgid "Delete this team"
msgstr "Eliminar este equipo"
#: templates/umap/team_form.html:51
msgid "Add user"
msgstr "Engadir usuario"
#: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
msgid "Search my maps"
msgstr "Buscar nos meus mapas"
#: templates/umap/user_dashboard.html:17 templates/umap/user_dashboard.html:22
msgid "Maps title"
msgstr ""
msgstr "Título do mapa"
#: templates/umap/user_dashboard.html:32
#: templates/umap/user_dashboard.html:30
#, python-format
msgid "Download %(count)s maps"
msgstr ""
msgstr "Descargar %(count)s mapas"
#: templates/umap/user_dashboard.html:42
#: templates/umap/user_dashboard.html:40
msgid "You have no map yet."
msgstr ""
msgstr "Aínda non tes ningún mapa."
#: views.py:346
#: templates/umap/user_teams.html:6
msgid "My Teams"
msgstr "Os meus equipos"
#: templates/umap/user_teams.html:21
msgid "Users"
msgstr "Usuarios"
#: templates/umap/user_teams.html:52
msgid "New team"
msgstr "Novo equipo"
#: views.py:234
msgid "Cannot delete a team with more than one member"
msgstr "Non é posíbel eliminar un equipo con máis dun membro"
#: views.py:238
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr "Foi eliminado o equipo %(name)s"
#: views.py:442
msgid "View the map"
msgstr "Ollar o mapa"
msgstr "Ver o mapa"
#: views.py:704
#: views.py:838
msgid "See full screen"
msgstr ""
msgstr "Ver a pantalla completa"
#: views.py:803
#: views.py:981
msgid "Map editors updated with success!"
msgstr "O editores do mapa foron actualizados de xeito exitoso!"
msgstr "O editores do mapa foron actualizados correctamente!"
#: views.py:841
#: views.py:1017
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr ""
msgstr "A ligazón de edición de uMap para o teu mapa: %(map_name)s"
#: views.py:844
#: views.py:1020
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr ""
msgstr "Aquí tes a túa ligazón secret de edicióna: %(link)s"
#: views.py:850
#: views.py:1027
#, python-format
msgid "Can't send email to %(email)s"
msgstr "Non é posíbel enviar o correo a %(email)s"
#: views.py:1030
#, python-format
msgid "Email sent to %(email)s"
msgstr ""
msgstr "Correo enviado a %(email)s"
#: views.py:861
#: views.py:1041
msgid "Only its owner can delete the map."
msgstr "Só o seu dono pode eliminar o mapa."
#: views.py:889
#: views.py:1044
msgid "Map successfully deleted."
msgstr "O mapa foi eliminado correctamente."
#: views.py:1070
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "O teu mapa foi clonado! Se desexas editar este mapa dende outra computadora, emprega esta ligazón: %(anonymous_url)s"
msgstr "O teu mapa foi clonado! Se queres editar este mapa desde outro computador, emprega esta ligazón: %(anonymous_url)s"
#: views.py:894
#: views.py:1075
msgid "Congratulations, your map has been cloned!"
msgstr "Parabéns! O teu mapa foi clonado!"
#: views.py:1130
#: views.py:1329
msgid "Layer successfully deleted."
msgstr "A capa foi eliminada de xeito exitoso."
msgstr "A capa foi eliminada correctamente."
#: views.py:1152
#: views.py:1351
msgid "Permissions updated with success!"
msgstr ""
msgstr "Os permisos foron actualizados correctamente!"

Binary file not shown.

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-15 13:53+0000\n"
"POT-Creation-Date: 2024-12-24 08:39+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>, 2020\n"
"Language-Team: Hebrew (http://app.transifex.com/openstreetmap/umap/language/he/)\n"
@ -16,260 +16,333 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: he\n"
"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "רק למי שיש את קישור העריכה הסודי יכול לערוך"
#: admin.py:16
msgid "CSV Export"
msgstr ""
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "לכולם יש הרשאות לערוך"
#: forms.py:69 models.py:371
msgid "Inherit"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr ""
#: middleware.py:13
msgid "Site is readonly for maintenance"
msgstr "האתר הוא לקריאה בלבד לצורך תחזוקה"
#: models.py:50
#: models.py:60 models.py:79
msgid "name"
msgstr "שם"
#: models.py:81
msgid "details"
msgstr "פרטים"
#: models.py:82
msgid "Link to a page where the licence is detailed."
msgstr "קישור לעמוד בו הרישיון מפורט."
#: models.py:92
msgid "URL template using OSM tile format"
msgstr "תבנית כתובת עם תבנית האריחים של OSM"
#: models.py:98
msgid "Order of the tilelayers in the edit box"
msgstr "סדר שכבת האריחים בתיבת העריכה"
#: models.py:144 models.py:372
msgid "Everyone"
msgstr ""
#: models.py:145 models.py:151 models.py:373
msgid "Editors only"
msgstr ""
#: models.py:146 models.py:374
msgid "Owner only"
msgstr ""
#: models.py:149
msgid "Everyone (public)"
msgstr ""
#: models.py:150
msgid "Anyone with link"
msgstr ""
#: models.py:152
msgid "Blocked"
msgstr ""
#: models.py:155 models.py:378
#: models.py:62 models.py:475
msgid "description"
msgstr "תיאור"
#: models.py:156
#: models.py:110
msgid "details"
msgstr "פרטים"
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr "קישור לעמוד בו הרישיון מפורט."
#: models.py:121
msgid "URL template using OSM tile format"
msgstr "תבנית כתובת עם תבנית האריחים של OSM"
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr "סדר שכבת האריחים בתיבת העריכה"
#: models.py:175 models.py:469
msgid "Only editable with secret edit link"
msgstr "רק למי שיש את קישור העריכה הסודי יכול לערוך"
#: models.py:176 models.py:470
msgid "Everyone can edit"
msgstr "לכולם יש הרשאות לערוך"
#: models.py:179 models.py:463
msgid "Everyone"
msgstr ""
#: models.py:180 models.py:189 models.py:464
msgid "Editors and team only"
msgstr ""
#: models.py:181 models.py:465
msgid "Owner only"
msgstr ""
#: models.py:184
msgid "Draft (private)"
msgstr ""
#: models.py:185
msgid "Everyone (public)"
msgstr ""
#: models.py:188
msgid "Anyone with link"
msgstr ""
#: models.py:190
msgid "Blocked"
msgstr ""
#: models.py:191
msgid "Deleted"
msgstr ""
#: models.py:194
msgid "center"
msgstr "מרכז"
#: models.py:157
#: models.py:195
msgid "zoom"
msgstr "תקריב"
#: models.py:159
#: models.py:197
msgid "locate"
msgstr "איתור"
#: models.py:159
#: models.py:197
msgid "Locate user on load?"
msgstr "לאתר משתמש עם הטעינה?"
#: models.py:163
#: models.py:201
msgid "Choose the map licence."
msgstr "נא לבחור את רישיון המפה."
#: models.py:164
#: models.py:202
msgid "licence"
msgstr "רישיון"
#: models.py:175
#: models.py:213
msgid "owner"
msgstr "בעלות"
#: models.py:179
#: models.py:217
msgid "editors"
msgstr "עורכים"
#: models.py:184 models.py:392
#: models.py:223
msgid "team"
msgstr ""
#: models.py:229 models.py:491
msgid "edit status"
msgstr "מצב עריכה"
#: models.py:189
#: models.py:234
msgid "share status"
msgstr "מצב שיתוף"
#: models.py:192 models.py:387
#: models.py:237 models.py:486
msgid "settings"
msgstr "הגדרות"
#: models.py:320
#: models.py:402
msgid "Clone of"
msgstr "עותק של"
#: models.py:382
#: models.py:462 models.py:468
msgid "Inherit"
msgstr ""
#: models.py:481
msgid "display on load"
msgstr "הצגה עם הטעינה"
#: models.py:383
#: models.py:482
msgid "Display this layer on load."
msgstr "הצגת השכבה הזאת עם הטעינה."
#: templates/404.html:6
msgid "Take me to the home page"
msgstr "נא לעבור לדף הבית"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr ""
#: templates/auth/user_detail.html:5
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr ""
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr ""
#: templates/auth/user_detail.html:8
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "עיון במפות של %(current_user)s"
#: templates/auth/user_detail.html:12
#: templates/auth/user_detail.html:17
#, python-format
msgid "%(current_user)s has no maps."
msgstr "למשתמש %(current_user)s אין מפות."
#: templates/auth/user_form.html:6
msgid "My Maps"
msgstr ""
#: templates/auth/user_form.html:7
msgid "My Profile"
msgstr ""
#: templates/auth/user_form.html:20
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
msgid "Save"
msgstr ""
#: templates/auth/user_form.html:25
#: templates/auth/user_form.html:27
msgid "Your current providers"
msgstr ""
#: templates/auth/user_form.html:31
#: templates/auth/user_form.html:39
msgid "Connect to another provider"
msgstr ""
#: templates/auth/user_form.html:33
#: templates/auth/user_form.html:42
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr ""
#: templates/auth/user_stars.html:5
#: templates/auth/user_stars.html:8
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr ""
#: templates/auth/user_stars.html:12
#: templates/auth/user_stars.html:17
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr ""
#: templates/base.html:12
#: templates/base.html:13
msgid ""
"uMap lets you create maps with OpenStreetMap layers in a minute and embed "
"them in your site."
msgstr ""
#: templates/registration/login.html:16
msgid "Please log in with your account"
msgstr "נא להיכנס עם החשבון שלך"
#: templates/registration/login.html:28
msgid "Username"
msgstr "שם משתמש"
#: templates/registration/login.html:31
msgid "Password"
msgstr "ססמה"
#: templates/registration/login.html:32
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "כניסה"
#: templates/registration/login.html:37
msgid "Please choose a provider"
msgstr "נא לבחור ספק"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr ""
#: templates/umap/about_summary.html:11
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr ""
#: templates/registration/login.html:42
msgid "Username"
msgstr "שם משתמש"
#: templates/registration/login.html:45
msgid "Password"
msgstr "ססמה"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr ""
#: templates/umap/about_summary.html:12
#, python-format
msgid ""
"uMap lets you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
"layers in a minute and embed them in your site."
msgstr "uMap מאפשר לך ליצור מפות עם שכבות של <a href=\"%(osm_url)s\" />OpenStreetMap</a> תוך דקה ולהטמיע אותן באתר שלך."
#: templates/umap/about_summary.html:21
#: templates/umap/about_summary.html:23
msgid "Choose the layers of your map"
msgstr "נא לבחור את שכבות המפה שלך"
#: templates/umap/about_summary.html:22
#: templates/umap/about_summary.html:26
msgid "Add POIs: markers, lines, polygons..."
msgstr "הוספת נקודות עניין, קווים, מצולעים…"
#: templates/umap/about_summary.html:23
#: templates/umap/about_summary.html:29
msgid "Manage POIs colours and icons"
msgstr "ניהול נקודות עניין וסמלים"
#: templates/umap/about_summary.html:24
#: templates/umap/about_summary.html:32
msgid "Manage map options: display a minimap, locate user on load…"
msgstr "ניהול אפשרויות מפה, איתור משתמש עם הטעינה…"
#: templates/umap/about_summary.html:25
#: templates/umap/about_summary.html:35
msgid "Batch import geostructured data (geojson, gpx, kml, osm...)"
msgstr "ייבוא כמותי של נתונים שהורכבו לטובת מיפוי גאוגרפי (geojson, gpx, kml, osm…)"
#: templates/umap/about_summary.html:26
#: templates/umap/about_summary.html:38
msgid "Choose the license for your data"
msgstr "נא לבחור את רישיון הנתונים שלך"
#: templates/umap/about_summary.html:27
#: templates/umap/about_summary.html:41
msgid "Embed and share your map"
msgstr "הטמעה ושיתוף של המפה שלך"
#: templates/umap/about_summary.html:37
#: templates/umap/about_summary.html:52
#, python-format
msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "וכל זה ב<a href=\"%(repo_url)s\">קוד פתוח</a>!"
#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38
#: templates/umap/user_dashboard.html:42
#: templates/umap/about_summary.html:63 templates/umap/navigation.html:39
#: templates/umap/user_dashboard.html:40
msgid "Create a map"
msgstr "יצירת מפה"
#: templates/umap/about_summary.html:51
#: templates/umap/about_summary.html:66
msgid "Play with the demo"
msgstr "משחק עם ההדגמה"
#: templates/umap/content.html:22
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr ""
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
"target=\"_blank\">create an account</a> or <a href=\"%(login_url)s\" "
"target=\"_blank\">log in</a>."
msgstr ""
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr ""
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr ""
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr ""
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr ""
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr ""
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr ""
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr ""
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr ""
#: templates/umap/content.html:26
msgid ""
"This instance of uMap is currently in read only mode, no creation/edit is "
"allowed."
msgstr ""
#: templates/umap/content.html:30
#: templates/umap/content.html:34
#, python-format
msgid ""
"This is a demo instance, used for tests and pre-rolling releases. If you "
@ -278,176 +351,210 @@ msgid ""
"instance, it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "זה עותק לדוגמה, משמש לבדיקות ולמהדורות טרום הפצה. אם ברצונך להשתמש בעותק יציב, נא להשתמש בעותק <a href=\"%(stable_url)s\">%(stable_url)s</a>. יש לך גם אפשרות לארח עותק משלך, המערכת היא ב<a href=\"%(repo_url)s\">קוד פתוח</a>!"
#: templates/umap/home.html:8
#: templates/umap/content_footer.html:5
msgid "An OpenStreetMap project"
msgstr ""
#: templates/umap/content_footer.html:6
msgid "version"
msgstr ""
#: templates/umap/content_footer.html:7
msgid "Hosted by"
msgstr ""
#: templates/umap/content_footer.html:8
msgid "Contact"
msgstr ""
#: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
msgid "Help"
msgstr ""
#: templates/umap/dashboard_menu.html:6
#, python-format
msgid "My Maps (%(count)s)"
msgstr ""
#: templates/umap/dashboard_menu.html:8
msgid "My Maps"
msgstr ""
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr ""
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr ""
#: templates/umap/home.html:14
msgid "Map of the uMaps"
msgstr "המפות של uMap"
#: templates/umap/home.html:14
#: templates/umap/home.html:24
msgid "Get inspired, browse maps"
msgstr "מפות שתענקנה לך השראה"
#: templates/umap/login_popup_end.html:2
#: templates/umap/login_popup_end.html:4
msgid "You are logged in. Continuing..."
msgstr "נכנסת למערכת. ממשיכים הלאה…"
#: templates/umap/map_list.html:9 views.py:341
#: templates/umap/map_list.html:11 views.py:437
msgid "by"
msgstr "מאת"
#: templates/umap/map_list.html:17
#: templates/umap/map_list.html:20
msgid "More"
msgstr "עוד"
#: templates/umap/map_table.html:6
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
msgid "Name"
msgstr ""
#: templates/umap/map_table.html:7
#: templates/umap/map_table.html:11
msgid "Preview"
msgstr ""
#: templates/umap/map_table.html:8
#: templates/umap/map_table.html:14
msgid "Who can see"
msgstr ""
#: templates/umap/map_table.html:9
#: templates/umap/map_table.html:17
msgid "Who can edit"
msgstr ""
#: templates/umap/map_table.html:10
#: templates/umap/map_table.html:20
msgid "Last save"
msgstr ""
#: templates/umap/map_table.html:11
#: templates/umap/map_table.html:23
msgid "Owner"
msgstr ""
#: templates/umap/map_table.html:12
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
msgid "Actions"
msgstr ""
#: templates/umap/map_table.html:25 templates/umap/map_table.html:27
#: templates/umap/map_table.html:41 templates/umap/map_table.html:43
msgid "Open preview"
msgstr ""
#: templates/umap/map_table.html:46 templates/umap/map_table.html:48
#: templates/umap/map_table.html:72 templates/umap/map_table.html:74
msgid "Share"
msgstr ""
#: templates/umap/map_table.html:51 templates/umap/map_table.html:53
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
msgid "Edit"
msgstr ""
#: templates/umap/map_table.html:56 templates/umap/map_table.html:58
#: templates/umap/map_table.html:84 templates/umap/map_table.html:86
msgid "Download"
msgstr ""
#: templates/umap/map_table.html:63 templates/umap/map_table.html:65
#: templates/umap/map_table.html:90 templates/umap/map_table.html:92
msgid "Clone"
msgstr ""
#: templates/umap/map_table.html:73 templates/umap/map_table.html:75
#: templates/umap/map_table.html:101 templates/umap/map_table.html:103
msgid "Delete"
msgstr ""
#: templates/umap/map_table.html:88
#: templates/umap/map_table.html:117
msgid "first"
msgstr ""
#: templates/umap/map_table.html:89
#: templates/umap/map_table.html:118
msgid "previous"
msgstr ""
#: templates/umap/map_table.html:98
#: templates/umap/map_table.html:126
#, python-format
msgid "Page %(maps_number)s of %(num_pages)s"
msgstr ""
#: templates/umap/map_table.html:104
#: templates/umap/map_table.html:131
msgid "next"
msgstr ""
#: templates/umap/map_table.html:105
#: templates/umap/map_table.html:132
msgid "last"
msgstr ""
#: templates/umap/map_table.html:113
#: templates/umap/map_table.html:140
#, python-format
msgid "Lines per page: %(per_page)s"
msgstr ""
#: templates/umap/map_table.html:118
#: templates/umap/map_table.html:145
#, python-format
msgid "%(count)s maps"
msgstr ""
#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4
#: templates/umap/navigation.html:11 templates/umap/user_dashboard.html:6
msgid "My Dashboard"
msgstr ""
#: templates/umap/navigation.html:13
#: templates/umap/navigation.html:14
msgid "Starred maps"
msgstr ""
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Log in"
msgstr "כניסה"
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Sign in"
msgstr "הרשמה"
#: templates/umap/navigation.html:21
#: templates/umap/navigation.html:22
msgid "About"
msgstr "על אודות"
#: templates/umap/navigation.html:24
msgid "Help"
msgstr ""
#: templates/umap/navigation.html:29
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "החלפת ססמה"
#: templates/umap/navigation.html:33
#: templates/umap/navigation.html:34
msgid "Log out"
msgstr "יציאה"
#: templates/umap/password_change.html:4
#: templates/umap/password_change.html:7
msgid "Password change"
msgstr "החלפת ססמה"
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:10
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "נא להקליד את הססמה הישנה שלך, מטעמי אבטחה, לאחר מכן את הססמה החדשה שלך פעמיים כדי שנוכל לוודא שהקלדת אותה כראוי."
#: templates/umap/password_change.html:13
#: templates/umap/password_change.html:17
msgid "Old password"
msgstr "ססמה ישנה"
#: templates/umap/password_change.html:18
#: templates/umap/password_change.html:22
msgid "New password"
msgstr "ססמה חדשה"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password confirmation"
msgstr "אימות ססמה חדשה"
#: templates/umap/password_change.html:23
#: templates/umap/password_change.html:27
msgid "Change my password"
msgstr "החלפת הססמה שלי"
#: templates/umap/password_change_done.html:4
#: templates/umap/password_change_done.html:7
msgid "Password change successful"
msgstr "החלפת הססמה הצליחה"
#: templates/umap/password_change_done.html:5
#: templates/umap/password_change_done.html:10
msgid "Your password was changed."
msgstr "הססמה שלך הוחלפה."
#: templates/umap/search.html:10
#: templates/umap/search.html:15
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
@ -455,94 +562,129 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
#: templates/umap/search.html:18
#: templates/umap/search.html:24
msgid "No map found."
msgstr ""
#: templates/umap/search.html:21
#: templates/umap/search.html:29
msgid "Latest created maps"
msgstr ""
#: templates/umap/search_bar.html:3
#: templates/umap/search_bar.html:4
msgid "Search maps"
msgstr "חיפוש במפות"
#: templates/umap/search_bar.html:14
#: templates/umap/search_bar.html:15
msgid "Search"
msgstr "חיפוש"
#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26
#: templates/umap/team_detail.html:10
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr ""
#: templates/umap/team_detail.html:22
#, python-format
msgid "%(current_team)s has no public maps."
msgstr ""
#: templates/umap/team_form.html:24
msgid "Delete this team"
msgstr ""
#: templates/umap/team_form.html:47
msgid "Add user"
msgstr ""
#: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
msgid "Search my maps"
msgstr ""
#: templates/umap/user_dashboard.html:11
#, python-format
msgid "My Maps (%(count)s)"
msgstr ""
#: templates/umap/user_dashboard.html:13
msgid "My profile"
msgstr ""
#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23
#: templates/umap/user_dashboard.html:17 templates/umap/user_dashboard.html:22
msgid "Maps title"
msgstr ""
#: templates/umap/user_dashboard.html:32
#: templates/umap/user_dashboard.html:30
#, python-format
msgid "Download %(count)s maps"
msgstr ""
#: templates/umap/user_dashboard.html:42
#: templates/umap/user_dashboard.html:40
msgid "You have no map yet."
msgstr ""
#: views.py:346
#: templates/umap/user_teams.html:17
msgid "Users"
msgstr ""
#: templates/umap/user_teams.html:48
msgid "New team"
msgstr ""
#: views.py:234
msgid "Cannot delete a team with more than one member"
msgstr ""
#: views.py:238
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr ""
#: views.py:442
msgid "View the map"
msgstr "הצגת המפה"
#: views.py:704
#: views.py:825
msgid "See full screen"
msgstr ""
#: views.py:803
#: views.py:968
msgid "Map editors updated with success!"
msgstr "עורכי המפה עודכנו בהצלחה!"
#: views.py:841
#: views.py:1004
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr ""
#: views.py:844
#: views.py:1007
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr ""
#: views.py:850
#: views.py:1014
#, python-format
msgid "Can't send email to %(email)s"
msgstr ""
#: views.py:1017
#, python-format
msgid "Email sent to %(email)s"
msgstr ""
#: views.py:861
#: views.py:1028
msgid "Only its owner can delete the map."
msgstr "רק לבעלים יש אפשרות למחוק את המפה."
#: views.py:889
#: views.py:1031
msgid "Map successfully deleted."
msgstr ""
#: views.py:1057
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "המפה שלך שוכפלה! אם מעניין אותך לערוך את המפה הזאת ממחשב אחר, נא להשתמש בקישור הבא: %(anonymous_url)s"
#: views.py:894
#: views.py:1062
msgid "Congratulations, your map has been cloned!"
msgstr "ברכותינו, המפה שלך שוכפלה!"
#: views.py:1130
#: views.py:1313
msgid "Layer successfully deleted."
msgstr "השכבה נמחקה בהצלחה."
#: views.py:1152
#: views.py:1335
msgid "Permissions updated with success!"
msgstr ""

Binary file not shown.

View file

@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Gábor Babos <gabor.babos@gmail.com>, 2017-2019,2023-2024
# Gábor Babos <gabor.babos@gmail.com>, 2017-2019,2023-2025
# Peter Velosy <peter.velosy@gmail.com>, 2017
msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-04 14:02+0000\n"
"POT-Creation-Date: 2025-04-04 16:49+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Gábor Babos <gabor.babos@gmail.com>, 2017-2019,2023-2024\n"
"Last-Translator: Gábor Babos <gabor.babos@gmail.com>, 2017-2019,2023-2025\n"
"Language-Team: Hungarian (http://app.transifex.com/openstreetmap/umap/language/hu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -19,168 +19,285 @@ msgstr ""
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "Kizárólag titkos szerkesztési linkkel szerkeszthető"
#: admin.py:16
msgid "CSV Export"
msgstr "CSV exportálás"
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "Bárki szerkesztheti"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr "Ez a térkép nem nyilvános"
#: forms.py:69 models.py:423
msgid "Inherit"
msgstr "Öröklés"
#: middleware.py:13
#: middleware.py:19
msgid "Site is readonly for maintenance"
msgstr "Karbantartás miatt a webhely csak olvasható"
#: models.py:54 models.py:73
#: middleware.py:34
#, python-format
msgid ""
"Using “%(name)s” to authenticate is deprecated and will be removed soon. "
"Please configure another provider below before losing access to your account"
" and maps. Then, please logout and login again with the new provider."
msgstr "A „%(name)s” használata a hitelesítéshez elavult, és hamarosan eltávolításra kerül. Kérjük, állítson be egy másik szolgáltatót az alábbiakban, mielőtt elveszítené a fiókjához és a térképekhez való hozzáférést. Ezután jelentkezzen ki, majd jelentkezzen be újra az új szolgáltatóval."
#: models.py:61 models.py:80
msgid "name"
msgstr "név"
#: models.py:56 models.py:433
#: models.py:63 models.py:493
msgid "description"
msgstr "leírás"
#: models.py:104
#: models.py:111
msgid "details"
msgstr "részletek"
#: models.py:105
#: models.py:112
msgid "Link to a page where the licence is detailed."
msgstr "Link egy részletes licencinformációkat tartalmazó lapra."
#: models.py:115
#: models.py:122
msgid "URL template using OSM tile format"
msgstr "OSM-csempeformátumot használó URL-sablon"
#: models.py:121
#: models.py:128
msgid "Order of the tilelayers in the edit box"
msgstr "Csemperétegek sorrendje a szerkesztődobozban"
#: models.py:167 models.py:424
#: models.py:176 models.py:487
msgid "Only editable with secret edit link"
msgstr "Kizárólag titkos szerkesztési linkkel szerkeszthető"
#: models.py:177 models.py:488
msgid "Everyone can edit"
msgstr "Bárki szerkesztheti"
#: models.py:180 models.py:481
msgid "Everyone"
msgstr "Mindenki"
#: models.py:168 models.py:174 models.py:425
#: models.py:181 models.py:190 models.py:482
msgid "Editors and team only"
msgstr "Csak a szerkesztők és a csoport"
#: models.py:169 models.py:426
#: models.py:182 models.py:483
msgid "Owner only"
msgstr "Csak a tulajdonos"
#: models.py:172
#: models.py:185
msgid "Draft (private)"
msgstr "Piszkozat (privát)"
#: models.py:186
msgid "Everyone (public)"
msgstr "Mindenki (nyilvános)"
#: models.py:173
#: models.py:189
msgid "Anyone with link"
msgstr "A link birtokában bárki"
#: models.py:175
#: models.py:191
msgid "Blocked"
msgstr "Blokkolva"
#: models.py:178
#: models.py:192 models.py:477
msgid "Deleted"
msgstr "Törölve"
#: models.py:195
msgid "center"
msgstr "középpont"
#: models.py:179
#: models.py:196
msgid "zoom"
msgstr "nagyítás"
#: models.py:181
#: models.py:198
msgid "locate"
msgstr "helymeghatározás"
#: models.py:181
#: models.py:198
msgid "Locate user on load?"
msgstr "Bekérje a felhasználó pozícióját betöltéskor?"
#: models.py:185
#: models.py:202
msgid "Choose the map licence."
msgstr "Térképlicenc kiválasztása"
#: models.py:186
#: models.py:203
msgid "licence"
msgstr "licenc"
#: models.py:197
#: models.py:214
msgid "owner"
msgstr "tulajdonos"
#: models.py:201
#: models.py:218
msgid "editors"
msgstr "szerkesztők"
#: models.py:207
#: models.py:224
msgid "team"
msgstr "csoport"
#: models.py:213 models.py:447
#: models.py:230 models.py:509
msgid "edit status"
msgstr "szerkeszthetőség"
#: models.py:218
#: models.py:235 models.py:514
msgid "share status"
msgstr "megoszthatóság"
#: models.py:221 models.py:442
#: models.py:238 models.py:504
msgid "settings"
msgstr "beállítások"
#: models.py:364
#: models.py:410
msgid "Clone of"
msgstr "Másolat erről: "
#: models.py:437
#: models.py:476 models.py:480 models.py:486
msgid "Inherit"
msgstr "Öröklés"
#: models.py:499
msgid "display on load"
msgstr "megjelenítés betöltéskor"
#: models.py:438
#: models.py:500
msgid "Display this layer on load."
msgstr "Réteg megjelenítése betöltéskor"
#: templates/404.html:8
msgid "Take me to the home page"
msgstr "Vissza a kezdőlapra"
#: settings/base.py:295
msgid "Art and Culture"
msgstr ""
#: templates/auth/user_detail.html:8
#: settings/base.py:296
msgid "Cycling"
msgstr ""
#: settings/base.py:297
msgid "Business"
msgstr ""
#: settings/base.py:298
msgid "Environment"
msgstr ""
#: settings/base.py:299
msgid "Education"
msgstr ""
#: settings/base.py:300
msgid "Food and Agriculture"
msgstr ""
#: settings/base.py:301
msgid "Geopolitics"
msgstr ""
#: settings/base.py:302
msgid "Health"
msgstr ""
#: settings/base.py:303
msgid "Hiking"
msgstr ""
#: settings/base.py:304
msgid "History"
msgstr ""
#: settings/base.py:305
msgid "Public sector"
msgstr ""
#: settings/base.py:306
msgid "Science"
msgstr ""
#: settings/base.py:307
msgid "Shopping"
msgstr ""
#: settings/base.py:308
msgid "Sport and Leisure"
msgstr ""
#: settings/base.py:309
msgid "Travel"
msgstr ""
#: settings/base.py:310
msgid "Transports"
msgstr ""
#: settings/base.py:311
msgid "Tourism"
msgstr ""
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr "A térképekhez tartozó engedélyek kezeléséről szóló <a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" target=\"_blank\">dokumentációt itt találod</a>."
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr "← Ugrás a főoldalra"
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr "404 hiba: ez az oldal nem található. Eltévedtél a térképek között"
#: templates/auth/user_detail.html:6
#, python-format
msgid "%(current_user)ss maps"
msgstr "%(current_user)s térképei"
#: templates/auth/user_detail.html:12
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "%(current_user)s térképeinek böngészése"
#: templates/auth/user_detail.html:17
#: templates/auth/user_detail.html:21
#, python-format
msgid "%(current_user)s has no maps."
msgstr "%(current_user)s felhasználónak nincs térképe."
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
#: templates/auth/user_form.html:6
msgid "My Profile"
msgstr "Profilom"
#: templates/auth/user_form.html:24 templates/umap/team_form.html:25
msgid "Save"
msgstr "Mentés"
#: templates/auth/user_form.html:27
#: templates/auth/user_form.html:30
msgid "Your current providers"
msgstr "Jelenlegi szolgáltatói"
#: templates/auth/user_form.html:39
#: templates/auth/user_form.html:44
msgid "Connect to another provider"
msgstr "Újabb szolgáltató csatlakoztatása"
#: templates/auth/user_form.html:42
#: templates/auth/user_form.html:47
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr "Jó szokás, ha fiókját több szolgáltatóhoz is hozzáköti, ha esetleg az egyik szolgáltató átmenetileg vagy akár véglegesen elérhetetlenné válna."
#: templates/auth/user_stars.html:8
#: templates/auth/user_stars.html:6
#, python-format
msgid "%(current_user)ss starred maps"
msgstr "%(current_user)s megcsillagozott térképei"
#: templates/auth/user_stars.html:12
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr "%(current_user)s megcsillagozott térképeinek böngészése"
#: templates/auth/user_stars.html:17
#: templates/auth/user_stars.html:21
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr "%(current_user)s felhasználónak még nincs megcsillagozott térképe."
@ -191,25 +308,33 @@ msgid ""
"them in your site."
msgstr "A uMap segítségével percek alatt létrehozhat OpenStreetMap-alapú térképrétegeket, amelyeket be is ágyazhat a weboldalába."
#: templates/registration/login.html:6 templates/registration/login.html:45
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "Belépés"
#: templates/registration/login.html:24
msgid "Please log in with your account"
msgstr "Jelentkezzék be a fiókjával"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr "Azonosítsd magad, hogy el tudd menteni a térképet, és később könnyen megtaláld."
#: templates/registration/login.html:41
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr "Jelentkezz be a fiókoddal:"
#: templates/registration/login.html:42
msgid "Username"
msgstr "Felhasználónév"
#: templates/registration/login.html:44
#: templates/registration/login.html:45
msgid "Password"
msgstr "Jelszó"
#: templates/registration/login.html:51
msgid "Please choose a provider"
msgstr "Válasszon egy szolgáltatót"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr "Válassz egy szolgáltatót:"
#: templates/umap/about.html:5 templates/umap/navigation.html:22
msgid "About"
msgstr "Névjegy"
#: templates/umap/about_summary.html:12
#, python-format
@ -260,13 +385,13 @@ msgstr "Térkép készítése"
msgid "Play with the demo"
msgstr "Játék a bemutatóval"
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr "Bezárás"
#: templates/umap/components/alerts/alert.html:30
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
@ -274,35 +399,35 @@ msgid ""
"target=\"_blank\">log in</a>."
msgstr "Haladó tipp: ha térképét később szeretné könnyedén megtalálni, <a href=\"%(login_url)s\" target=\"_blank\">hozzon létre egy fiókot</a> vagy <a href=\"%(login_url)s\" target=\"_blank\">jelentkezzék be</a>."
#: templates/umap/components/alerts/alert.html:35
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr "Itt van a térkép szerkesztéséhez vezető titkos link, őrizze meg gondosan:"
#: templates/umap/components/alerts/alert.html:39
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr "Link másolása"
#: templates/umap/components/alerts/alert.html:46
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr "Adja meg az e-mail-címét, hogy megkapja a titkos linket: "
#: templates/umap/components/alerts/alert.html:52
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr "E-mail"
#: templates/umap/components/alerts/alert.html:55
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr "Link elküldése magamnak"
#: templates/umap/components/alerts/alert.html:79
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr "Szerkesztéseik megtekintése egy másik fülön"
#: templates/umap/components/alerts/alert.html:82
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr "Saját szerkesztéseim megőrzése és az övék elvetése"
#: templates/umap/components/alerts/alert.html:85
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr "Az ő szerkesztéseik megőrzése és a sajátjaim elvetése"
@ -350,11 +475,11 @@ msgstr "Térképeim (%(count)s)"
msgid "My Maps"
msgstr "Térképeim"
#: templates/umap/dashboard_menu.html:11
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr "Saját profil"
msgstr "Profilom"
#: templates/umap/dashboard_menu.html:13
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr "Csoportjaim"
@ -362,7 +487,7 @@ msgstr "Csoportjaim"
msgid "Map of the uMaps"
msgstr "uMap-térképek térképe"
#: templates/umap/home.html:24
#: templates/umap/home.html:25
msgid "Get inspired, browse maps"
msgstr "Szerezzen ihletet, böngésszen a térképek között!"
@ -370,15 +495,19 @@ msgstr "Szerezzen ihletet, böngésszen a térképek között!"
msgid "You are logged in. Continuing..."
msgstr "Be van jelentkezve. Továbblépés…"
#: templates/umap/map_list.html:11 views.py:433
#: templates/umap/map_list.html:18 views.py:444
msgid "by"
msgstr " készítette:"
#: templates/umap/map_list.html:20
#: templates/umap/map_list.html:22
msgid "See the map"
msgstr ""
#: templates/umap/map_list.html:28
msgid "More"
msgstr "Még több"
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:18
msgid "Name"
msgstr "Név"
@ -402,7 +531,7 @@ msgstr "Utolsó mentés"
msgid "Owner"
msgstr "Tulajdonos"
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:24
msgid "Actions"
msgstr "Műveletek"
@ -415,7 +544,7 @@ msgid "Share"
msgstr "Megosztás"
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
#: templates/umap/user_teams.html:42 templates/umap/user_teams.html:44
msgid "Edit"
msgstr "Szerkesztés"
@ -478,10 +607,6 @@ msgstr "Bejelentkezés"
msgid "Sign in"
msgstr "Regisztráció"
#: templates/umap/navigation.html:22
msgid "About"
msgstr "Névjegy"
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "Jelszó módosítása"
@ -490,52 +615,58 @@ msgstr "Jelszó módosítása"
msgid "Log out"
msgstr "Kijelentkezés"
#: templates/umap/password_change.html:7
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:11
msgid "Password change"
msgstr "Jelszó módosítása"
#: templates/umap/password_change.html:10
#: templates/umap/password_change.html:14
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "Biztonsági okokból írja be a régi jelszavát, majd adja meg kétszer a kívánt új jelszót!"
#: templates/umap/password_change.html:17
#: templates/umap/password_change.html:21
msgid "Old password"
msgstr "Régi jelszó"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password"
msgstr "Új jelszó"
#: templates/umap/password_change.html:26
#: templates/umap/password_change.html:30
msgid "New password confirmation"
msgstr "Új jelszó ismét"
#: templates/umap/password_change.html:27
#: templates/umap/password_change.html:31
msgid "Change my password"
msgstr "Jelszavam módosítása"
#: templates/umap/password_change_done.html:7
#: templates/umap/password_change_done.html:6
#: templates/umap/password_change_done.html:11
msgid "Password change successful"
msgstr "A jelszómódosítás sikeres"
#: templates/umap/password_change_done.html:10
#: templates/umap/password_change_done.html:14
msgid "Your password was changed."
msgstr "A jelszava megváltozott."
#: templates/umap/search.html:15
#: templates/umap/search.html:6
msgid "Explore maps"
msgstr "Térképek felfedezése"
#: templates/umap/search.html:19
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
msgstr[0] "%(count)s térképet találtunk:"
msgstr[1] "%(count)s térképet találtunk:"
#: templates/umap/search.html:24
#: templates/umap/search.html:30
msgid "No map found."
msgstr "Nem található ilyen térkép."
#: templates/umap/search.html:29
#: templates/umap/search.html:35
msgid "Latest created maps"
msgstr "Legutóbb létrehozott térképek"
@ -543,25 +674,42 @@ msgstr "Legutóbb létrehozott térképek"
msgid "Search maps"
msgstr "Térképek keresése"
#: templates/umap/search_bar.html:15
#: templates/umap/search_bar.html:14
msgid "Any category"
msgstr ""
#: templates/umap/search_bar.html:19
msgid "Search"
msgstr "Keresés"
#: templates/umap/team_detail.html:10
#: templates/umap/team_confirm_delete.html:6
msgid "Team deletion"
msgstr "Csoport törlése"
#: templates/umap/team_detail.html:6
#, python-format
msgid "%(current_team)ss maps"
msgstr "%(current_team)s csoport térképei"
#: templates/umap/team_detail.html:14
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr "%(current_team)s csoport térképeinek böngészése"
#: templates/umap/team_detail.html:22
#: templates/umap/team_detail.html:26
#, python-format
msgid "%(current_team)s has no public maps."
msgstr "%(current_team)s csoportnak nincs nyilvános térképe."
#: templates/umap/team_form.html:24
#: templates/umap/team_form.html:6
msgid "Create or edit a team"
msgstr "Csoport létrehozása vagy szerkesztése"
#: templates/umap/team_form.html:28
msgid "Delete this team"
msgstr "Csoport törlése"
#: templates/umap/team_form.html:47
#: templates/umap/team_form.html:51
msgid "Add user"
msgstr "Felhasználó hozzáadása"
@ -582,11 +730,15 @@ msgstr "%(count)s térkép letöltése"
msgid "You have no map yet."
msgstr "Önnek még nincs térképe."
#: templates/umap/user_teams.html:17
#: templates/umap/user_teams.html:6
msgid "My Teams"
msgstr "Csoportjaim"
#: templates/umap/user_teams.html:21
msgid "Users"
msgstr "Felhasználók"
#: templates/umap/user_teams.html:48
#: templates/umap/user_teams.html:52
msgid "New team"
msgstr "Új csoport"
@ -599,61 +751,61 @@ msgstr "Egynél több tagú csoport nem törölhető"
msgid "Team “%(name)s” has been deleted"
msgstr "%(name)s csoport törölve"
#: views.py:438
#: views.py:449
msgid "View the map"
msgstr "Térkép megtekintése"
#: views.py:824
#: views.py:845
msgid "See full screen"
msgstr "Teljes képernyős nézet megtekintése"
#: views.py:953
#: views.py:988
msgid "Map editors updated with success!"
msgstr "A térképszerkesztők sikeresen frissültek."
#: views.py:989
#: views.py:1024
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr "A térképéhez tartozó uMap szerkesztési link: %(map_name)s"
#: views.py:992
#: views.py:1027
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr "Az Ön titkos szerkesztési linkje: %(link)s"
#: views.py:999
#: views.py:1034
#, python-format
msgid "Can't send email to %(email)s"
msgstr "Nem sikerül e-mailt küldeni ide: %(email)s"
#: views.py:1002
#: views.py:1037
#, python-format
msgid "Email sent to %(email)s"
msgstr "E-mail elküldve ide: %(email)s"
#: views.py:1013
#: views.py:1048
msgid "Only its owner can delete the map."
msgstr "A térképet csak a tulajdonosa törölheti."
#: views.py:1016
#: views.py:1051
msgid "Map successfully deleted."
msgstr "Térkép sikeresen törölve."
#: views.py:1042
#: views.py:1077
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "Elkészült a térképe másolata. Ha egy másik számítógépről szeretné szerkeszteni, ezt a linket használja: %(anonymous_url)s"
#: views.py:1047
#: views.py:1082
msgid "Congratulations, your map has been cloned!"
msgstr "Gratulálunk, elkészült a térképe másolata!"
#: views.py:1282
#: views.py:1336
msgid "Layer successfully deleted."
msgstr "A réteg sikeresen törlődött."
#: views.py:1304
#: views.py:1358
msgid "Permissions updated with success!"
msgstr "Az engedélyek sikeresen frissültek!"

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

View file

@ -8,10 +8,10 @@
# Marco <marcxosm@gmail.com>, 2017
# lucacorsato <lucors@gmail.com>, 2014
# lucacorsato <lucors@gmail.com>, 2014
# Marco <marcxosm@gmail.com>, 2017-2019,2024
# Marco <marcxosm@gmail.com>, 2017-2019,2024-2025
# Marco <marcxosm@gmail.com>, 2018
# Maurizio Napolitano <maurizio.napolitano@okfn.org>, 2013,2017,2023
# Maurizio Napolitano <napo@fbk.eu>, 2024
# Maurizio Napolitano <napo@fbk.eu>, 2024-2025
# Mirco Zorzo <mircozorzo@gmail.com>, 2020
# Mirco Zorzo <mircozorzo@gmail.com>, 2020
# claudiamocci <moccicm@gmail.com>, 2013
@ -21,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-30 18:23+0000\n"
"POT-Creation-Date: 2025-03-03 17:36+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: Maurizio Napolitano <napo@fbk.eu>, 2024\n"
"Last-Translator: Marco <marcxosm@gmail.com>, 2017-2019,2024-2025\n"
"Language-Team: Italian (http://app.transifex.com/openstreetmap/umap/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -31,168 +31,217 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "Modificabile solo con il link segreto"
#: admin.py:16
msgid "CSV Export"
msgstr "Esporta CSV"
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "Chiunque può modificare"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr "La mappa non è disponibile pubblicamente"
#: forms.py:69 models.py:423
msgid "Inherit"
msgstr "Inherit"
#: middleware.py:13
#: middleware.py:19
msgid "Site is readonly for maintenance"
msgstr "Il sito in sola lettura per manutenzione"
#: models.py:54 models.py:73
#: middleware.py:34
#, python-format
msgid ""
"Using “%(name)s” to authenticate is deprecated and will be removed soon. "
"Please configure another provider below before losing access to your account"
" and maps."
msgstr ""
#: models.py:60 models.py:79
msgid "name"
msgstr "nome"
#: models.py:56 models.py:433
#: models.py:62 models.py:485
msgid "description"
msgstr "descrizione"
#: models.py:104
#: models.py:110
msgid "details"
msgstr "dettagli"
#: models.py:105
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr "Link alla pagina con i dettagli della licenza"
#: models.py:115
#: models.py:121
msgid "URL template using OSM tile format"
msgstr "Modello dell'URL usando il formato delle tile OSM"
#: models.py:121
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr "Ordine degli sfondi (tilelayers) nel box di modifica"
#: models.py:167 models.py:424
#: models.py:175 models.py:479
msgid "Only editable with secret edit link"
msgstr "Modificabile solo con il link segreto"
#: models.py:176 models.py:480
msgid "Everyone can edit"
msgstr "Chiunque può modificare"
#: models.py:179 models.py:473
msgid "Everyone"
msgstr "Chiunque"
#: models.py:168 models.py:174 models.py:425
#: models.py:180 models.py:189 models.py:474
msgid "Editors and team only"
msgstr ""
msgstr "Soltanto editor e team"
#: models.py:169 models.py:426
#: models.py:181 models.py:475
msgid "Owner only"
msgstr "Solo chi ha la proprietà"
#: models.py:172
#: models.py:184
msgid "Draft (private)"
msgstr "Bozza (privata)"
#: models.py:185
msgid "Everyone (public)"
msgstr "Chiunque (pubblico)"
#: models.py:173
#: models.py:188
msgid "Anyone with link"
msgstr "Chiunque abbia il link"
#: models.py:175
#: models.py:190
msgid "Blocked"
msgstr "Bloccata"
#: models.py:178
#: models.py:191 models.py:469
msgid "Deleted"
msgstr "Eliminato"
#: models.py:194
msgid "center"
msgstr "centra"
#: models.py:179
#: models.py:195
msgid "zoom"
msgstr "zoom"
#: models.py:181
#: models.py:197
msgid "locate"
msgstr "localizza"
#: models.py:181
#: models.py:197
msgid "Locate user on load?"
msgstr "Geolocalizzare l'utente al caricamento?"
#: models.py:185
#: models.py:201
msgid "Choose the map licence."
msgstr "Scegliere una licenza per la mappa."
#: models.py:186
#: models.py:202
msgid "licence"
msgstr "licenza"
#: models.py:197
#: models.py:213
msgid "owner"
msgstr "proprietario"
#: models.py:201
#: models.py:217
msgid "editors"
msgstr "contributore"
#: models.py:207
#: models.py:223
msgid "team"
msgstr ""
msgstr "team"
#: models.py:213 models.py:447
#: models.py:229 models.py:501
msgid "edit status"
msgstr "stato della modifica"
#: models.py:218
#: models.py:234 models.py:506
msgid "share status"
msgstr "stato condivisione"
#: models.py:221 models.py:442
#: models.py:237 models.py:496
msgid "settings"
msgstr "impostazioni"
#: models.py:364
#: models.py:407
msgid "Clone of"
msgstr "Duplicata da "
#: models.py:437
#: models.py:468 models.py:472 models.py:478
msgid "Inherit"
msgstr "Inherit"
#: models.py:491
msgid "display on load"
msgstr "mostra al caricamento"
#: models.py:438
#: models.py:492
msgid "Display this layer on load."
msgstr "Visualizza questo layer al caricamento."
#: templates/404.html:8
msgid "Take me to the home page"
msgstr "Vai alla pagina principale"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr "<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" target=\"_blank\">Qui si trova la documentazione</a>su come gestire i permessi delle mappe."
#: templates/auth/user_detail.html:8
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr "← Torna alla pagina principale"
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr "404 Pagina Non Trovata"
#: templates/auth/user_detail.html:6
#, python-format
msgid "%(current_user)ss maps"
msgstr "Mappe di %(current_user)s"
#: templates/auth/user_detail.html:12
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "Vedi le mappe di %(current_user)s"
#: templates/auth/user_detail.html:17
#: templates/auth/user_detail.html:21
#, python-format
msgid "%(current_user)s has no maps."
msgstr "%(current_user)s non ha mappe."
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
#: templates/auth/user_form.html:6
msgid "My Profile"
msgstr "Il mio profilo"
#: templates/auth/user_form.html:24 templates/umap/team_form.html:25
msgid "Save"
msgstr "Salva"
#: templates/auth/user_form.html:27
#: templates/auth/user_form.html:30
msgid "Your current providers"
msgstr "I tuoi fornitori attuali"
#: templates/auth/user_form.html:39
#: templates/auth/user_form.html:44
msgid "Connect to another provider"
msgstr "Collegati ad un altro fornitore"
#: templates/auth/user_form.html:42
#: templates/auth/user_form.html:47
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr "È una buona abitudine connettere il tuo account a più di un fornitore, nel caso in cui un fornitore diventi non disponibile, temporaneamente o addirittura permanentemente."
#: templates/auth/user_stars.html:8
#: templates/auth/user_stars.html:6
#, python-format
msgid "%(current_user)ss starred maps"
msgstr ""
#: templates/auth/user_stars.html:12
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr "Sfoglia le mappe selezionate da %(current_user)s"
#: templates/auth/user_stars.html:17
#: templates/auth/user_stars.html:21
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr "%(current_user)snon ha ancora selezionato mappe"
@ -203,26 +252,34 @@ msgid ""
"them in your site."
msgstr "uMap ti permette di creare mappe con OpenStreetMap come sfondo in un minuto e di integrarle nel tuo sito."
#: templates/registration/login.html:6 templates/registration/login.html:45
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "Login"
#: templates/registration/login.html:24
msgid "Please log in with your account"
msgstr "Accedi con il tuo account"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr "Identificati per salva re e trovare facilmente le tue mappe"
#: templates/registration/login.html:41
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr "Accedi al sito con il tuo account:"
#: templates/registration/login.html:42
msgid "Username"
msgstr "Nome utente"
#: templates/registration/login.html:44
#: templates/registration/login.html:45
msgid "Password"
msgstr "Password"
#: templates/registration/login.html:51
msgid "Please choose a provider"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr "Scegli un fornitore"
#: templates/umap/about.html:5 templates/umap/navigation.html:22
msgid "About"
msgstr "Informazioni"
#: templates/umap/about_summary.html:12
#, python-format
msgid ""
@ -272,51 +329,51 @@ msgstr "Crea una mappa"
msgid "Play with the demo"
msgstr "Gioca con la demo"
#: templates/umap/components/alerts/alert.html:15
#: templates/umap/components/alerts/alert.html:64
#: templates/umap/components/alerts/alert.html:92
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr ""
msgstr "Chiudi"
#: templates/umap/components/alerts/alert.html:30
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
"target=\"_blank\">create an account</a> or <a href=\"%(login_url)s\" "
"target=\"_blank\">log in</a>."
msgstr ""
msgstr "Pro-tip: per trovare facilmente le tue mappe, <a href=\"%(login_url)s\" target=\"_blank\">crea un account</a> o <a href=\"%(login_url)s\" target=\"_blank\">effettua il log in</a>."
#: templates/umap/components/alerts/alert.html:35
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr ""
msgstr "Ecco il tuo link segreto per modificare la mappa, fa attenzione a tenerlo al sicuro:"
#: templates/umap/components/alerts/alert.html:39
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr ""
msgstr "Copia link"
#: templates/umap/components/alerts/alert.html:46
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr ""
msgstr "Fornisci la tua email per ricevere il link segreto:"
#: templates/umap/components/alerts/alert.html:52
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr ""
msgstr "Email"
#: templates/umap/components/alerts/alert.html:55
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr ""
msgstr "Inviami il link"
#: templates/umap/components/alerts/alert.html:79
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr ""
msgstr "Vedi le loro modifiche in un'altra scheda"
#: templates/umap/components/alerts/alert.html:82
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr ""
msgstr "Mantieni i tuoi cambiamenti e perdi i precedenti"
#: templates/umap/components/alerts/alert.html:85
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr ""
msgstr "Mantieni i loro cambiamenti e perdi i tuoi"
#: templates/umap/content.html:26
msgid ""
@ -335,19 +392,19 @@ msgstr "Questa è una demo da utilizzare solo per test e prototipi. Qualora sia
#: templates/umap/content_footer.html:5
msgid "An OpenStreetMap project"
msgstr ""
msgstr "Un progetto OpenStreetMap"
#: templates/umap/content_footer.html:6
msgid "version"
msgstr ""
msgstr "versione"
#: templates/umap/content_footer.html:7
msgid "Hosted by"
msgstr ""
msgstr "Ospitato da"
#: templates/umap/content_footer.html:8
msgid "Contact"
msgstr ""
msgstr "Contatto"
#: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
msgid "Help"
@ -362,13 +419,13 @@ msgstr "Le mie mappe (%(count)s)"
msgid "My Maps"
msgstr "Le mie mappe"
#: templates/umap/dashboard_menu.html:11
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr "Mio profilo"
#: templates/umap/dashboard_menu.html:13
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr ""
msgstr "I miei team"
#: templates/umap/home.html:14
msgid "Map of the uMaps"
@ -382,15 +439,15 @@ msgstr "Prendi ispirazione, visualizza mappe"
msgid "You are logged in. Continuing..."
msgstr "Utente loggato. Continuare..."
#: templates/umap/map_list.html:10 views.py:433
#: templates/umap/map_list.html:11 views.py:437
msgid "by"
msgstr "di"
#: templates/umap/map_list.html:18
#: templates/umap/map_list.html:20
msgid "More"
msgstr "Altre mappe"
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:18
msgid "Name"
msgstr "Nome"
@ -414,7 +471,7 @@ msgstr "Ultimo salvataggio"
msgid "Owner"
msgstr "Proprietario"
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:24
msgid "Actions"
msgstr "Azioni"
@ -427,7 +484,7 @@ msgid "Share"
msgstr "Condividi"
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
#: templates/umap/user_teams.html:42 templates/umap/user_teams.html:44
msgid "Edit"
msgstr "Modifica"
@ -490,10 +547,6 @@ msgstr "Accedi"
msgid "Sign in"
msgstr "Registrati"
#: templates/umap/navigation.html:22
msgid "About"
msgstr "Informazioni"
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "Cambia password"
@ -502,41 +555,47 @@ msgstr "Cambia password"
msgid "Log out"
msgstr "Esci"
#: templates/umap/password_change.html:7
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:11
msgid "Password change"
msgstr "Cambia password"
#: templates/umap/password_change.html:10
#: templates/umap/password_change.html:14
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "Per motivi di sicurezza inserire la vecchia password, poi inserire quella nuova due volte così da verificare che sia stata scritta correttamente"
#: templates/umap/password_change.html:17
#: templates/umap/password_change.html:21
msgid "Old password"
msgstr "Password vecchia"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password"
msgstr "Nuova password"
#: templates/umap/password_change.html:26
#: templates/umap/password_change.html:30
msgid "New password confirmation"
msgstr "Conferma della nuova password"
#: templates/umap/password_change.html:27
#: templates/umap/password_change.html:31
msgid "Change my password"
msgstr "Cambia la mia password"
#: templates/umap/password_change_done.html:7
#: templates/umap/password_change_done.html:6
#: templates/umap/password_change_done.html:11
msgid "Password change successful"
msgstr "Cambio della password effettuato con successo!"
#: templates/umap/password_change_done.html:10
#: templates/umap/password_change_done.html:14
msgid "Your password was changed."
msgstr "La tua password è stata cambiata."
#: templates/umap/search.html:15
#: templates/umap/search.html:6
msgid "Explore maps"
msgstr "Esplora mappe"
#: templates/umap/search.html:19
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
@ -544,11 +603,11 @@ msgstr[0] "%(count)s mappa trovata"
msgstr[1] "%(count)s mappe trovate"
msgstr[2] "%(count)s mappe trovate:"
#: templates/umap/search.html:24
#: templates/umap/search.html:28
msgid "No map found."
msgstr "Nessuna mappa trovata."
#: templates/umap/search.html:29
#: templates/umap/search.html:33
msgid "Latest created maps"
msgstr "Ultime mappe create"
@ -556,27 +615,40 @@ msgstr "Ultime mappe create"
msgid "Search maps"
msgstr "Cerca mappe"
#: templates/umap/search_bar.html:15
#: templates/umap/search_bar.html:16
msgid "Search"
msgstr "Cerca"
#: templates/umap/team_detail.html:10
#: templates/umap/team_confirm_delete.html:6
msgid "Team deletion"
msgstr ""
#: templates/umap/team_detail.html:6
#, python-format
msgid "%(current_team)ss maps"
msgstr ""
#: templates/umap/team_detail.html:14
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr ""
msgstr "Sfoglia mappe team %(current_team)s"
#: templates/umap/team_detail.html:22
#: templates/umap/team_detail.html:26
#, python-format
msgid "%(current_team)s has no public maps."
msgstr ""
msgstr "%(current_team)snon ha mappe pubbliche"
#: templates/umap/team_form.html:24
#: templates/umap/team_form.html:6
msgid "Create or edit a team"
msgstr "Crea o modifica un team"
#: templates/umap/team_form.html:28
msgid "Delete this team"
msgstr ""
msgstr "Elimina questo team"
#: templates/umap/team_form.html:47
#: templates/umap/team_form.html:51
msgid "Add user"
msgstr ""
msgstr "Aggiungi utente"
#: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
msgid "Search my maps"
@ -595,78 +667,82 @@ msgstr "Scarica %(count)s mappe"
msgid "You have no map yet."
msgstr "Non hai ancora alcuna mappa."
#: templates/umap/user_teams.html:17
#: templates/umap/user_teams.html:6
msgid "My Teams"
msgstr "I miei team"
#: templates/umap/user_teams.html:21
msgid "Users"
msgstr ""
msgstr "Utenti"
#: templates/umap/user_teams.html:48
#: templates/umap/user_teams.html:52
msgid "New team"
msgstr ""
msgstr "Nuovo team"
#: views.py:235
#: views.py:234
msgid "Cannot delete a team with more than one member"
msgstr ""
msgstr "Non si può eliminare un team con più di un membro"
#: views.py:239
#: views.py:238
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr ""
msgstr "il team \"%(name)s\" è stato cancellato"
#: views.py:438
#: views.py:442
msgid "View the map"
msgstr "Visualizza la mappa"
#: views.py:824
#: views.py:838
msgid "See full screen"
msgstr "Vedi a schermo interno"
#: views.py:953
#: views.py:981
msgid "Map editors updated with success!"
msgstr "Aggiornato l'elenco degli editor abilitati alla modifica della mappa!"
#: views.py:989
#: views.py:1017
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr "Link uMap per la modifica della tua mappa: %(map_name)s"
#: views.py:992
#: views.py:1020
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr "Qui il tuo link segreto: %(link)s"
#: views.py:999
#: views.py:1027
#, python-format
msgid "Can't send email to %(email)s"
msgstr "Non riesco ad inviare email a 1%(email)s"
#: views.py:1002
#: views.py:1030
#, python-format
msgid "Email sent to %(email)s"
msgstr "Email inviata a %(email)s"
#: views.py:1013
#: views.py:1041
msgid "Only its owner can delete the map."
msgstr "Solo il proprietario può eliminare la mappa."
#: views.py:1016
#: views.py:1044
msgid "Map successfully deleted."
msgstr ""
msgstr "La mappa è stata eliminata definitivamente."
#: views.py:1042
#: views.py:1070
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "La mappa è stata clonata! Per modificarla usando un altro computer, si deve utilizzare questo link: %(anonymous_url)s"
#: views.py:1047
#: views.py:1075
msgid "Congratulations, your map has been cloned!"
msgstr "Perfetto, la tua mappa è stata clonata!"
#: views.py:1282
#: views.py:1329
msgid "Layer successfully deleted."
msgstr "Layer eliminato correttamente"
#: views.py:1304
#: views.py:1351
msgid "Permissions updated with success!"
msgstr "Autorizzazioni aggiornate con successo!"

Binary file not shown.

View file

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uMap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-15 13:53+0000\n"
"POT-Creation-Date: 2024-12-24 08:39+0000\n"
"PO-Revision-Date: 2013-11-22 14:00+0000\n"
"Last-Translator: tomoya muramoto <muramototomoya@gmail.com>, 2016,2021\n"
"Language-Team: Japanese (http://app.transifex.com/openstreetmap/umap/language/ja/)\n"
@ -19,258 +19,331 @@ msgstr ""
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: forms.py:44 forms.py:70
msgid "Only editable with secret edit link"
msgstr "非公開の編集リンクからのみ編集可能"
#: admin.py:16
msgid "CSV Export"
msgstr ""
#: forms.py:45 forms.py:71
msgid "Everyone can edit"
msgstr "だれでも編集可能"
#: forms.py:69 models.py:371
msgid "Inherit"
#: decorators.py:60
msgid "This map is not publicly available"
msgstr ""
#: middleware.py:13
msgid "Site is readonly for maintenance"
msgstr "メンテナンス中のため現在読み込み専用です。"
#: models.py:50
#: models.py:60 models.py:79
msgid "name"
msgstr "名称"
#: models.py:81
msgid "details"
msgstr "詳細"
#: models.py:82
msgid "Link to a page where the licence is detailed."
msgstr "ライセンス詳細ページへのリンク"
#: models.py:92
msgid "URL template using OSM tile format"
msgstr "OSMタイルフォーマットを利用したURLテンプレート"
#: models.py:98
msgid "Order of the tilelayers in the edit box"
msgstr "編集ボックス内のタイルレイヤ並び順"
#: models.py:144 models.py:372
msgid "Everyone"
msgstr ""
#: models.py:145 models.py:151 models.py:373
msgid "Editors only"
msgstr ""
#: models.py:146 models.py:374
msgid "Owner only"
msgstr ""
#: models.py:149
msgid "Everyone (public)"
msgstr ""
#: models.py:150
msgid "Anyone with link"
msgstr ""
#: models.py:152
msgid "Blocked"
msgstr ""
#: models.py:155 models.py:378
#: models.py:62 models.py:475
msgid "description"
msgstr "概要"
#: models.py:156
#: models.py:110
msgid "details"
msgstr "詳細"
#: models.py:111
msgid "Link to a page where the licence is detailed."
msgstr "ライセンス詳細ページへのリンク"
#: models.py:121
msgid "URL template using OSM tile format"
msgstr "OSMタイルフォーマットを利用したURLテンプレート"
#: models.py:127
msgid "Order of the tilelayers in the edit box"
msgstr "編集ボックス内のタイルレイヤ並び順"
#: models.py:175 models.py:469
msgid "Only editable with secret edit link"
msgstr "非公開の編集リンクからのみ編集可能"
#: models.py:176 models.py:470
msgid "Everyone can edit"
msgstr "だれでも編集可能"
#: models.py:179 models.py:463
msgid "Everyone"
msgstr ""
#: models.py:180 models.py:189 models.py:464
msgid "Editors and team only"
msgstr ""
#: models.py:181 models.py:465
msgid "Owner only"
msgstr ""
#: models.py:184
msgid "Draft (private)"
msgstr ""
#: models.py:185
msgid "Everyone (public)"
msgstr ""
#: models.py:188
msgid "Anyone with link"
msgstr ""
#: models.py:190
msgid "Blocked"
msgstr ""
#: models.py:191
msgid "Deleted"
msgstr ""
#: models.py:194
msgid "center"
msgstr "中心点"
#: models.py:157
#: models.py:195
msgid "zoom"
msgstr "ズーム"
#: models.py:159
#: models.py:197
msgid "locate"
msgstr "現在地"
#: models.py:159
#: models.py:197
msgid "Locate user on load?"
msgstr "読み込み時に現在地を表示?"
#: models.py:163
#: models.py:201
msgid "Choose the map licence."
msgstr "マップのライセンスを選択"
#: models.py:164
#: models.py:202
msgid "licence"
msgstr "ライセンス"
#: models.py:175
#: models.py:213
msgid "owner"
msgstr "所有者"
#: models.py:179
#: models.py:217
msgid "editors"
msgstr "編集者"
#: models.py:184 models.py:392
#: models.py:223
msgid "team"
msgstr ""
#: models.py:229 models.py:491
msgid "edit status"
msgstr "編集ステータス"
#: models.py:189
#: models.py:234
msgid "share status"
msgstr "共有状況"
#: models.py:192 models.py:387
#: models.py:237 models.py:486
msgid "settings"
msgstr "設定"
#: models.py:320
#: models.py:402
msgid "Clone of"
msgstr "複製元"
#: models.py:382
#: models.py:462 models.py:468
msgid "Inherit"
msgstr ""
#: models.py:481
msgid "display on load"
msgstr "読み込み時に表示"
#: models.py:383
#: models.py:482
msgid "Display this layer on load."
msgstr "読み込み時にこのレイヤを表示"
#: templates/404.html:6
msgid "Take me to the home page"
msgstr "ホームページに移動"
#: templates/403.html:8
msgid ""
"<a href=\"https://discover.umap-project.org/support/faq/#map-statuses\" "
"target=\"_blank\">Find out here the documentation</a> on how to manage maps"
" permissions."
msgstr ""
#: templates/auth/user_detail.html:5
#: templates/403.html:10 templates/404.html:8
msgid "← Go to the homepage"
msgstr ""
#: templates/404.html:7
msgid "404 Page Not Found"
msgstr ""
#: templates/auth/user_detail.html:8
#, python-format
msgid "Browse %(current_user)s's maps"
msgstr "%(current_user)sのマップを閲覧"
#: templates/auth/user_detail.html:12
#: templates/auth/user_detail.html:17
#, python-format
msgid "%(current_user)s has no maps."
msgstr "%(current_user)s はまだ地図を作成していません。"
#: templates/auth/user_form.html:6
msgid "My Maps"
msgstr ""
#: templates/auth/user_form.html:7
msgid "My Profile"
msgstr ""
#: templates/auth/user_form.html:20
#: templates/auth/user_form.html:21 templates/umap/team_form.html:21
msgid "Save"
msgstr ""
#: templates/auth/user_form.html:25
#: templates/auth/user_form.html:27
msgid "Your current providers"
msgstr ""
#: templates/auth/user_form.html:31
#: templates/auth/user_form.html:39
msgid "Connect to another provider"
msgstr ""
#: templates/auth/user_form.html:33
#: templates/auth/user_form.html:42
msgid ""
"It's a good habit to connect your account to more than one provider, in case"
" one provider becomes unavailable, temporarily or even permanently."
msgstr ""
#: templates/auth/user_stars.html:5
#: templates/auth/user_stars.html:8
#, python-format
msgid "Browse %(current_user)s's starred maps"
msgstr ""
#: templates/auth/user_stars.html:12
#: templates/auth/user_stars.html:17
#, python-format
msgid "%(current_user)s has no starred maps yet."
msgstr ""
#: templates/base.html:12
#: templates/base.html:13
msgid ""
"uMap lets you create maps with OpenStreetMap layers in a minute and embed "
"them in your site."
msgstr ""
#: templates/registration/login.html:16
msgid "Please log in with your account"
msgstr "アカウントでログインしてください"
#: templates/registration/login.html:28
msgid "Username"
msgstr "ユーザー名"
#: templates/registration/login.html:31
msgid "Password"
msgstr "パスワード"
#: templates/registration/login.html:32
#: templates/registration/login.html:6 templates/registration/login.html:46
msgid "Login"
msgstr "ログイン"
#: templates/registration/login.html:37
msgid "Please choose a provider"
msgstr "連携アカウント選択"
#: templates/registration/login.html:22
msgid "To save and easily find your maps, identify yourself."
msgstr ""
#: templates/umap/about_summary.html:11
#: templates/registration/login.html:25
msgid "Please log in with your account:"
msgstr ""
#: templates/registration/login.html:42
msgid "Username"
msgstr "ユーザー名"
#: templates/registration/login.html:45
msgid "Password"
msgstr "パスワード"
#: templates/registration/login.html:52
msgid "Please choose a provider:"
msgstr ""
#: templates/umap/about_summary.html:12
#, python-format
msgid ""
"uMap lets you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
"layers in a minute and embed them in your site."
msgstr "uMapを使うと <a href=\"%(osm_url)s\" />OpenStreetMap</a> レイヤを使った地図を作って、ウェブページに埋め込むことが簡単にできます。"
#: templates/umap/about_summary.html:21
#: templates/umap/about_summary.html:23
msgid "Choose the layers of your map"
msgstr "マップに表示させるレイヤを選択"
#: templates/umap/about_summary.html:22
#: templates/umap/about_summary.html:26
msgid "Add POIs: markers, lines, polygons..."
msgstr "POI: マーカーやライン、ポリゴンなどを追加"
#: templates/umap/about_summary.html:23
#: templates/umap/about_summary.html:29
msgid "Manage POIs colours and icons"
msgstr "POIのアイコンと色を調整"
#: templates/umap/about_summary.html:24
#: templates/umap/about_summary.html:32
msgid "Manage map options: display a minimap, locate user on load…"
msgstr "オプション選択: ミニマップの表示、表示時にユーザの位置へ移動、等々"
#: templates/umap/about_summary.html:25
#: templates/umap/about_summary.html:35
msgid "Batch import geostructured data (geojson, gpx, kml, osm...)"
msgstr "地理データの一括インポート (geojson, gpx, kml, osmなど)"
#: templates/umap/about_summary.html:26
#: templates/umap/about_summary.html:38
msgid "Choose the license for your data"
msgstr "作成したデータのライセンスを選択"
#: templates/umap/about_summary.html:27
#: templates/umap/about_summary.html:41
msgid "Embed and share your map"
msgstr "サイトへのマップ表示と共有"
#: templates/umap/about_summary.html:37
#: templates/umap/about_summary.html:52
#, python-format
msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "uMapは <a href=\"%(repo_url)s\">オープンソース</a>です!"
#: templates/umap/about_summary.html:48 templates/umap/navigation.html:38
#: templates/umap/user_dashboard.html:42
#: templates/umap/about_summary.html:63 templates/umap/navigation.html:39
#: templates/umap/user_dashboard.html:40
msgid "Create a map"
msgstr "マップを作成"
#: templates/umap/about_summary.html:51
#: templates/umap/about_summary.html:66
msgid "Play with the demo"
msgstr "デモを表示"
#: templates/umap/content.html:22
#: templates/umap/components/alerts/alert.html:17
#: templates/umap/components/alerts/alert.html:66
#: templates/umap/components/alerts/alert.html:94
msgid "Close"
msgstr ""
#: templates/umap/components/alerts/alert.html:32
#, python-format
msgid ""
"Pro-tip: to easily find back your maps, <a href=\"%(login_url)s\" "
"target=\"_blank\">create an account</a> or <a href=\"%(login_url)s\" "
"target=\"_blank\">log in</a>."
msgstr ""
#: templates/umap/components/alerts/alert.html:37
msgid "Here is your secret link to edit the map, please keep it safe:"
msgstr ""
#: templates/umap/components/alerts/alert.html:41
msgid "Copy link"
msgstr ""
#: templates/umap/components/alerts/alert.html:48
msgid "Enter your email address to receive the secret link:"
msgstr ""
#: templates/umap/components/alerts/alert.html:54
msgid "Email"
msgstr ""
#: templates/umap/components/alerts/alert.html:57
msgid "Send me the link"
msgstr ""
#: templates/umap/components/alerts/alert.html:81
msgid "See their edits in another tab"
msgstr ""
#: templates/umap/components/alerts/alert.html:84
msgid "Keep your changes and loose theirs"
msgstr ""
#: templates/umap/components/alerts/alert.html:87
msgid "Keep their changes and loose yours"
msgstr ""
#: templates/umap/content.html:26
msgid ""
"This instance of uMap is currently in read only mode, no creation/edit is "
"allowed."
msgstr ""
#: templates/umap/content.html:30
#: templates/umap/content.html:34
#, python-format
msgid ""
"This is a demo instance, used for tests and pre-rolling releases. If you "
@ -279,269 +352,338 @@ msgid ""
"instance, it's <a href=\"%(repo_url)s\">open source</a>!"
msgstr "これはリリース前テストと試運転用のデモサーバです。安定したサーバは<a href=\"%(stable_url)s\">%(stable_url)s</a>を利用してください。uMapは<a href=\"%(repo_url)s\">Open Source</a>ですので、自分でサーバを作ることも可能です!"
#: templates/umap/home.html:8
#: templates/umap/content_footer.html:5
msgid "An OpenStreetMap project"
msgstr ""
#: templates/umap/content_footer.html:6
msgid "version"
msgstr ""
#: templates/umap/content_footer.html:7
msgid "Hosted by"
msgstr ""
#: templates/umap/content_footer.html:8
msgid "Contact"
msgstr ""
#: templates/umap/content_footer.html:9 templates/umap/navigation.html:25
msgid "Help"
msgstr ""
#: templates/umap/dashboard_menu.html:6
#, python-format
msgid "My Maps (%(count)s)"
msgstr ""
#: templates/umap/dashboard_menu.html:8
msgid "My Maps"
msgstr ""
#: templates/umap/dashboard_menu.html:12
msgid "My profile"
msgstr ""
#: templates/umap/dashboard_menu.html:15
msgid "My teams"
msgstr ""
#: templates/umap/home.html:14
msgid "Map of the uMaps"
msgstr "Map of the uMaps"
#: templates/umap/home.html:14
#: templates/umap/home.html:24
msgid "Get inspired, browse maps"
msgstr "Get inspired, browse maps"
#: templates/umap/login_popup_end.html:2
#: templates/umap/login_popup_end.html:4
msgid "You are logged in. Continuing..."
msgstr "ログインしました"
#: templates/umap/map_list.html:9 views.py:341
#: templates/umap/map_list.html:11 views.py:437
msgid "by"
msgstr "by"
#: templates/umap/map_list.html:17
#: templates/umap/map_list.html:20
msgid "More"
msgstr "さらに表示"
#: templates/umap/map_table.html:6
#: templates/umap/map_table.html:8 templates/umap/user_teams.html:14
msgid "Name"
msgstr ""
#: templates/umap/map_table.html:7
#: templates/umap/map_table.html:11
msgid "Preview"
msgstr ""
#: templates/umap/map_table.html:8
#: templates/umap/map_table.html:14
msgid "Who can see"
msgstr ""
#: templates/umap/map_table.html:9
#: templates/umap/map_table.html:17
msgid "Who can edit"
msgstr ""
#: templates/umap/map_table.html:10
#: templates/umap/map_table.html:20
msgid "Last save"
msgstr ""
#: templates/umap/map_table.html:11
#: templates/umap/map_table.html:23
msgid "Owner"
msgstr ""
#: templates/umap/map_table.html:12
#: templates/umap/map_table.html:26 templates/umap/user_teams.html:20
msgid "Actions"
msgstr ""
#: templates/umap/map_table.html:25 templates/umap/map_table.html:27
#: templates/umap/map_table.html:41 templates/umap/map_table.html:43
msgid "Open preview"
msgstr ""
#: templates/umap/map_table.html:46 templates/umap/map_table.html:48
#: templates/umap/map_table.html:72 templates/umap/map_table.html:74
msgid "Share"
msgstr ""
#: templates/umap/map_table.html:51 templates/umap/map_table.html:53
#: templates/umap/map_table.html:78 templates/umap/map_table.html:80
#: templates/umap/user_teams.html:38 templates/umap/user_teams.html:40
msgid "Edit"
msgstr ""
#: templates/umap/map_table.html:56 templates/umap/map_table.html:58
#: templates/umap/map_table.html:84 templates/umap/map_table.html:86
msgid "Download"
msgstr ""
#: templates/umap/map_table.html:63 templates/umap/map_table.html:65
#: templates/umap/map_table.html:90 templates/umap/map_table.html:92
msgid "Clone"
msgstr ""
#: templates/umap/map_table.html:73 templates/umap/map_table.html:75
#: templates/umap/map_table.html:101 templates/umap/map_table.html:103
msgid "Delete"
msgstr ""
#: templates/umap/map_table.html:88
#: templates/umap/map_table.html:117
msgid "first"
msgstr ""
#: templates/umap/map_table.html:89
#: templates/umap/map_table.html:118
msgid "previous"
msgstr ""
#: templates/umap/map_table.html:98
#: templates/umap/map_table.html:126
#, python-format
msgid "Page %(maps_number)s of %(num_pages)s"
msgstr ""
#: templates/umap/map_table.html:104
#: templates/umap/map_table.html:131
msgid "next"
msgstr ""
#: templates/umap/map_table.html:105
#: templates/umap/map_table.html:132
msgid "last"
msgstr ""
#: templates/umap/map_table.html:113
#: templates/umap/map_table.html:140
#, python-format
msgid "Lines per page: %(per_page)s"
msgstr ""
#: templates/umap/map_table.html:118
#: templates/umap/map_table.html:145
#, python-format
msgid "%(count)s maps"
msgstr ""
#: templates/umap/navigation.html:10 templates/umap/user_dashboard.html:4
#: templates/umap/navigation.html:11 templates/umap/user_dashboard.html:6
msgid "My Dashboard"
msgstr ""
#: templates/umap/navigation.html:13
#: templates/umap/navigation.html:14
msgid "Starred maps"
msgstr ""
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Log in"
msgstr "ログイン"
#: templates/umap/navigation.html:17
#: templates/umap/navigation.html:18
msgid "Sign in"
msgstr "サインイン"
#: templates/umap/navigation.html:21
#: templates/umap/navigation.html:22
msgid "About"
msgstr "uMapについて"
#: templates/umap/navigation.html:24
msgid "Help"
msgstr ""
#: templates/umap/navigation.html:29
#: templates/umap/navigation.html:30
msgid "Change password"
msgstr "パスワードを変更"
#: templates/umap/navigation.html:33
#: templates/umap/navigation.html:34
msgid "Log out"
msgstr "ログアウト"
#: templates/umap/password_change.html:4
#: templates/umap/password_change.html:7
msgid "Password change"
msgstr "パスワードを変更"
#: templates/umap/password_change.html:6
#: templates/umap/password_change.html:10
msgid ""
"Please enter your old password, for security's sake, and then enter your new"
" password twice so we can verify you typed it in correctly."
msgstr "セキュリティ確認のため、古いパスワードを入力してください。次に、入力ミスがないように、新しいパスワードを2回入力してください。"
#: templates/umap/password_change.html:13
#: templates/umap/password_change.html:17
msgid "Old password"
msgstr "古いパスワード"
#: templates/umap/password_change.html:18
#: templates/umap/password_change.html:22
msgid "New password"
msgstr "新しいパスワード"
#: templates/umap/password_change.html:22
#: templates/umap/password_change.html:26
msgid "New password confirmation"
msgstr "新しいパスワードの確認"
#: templates/umap/password_change.html:23
#: templates/umap/password_change.html:27
msgid "Change my password"
msgstr "パスワードを変更"
#: templates/umap/password_change_done.html:4
#: templates/umap/password_change_done.html:7
msgid "Password change successful"
msgstr "パスワード変更に成功"
#: templates/umap/password_change_done.html:5
#: templates/umap/password_change_done.html:10
msgid "Your password was changed."
msgstr "パスワードは変更されました"
#: templates/umap/search.html:10
#: templates/umap/search.html:15
#, python-format
msgid "%(count)s map found:"
msgid_plural "%(count)s maps found:"
msgstr[0] ""
#: templates/umap/search.html:18
#: templates/umap/search.html:24
msgid "No map found."
msgstr ""
#: templates/umap/search.html:21
#: templates/umap/search.html:29
msgid "Latest created maps"
msgstr ""
#: templates/umap/search_bar.html:3
#: templates/umap/search_bar.html:4
msgid "Search maps"
msgstr "地図を検索"
#: templates/umap/search_bar.html:14
#: templates/umap/search_bar.html:15
msgid "Search"
msgstr "検索"
#: templates/umap/user_dashboard.html:7 templates/umap/user_dashboard.html:26
#: templates/umap/team_detail.html:10
#, python-format
msgid "Browse %(current_team)s's maps"
msgstr ""
#: templates/umap/team_detail.html:22
#, python-format
msgid "%(current_team)s has no public maps."
msgstr ""
#: templates/umap/team_form.html:24
msgid "Delete this team"
msgstr ""
#: templates/umap/team_form.html:47
msgid "Add user"
msgstr ""
#: templates/umap/user_dashboard.html:9 templates/umap/user_dashboard.html:25
msgid "Search my maps"
msgstr ""
#: templates/umap/user_dashboard.html:11
#, python-format
msgid "My Maps (%(count)s)"
msgstr ""
#: templates/umap/user_dashboard.html:13
msgid "My profile"
msgstr ""
#: templates/umap/user_dashboard.html:21 templates/umap/user_dashboard.html:23
#: templates/umap/user_dashboard.html:17 templates/umap/user_dashboard.html:22
msgid "Maps title"
msgstr ""
#: templates/umap/user_dashboard.html:32
#: templates/umap/user_dashboard.html:30
#, python-format
msgid "Download %(count)s maps"
msgstr ""
#: templates/umap/user_dashboard.html:42
#: templates/umap/user_dashboard.html:40
msgid "You have no map yet."
msgstr ""
#: views.py:346
#: templates/umap/user_teams.html:17
msgid "Users"
msgstr ""
#: templates/umap/user_teams.html:48
msgid "New team"
msgstr ""
#: views.py:234
msgid "Cannot delete a team with more than one member"
msgstr ""
#: views.py:238
#, python-format
msgid "Team “%(name)s” has been deleted"
msgstr ""
#: views.py:442
msgid "View the map"
msgstr "マップ表示"
#: views.py:704
#: views.py:825
msgid "See full screen"
msgstr ""
#: views.py:803
#: views.py:968
msgid "Map editors updated with success!"
msgstr "マップ編集者の更新が完了しました!"
#: views.py:841
#: views.py:1004
#, python-format
msgid "The uMap edit link for your map: %(map_name)s"
msgstr ""
#: views.py:844
#: views.py:1007
#, python-format
msgid "Here is your secret edit link: %(link)s"
msgstr ""
#: views.py:850
#: views.py:1014
#, python-format
msgid "Can't send email to %(email)s"
msgstr ""
#: views.py:1017
#, python-format
msgid "Email sent to %(email)s"
msgstr ""
#: views.py:861
#: views.py:1028
msgid "Only its owner can delete the map."
msgstr "マップを削除できるのは所有者だけです"
#: views.py:889
#: views.py:1031
msgid "Map successfully deleted."
msgstr ""
#: views.py:1057
#, python-format
msgid ""
"Your map has been cloned! If you want to edit this map from another "
"computer, please use this link: %(anonymous_url)s"
msgstr "マップの複製が完了しました! このマップを他の端末から編集する場合、以下のリンクを使用してください: %(anonymous_url)s"
#: views.py:894
#: views.py:1062
msgid "Congratulations, your map has been cloned!"
msgstr "マップの複製が完了しました!"
#: views.py:1130
#: views.py:1313
msgid "Layer successfully deleted."
msgstr "レイヤ削除完了"
#: views.py:1152
#: views.py:1335
msgid "Permissions updated with success!"
msgstr ""

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show more