{{ 'WHERE.PLACE_LABEL' | translate }}
-
+ {{ 'WHERE.MY_PIN' | translate }}
@for (place of places.named(); track place.label) {
{{ place.label }}
}
+
+ add_location_alt
+ {{ 'WHERE.ADD_PLACE' | translate }}
+
diff --git a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/app/shared/components/where-sheet/where-sheet.component.ts b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/app/shared/components/where-sheet/where-sheet.component.ts
index 48feb64d..4e954140 100644
Binary files a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/app/shared/components/where-sheet/where-sheet.component.ts and b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/app/shared/components/where-sheet/where-sheet.component.ts differ
diff --git a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/da.json b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/da.json
index 654abbe4..05602b6b 100644
--- a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/da.json
+++ b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/da.json
@@ -1723,6 +1723,8 @@
"LAST_PAGE": "Sidste side"
},
"WHERE": {
+ "PLACES_EMPTY_TITLE": "Ingen steder endnu",
+ "PIN_UNSET": "Ikke angivet",
"PLACES_PAGE_DESC": "Navngivne punkter, dine beskeder kan rettes mod i stedet for din position.",
"ADD_PLACE": "Tilføj et sted",
"AREAS_LABEL": "Områder",
@@ -1734,7 +1736,7 @@
"NAME_PLACE_TITLE": "Navngiv stedet",
"NEAR_PIN": "Inden for {{distance}} km fra min position",
"NEAR_PLACE": "Inden for {{distance}} km fra {{place}}",
- "NO_PLACES": "Du har ikke gemt nogen steder endnu. Tilføj et fra positionsmenuen.",
+ "NO_PLACES": "Ingen steder endnu. Tilføj et nedenfor for at rette beskeden et andet sted hen end din position.",
"ONLY_IN": "Kun i {{areas}}",
"OPTION_AREAS": "Kun i bestemte områder",
"OPTION_NEAR": "Nær et punkt",
diff --git a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/de.json b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/de.json
index a9facc61..10915eed 100644
--- a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/de.json
+++ b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/de.json
@@ -1723,6 +1723,8 @@
"LAST_PAGE": "Letzte Seite"
},
"WHERE": {
+ "PLACES_EMPTY_TITLE": "Noch keine Orte",
+ "PIN_UNSET": "Nicht gesetzt",
"PLACES_PAGE_DESC": "Benannte Punkte, auf die deine Meldungen statt auf deinen Standort ausgerichtet werden können.",
"ADD_PLACE": "Ort hinzufügen",
"AREAS_LABEL": "Gebiete",
@@ -1734,7 +1736,7 @@
"NAME_PLACE_TITLE": "Ort benennen",
"NEAR_PIN": "Im Umkreis von {{distance}} km um meinen Standort",
"NEAR_PLACE": "Im Umkreis von {{distance}} km um {{place}}",
- "NO_PLACES": "Du hast noch keine Orte gespeichert. Füge einen im Standortmenü hinzu.",
+ "NO_PLACES": "Noch keine Orte. Füge unten einen hinzu, um diese Meldung woandershin als an deinen Standort zu richten.",
"ONLY_IN": "Nur in {{areas}}",
"OPTION_AREAS": "Nur in bestimmten Gebieten",
"OPTION_NEAR": "In der Nähe eines Punktes",
diff --git a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/en.json b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/en.json
index ad1f0068..8f3f1bd9 100644
--- a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/en.json
+++ b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/en.json
@@ -1723,6 +1723,8 @@
"LAST_PAGE": "Last page"
},
"WHERE": {
+ "PLACES_EMPTY_TITLE": "No places yet",
+ "PIN_UNSET": "Not set",
"PLACES_PAGE_DESC": "Named points your alerts can be aimed at, instead of your pin.",
"EDIT_FROM_CARD": "Change this from the card.",
"MEASURED_FROM": "Measured from",
@@ -1749,7 +1751,7 @@
"AREAS_LABEL": "Areas",
"AREA_LIST_MORE": "{{areas}} and {{count}} more",
"NEAR_PLACE": "Within {{distance}} km of {{place}}",
- "NO_PLACES": "You have not saved any places yet. Add one from the location menu.",
+ "NO_PLACES": "No places yet. Add one below to aim this alert somewhere other than your pin.",
"ONLY_IN": "Only in {{areas}}",
"OPTION_AREAS": "Only in specific areas",
"OPTION_NEAR": "Near a point",
diff --git a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/es.json b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/es.json
index e7cf2f1a..2054f3fa 100644
--- a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/es.json
+++ b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/es.json
@@ -1723,6 +1723,8 @@
"LAST_PAGE": "Última página"
},
"WHERE": {
+ "PLACES_EMPTY_TITLE": "Todavía no hay lugares",
+ "PIN_UNSET": "Sin definir",
"PLACES_PAGE_DESC": "Puntos con nombre a los que puedes dirigir tus alertas en vez de a tu ubicación.",
"ADD_PLACE": "Añadir un lugar",
"AREAS_LABEL": "Áreas",
@@ -1734,7 +1736,7 @@
"NAME_PLACE_TITLE": "Nombrar este lugar",
"NEAR_PIN": "A menos de {{distance}} km de mi ubicación",
"NEAR_PLACE": "A menos de {{distance}} km de {{place}}",
- "NO_PLACES": "Aún no has guardado ningún lugar. Añade uno desde el menú de ubicación.",
+ "NO_PLACES": "Todavía no hay lugares. Añade uno abajo para dirigir esta alerta fuera de tu ubicación.",
"ONLY_IN": "Solo en {{areas}}",
"OPTION_AREAS": "Solo en áreas concretas",
"OPTION_NEAR": "Cerca de un punto",
diff --git a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/fr.json b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/fr.json
index 371368b5..058327ee 100644
--- a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/fr.json
+++ b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/fr.json
@@ -1723,6 +1723,8 @@
"LAST_PAGE": "Dernière page"
},
"WHERE": {
+ "PLACES_EMPTY_TITLE": "Aucun lieu pour l'instant",
+ "PIN_UNSET": "Non définie",
"PLACES_PAGE_DESC": "Des points nommés vers lesquels diriger vos alertes, au lieu de votre position.",
"ADD_PLACE": "Ajouter un lieu",
"AREAS_LABEL": "Zones",
@@ -1734,7 +1736,7 @@
"NAME_PLACE_TITLE": "Nommer ce lieu",
"NEAR_PIN": "À moins de {{distance}} km de ma position",
"NEAR_PLACE": "À moins de {{distance}} km de {{place}}",
- "NO_PLACES": "Vous n'avez encore enregistré aucun lieu. Ajoutez-en un depuis le menu de position.",
+ "NO_PLACES": "Aucun lieu pour l'instant. Ajoutez-en un ci-dessous pour diriger cette alerte ailleurs que vers votre position.",
"ONLY_IN": "Uniquement dans {{areas}}",
"OPTION_AREAS": "Uniquement dans certaines zones",
"OPTION_NEAR": "Près d'un point",
diff --git a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/it.json b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/it.json
index 20642ce1..75ddb580 100644
--- a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/it.json
+++ b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/it.json
@@ -1723,6 +1723,8 @@
"LAST_PAGE": "Ultima pagina"
},
"WHERE": {
+ "PLACES_EMPTY_TITLE": "Nessun luogo per ora",
+ "PIN_UNSET": "Non impostata",
"PLACES_PAGE_DESC": "Punti con un nome a cui puntare i tuoi avvisi, al posto della tua posizione.",
"ADD_PLACE": "Aggiungi un luogo",
"AREAS_LABEL": "Aree",
@@ -1734,7 +1736,7 @@
"NAME_PLACE_TITLE": "Dai un nome a questo luogo",
"NEAR_PIN": "Entro {{distance}} km dalla mia posizione",
"NEAR_PLACE": "Entro {{distance}} km da {{place}}",
- "NO_PLACES": "Non hai ancora salvato nessun luogo. Aggiungine uno dal menu posizione.",
+ "NO_PLACES": "Nessun luogo per ora. Aggiungine uno qui sotto per puntare questo avviso altrove.",
"ONLY_IN": "Solo in {{areas}}",
"OPTION_AREAS": "Solo in aree specifiche",
"OPTION_NEAR": "Vicino a un punto",
diff --git a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/nl.json b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/nl.json
index 5d6a44e6..4552e907 100644
--- a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/nl.json
+++ b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/nl.json
@@ -1723,6 +1723,8 @@
"LAST_PAGE": "Laatste pagina"
},
"WHERE": {
+ "PLACES_EMPTY_TITLE": "Nog geen plaatsen",
+ "PIN_UNSET": "Niet ingesteld",
"PLACES_PAGE_DESC": "Benoemde punten waar je meldingen op gericht kunnen worden, in plaats van je locatie.",
"ADD_PLACE": "Plaats toevoegen",
"AREAS_LABEL": "Gebieden",
@@ -1734,7 +1736,7 @@
"NAME_PLACE_TITLE": "Deze plaats een naam geven",
"NEAR_PIN": "Binnen {{distance}} km van mijn locatie",
"NEAR_PLACE": "Binnen {{distance}} km van {{place}}",
- "NO_PLACES": "Je hebt nog geen plaatsen opgeslagen. Voeg er een toe via het locatiemenu.",
+ "NO_PLACES": "Nog geen plaatsen. Voeg er hieronder een toe om deze melding ergens anders op te richten dan je locatie.",
"ONLY_IN": "Alleen in {{areas}}",
"OPTION_AREAS": "Alleen in bepaalde gebieden",
"OPTION_NEAR": "Bij een punt",
diff --git a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/pl.json b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/pl.json
index 81dfed11..c5f8036c 100644
--- a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/pl.json
+++ b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/pl.json
@@ -1723,6 +1723,8 @@
"LAST_PAGE": "Ostatnia strona"
},
"WHERE": {
+ "PLACES_EMPTY_TITLE": "Brak miejsc",
+ "PIN_UNSET": "Nie ustawiono",
"PLACES_PAGE_DESC": "Nazwane punkty, na które możesz kierować alerty zamiast na swoją lokalizację.",
"ADD_PLACE": "Dodaj miejsce",
"AREAS_LABEL": "Obszary",
@@ -1734,7 +1736,7 @@
"NAME_PLACE_TITLE": "Nazwij to miejsce",
"NEAR_PIN": "W promieniu {{distance}} km od mojej lokalizacji",
"NEAR_PLACE": "W promieniu {{distance}} km od {{place}}",
- "NO_PLACES": "Nie masz jeszcze zapisanych miejsc. Dodaj je w menu lokalizacji.",
+ "NO_PLACES": "Brak miejsc. Dodaj jedno poniżej, aby skierować ten alert poza swoją lokalizację.",
"ONLY_IN": "Tylko w {{areas}}",
"OPTION_AREAS": "Tylko w wybranych obszarach",
"OPTION_NEAR": "W pobliżu punktu",
diff --git a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/pt-BR.json b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/pt-BR.json
index da02ccc4..cf2cff28 100644
--- a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/pt-BR.json
+++ b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/pt-BR.json
@@ -1723,6 +1723,8 @@
"LAST_PAGE": "Última página"
},
"WHERE": {
+ "PLACES_EMPTY_TITLE": "Nenhum local ainda",
+ "PIN_UNSET": "Não definida",
"PLACES_PAGE_DESC": "Pontos nomeados para onde direcionar seus alertas, em vez da sua localização.",
"ADD_PLACE": "Adicionar um local",
"AREAS_LABEL": "Áreas",
@@ -1734,7 +1736,7 @@
"NAME_PLACE_TITLE": "Dar nome a este local",
"NEAR_PIN": "A menos de {{distance}} km da minha localização",
"NEAR_PLACE": "A menos de {{distance}} km de {{place}}",
- "NO_PLACES": "Você ainda não salvou nenhum local. Adicione um pelo menu de localização.",
+ "NO_PLACES": "Nenhum local ainda. Adicione um abaixo para direcionar este alerta para fora da sua localização.",
"ONLY_IN": "Apenas em {{areas}}",
"OPTION_AREAS": "Apenas em áreas específicas",
"OPTION_NEAR": "Perto de um ponto",
diff --git a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/pt.json b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/pt.json
index 950d530a..a427384a 100644
--- a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/pt.json
+++ b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/pt.json
@@ -1723,6 +1723,8 @@
"LAST_PAGE": "Última página"
},
"WHERE": {
+ "PLACES_EMPTY_TITLE": "Ainda sem locais",
+ "PIN_UNSET": "Por definir",
"PLACES_PAGE_DESC": "Pontos com nome para onde podes dirigir os teus alertas, em vez da tua localização.",
"ADD_PLACE": "Adicionar um local",
"AREAS_LABEL": "Áreas",
@@ -1734,7 +1736,7 @@
"NAME_PLACE_TITLE": "Dar nome a este local",
"NEAR_PIN": "A menos de {{distance}} km da minha localização",
"NEAR_PLACE": "A menos de {{distance}} km de {{place}}",
- "NO_PLACES": "Ainda não guardaste nenhum local. Adiciona um no menu de localização.",
+ "NO_PLACES": "Ainda sem locais. Adiciona um abaixo para dirigir este alerta para fora da tua localização.",
"ONLY_IN": "Apenas em {{areas}}",
"OPTION_AREAS": "Apenas em áreas específicas",
"OPTION_NEAR": "Perto de um ponto",
diff --git a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/sv.json b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/sv.json
index d93470f7..b83d74ed 100644
--- a/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/sv.json
+++ b/Applications/Pgan.PoracleWebNet.App/ClientApp/src/assets/i18n/sv.json
@@ -1723,6 +1723,8 @@
"LAST_PAGE": "Sista sidan"
},
"WHERE": {
+ "PLACES_EMPTY_TITLE": "Inga platser än",
+ "PIN_UNSET": "Inte angiven",
"PLACES_PAGE_DESC": "Namngivna punkter som dina aviseringar kan riktas mot i stället för din position.",
"ADD_PLACE": "Lägg till en plats",
"AREAS_LABEL": "Områden",
@@ -1734,7 +1736,7 @@
"NAME_PLACE_TITLE": "Namnge platsen",
"NEAR_PIN": "Inom {{distance}} km från min position",
"NEAR_PLACE": "Inom {{distance}} km från {{place}}",
- "NO_PLACES": "Du har inte sparat några platser än. Lägg till en från positionsmenyn.",
+ "NO_PLACES": "Inga platser än. Lägg till en nedan för att rikta aviseringen någon annanstans än din position.",
"ONLY_IN": "Endast i {{areas}}",
"OPTION_AREAS": "Endast i valda områden",
"OPTION_NEAR": "Nära en punkt",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3048e1bd..4199ca80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
+- **You can make a place without leaving the alarm you are editing.** The scope picker's "measured from" list ends with Add a place, which opens the map, asks for a name, and selects it. Creating a place was only ever wanted at that exact moment, and the old empty state sent you to a menu that no longer existed ([#730](https://github.com/PGAN-Dev/PoracleWeb.NET/issues/730)).
+
- **Places.** A page in the sidebar beside Areas and My Geofences: your pin, plus whatever points you name. Adding one borrows the existing location map as a picker rather than growing a second one, and naming is a separate step because picking a point and naming it are two decisions. Deleting a place that alerts still point at says how many and refuses, instead of quietly widening them back to your pin. The Areas page's location card links to it, since that page already explains that alerts reach you by area or by a radius from a point and named points are more of the second. Shown only where the location feature is enabled, matching the endpoints it calls ([#730](https://github.com/PGAN-Dev/PoracleWeb.NET/issues/730)).
- **New alarms can start somewhere other than your pin.** Alert Defaults gains a place alongside the radius, and all ten add dialogs now offer a "measured from" selector, so a preference like "within 2 km of work" applies to everything you create instead of being re-picked each time. A place that gets deleted is forgotten rather than left seeding alarms with a label PoracleNG rejects ([#730](https://github.com/PGAN-Dev/PoracleWeb.NET/issues/730)).
- **PVP rules can target mega evolutions.** PoracleNG 5.1.0 ranks megas separately from base forms, so a Pokemon PVP rule now chooses between Base, Mega, Mega X and Mega Y, and the card's PVP badge says which. Works regardless of the server's `include_mega_evolution` setting, which only decides the default for rules that do not ask ([#730](https://github.com/PGAN-Dev/PoracleWeb.NET/issues/730)).