From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 17 Mar 2021 16:07:43 +0000 (+0000)
Subject: Merge branch 'pull/3112'
X-Git-Tag: live~2295
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a2ddcda9111894d11c297bd61da2c599060baf9c?hp=10c9f18bc22de266087d1c7f576c14eebee57dc8

Merge branch 'pull/3112'
---

diff --git a/CONFIGURE.md b/CONFIGURE.md
index 96aac9f96..c165c6d46 100644
--- a/CONFIGURE.md
+++ b/CONFIGURE.md
@@ -28,7 +28,7 @@ If you create a user by signing up to your local website, you need to confirm th
 
 ```
 $ bundle exec rails console
->> user = User.find_by_display_name("My New User Name")
+>> user = User.find_by(:display_name => "My New User Name")
 => #[ ... ]
 >> user.status = "active"
 => "active"
@@ -43,7 +43,7 @@ To give administrator or moderator permissions:
 
 ```
 $ bundle exec rails console
->> user = User.find_by_display_name("My New User Name")
+>> user = User.find_by(:display_name => "My New User Name")
 => #[ ... ]
 >> user.roles.create(:role => "administrator", :granter_id => user.id)
 => #[ ... ]
diff --git a/Gemfile.lock b/Gemfile.lock
index 59fbf07a6..fb755b709 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -73,16 +73,16 @@ GEM
     autoprefixer-rails (10.2.4.0)
       execjs
     aws-eventstream (1.1.1)
-    aws-partitions (1.432.0)
-    aws-sdk-core (3.112.1)
+    aws-partitions (1.433.0)
+    aws-sdk-core (3.113.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.42.0)
+    aws-sdk-kms (1.43.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.90.0)
+    aws-sdk-s3 (1.91.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -270,7 +270,7 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.7)
-    nokogiri (1.11.1)
+    nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     nokogumbo (2.0.4)
@@ -296,11 +296,11 @@ GEM
     omniauth-github (2.0.0)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.7.1)
-    omniauth-google-oauth2 (0.8.1)
+    omniauth-google-oauth2 (1.0.0)
       jwt (>= 2.0)
       oauth2 (~> 1.1)
-      omniauth (>= 1.1.1)
-      omniauth-oauth2 (>= 1.6)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.7.1)
     omniauth-mediawiki (0.0.4)
       jwt (~> 2.0)
       omniauth-oauth (~> 1.0)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c3eb1ad85..d571535d3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -393,6 +393,8 @@ class ApplicationController < ActionController::Base
       referer = nil
     end
 
+    referer = nil if referer&.path&.first != "/"
+
     referer.to_s
   end
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index cc8f46d23..6aa98f7ee 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -271,7 +271,7 @@ class UsersController < ApplicationController
 
   def login
     append_content_security_policy_directives(
-      :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org]
+      :form_action => %w[*]
     )
 
     session[:referer] = safe_referer(params[:referer]) if params[:referer]
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index bc6b09485..d212d0ebf 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -407,7 +407,7 @@ fa:
       title: پرس‌وجوی عارضه‌ها
       introduction: روی نقشه کلیک کنید تا عارضه‌های نزدیک را بیابید
       nearby: عارضه‌های نزدیک
-      enclosing: عارضه‌های دربرگیرنده
+      enclosing: عارضه‌های دربرگیر
   changesets:
     changeset_paging_nav:
       showing_page: صفحهٔ %{page}
@@ -908,7 +908,7 @@ fa:
           ice_rink: رینک یخ
           marina: لنگرگاه
           miniature_golf: گلف کوچک
-          nature_reserve: طبیعت حفاظت شده
+          nature_reserve: ذخیره‌گاه طبیعی
           outdoor_seating: فضای نشستن خارجی
           park: پارک
           picnic_table: میز پیکنیک
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index e6aaef3cc..b742fcb7a 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -160,6 +160,7 @@ fi:
         details: Kuvaile ongelmaa (pakollinen)
       user:
         email: Sähköpostiosoite
+        email_confirmation: Sähköpostin varmistus
         new_email: Uusi sähköpostiosoite
         active: Aktivoitu
         display_name: Näyttönimi
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index ec8c3a310..414793faa 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1266,6 +1266,8 @@ hu:
       hi: Szia %{to_user}!
       header: '%{from_user} küldött neked egy üzenetet az OpenStreetMapon keresztül
         %{subject} tárggyal:'
+      header_html: '%{from_user} üzenetet küldött neked az OpenStreetMap-en %{subject}
+        tárggyal:'
       footer_html: 'Az üzenet a %{readurl} címen is elolvashatod, vagy válaszolhatsz
         rá itt: %{replyurl}'
     friendship_notification:
@@ -1354,10 +1356,10 @@ hu:
       outbox: Elküldött üzenetek
       messages: '%{new_messages} és %{old_messages} van'
       new_messages:
-        one: egy új üzenet
-        other: '%{count} új üzenet'
+        one: 1 új üzeneted
+        other: '%{count} új üzeneted'
       old_messages:
-        one: egy régi üzeneted
+        one: 1 régi üzeneted
         other: '%{count} régi üzeneted'
       from: Feladó
       subject: Tárgy
@@ -1422,6 +1424,25 @@ hu:
       as_unread: Üzenet megjelölve olvasatlanként
     destroy:
       destroyed: Üzenet törölve
+  shared:
+    markdown_help:
+      title_html: <a href="https://kramdown.gettalong.org/quickref.html">Kramdown</a>nal
+        elemezve
+      headings: Címsorok
+      heading: Cím
+      subheading: Alcím
+      unordered: Rendezetlen lista
+      ordered: Rendezett lista
+      first: Első elem
+      second: Második elem
+      link: Hivatkozás
+      text: Szöveg
+      image: Kép
+      alt: Alternatív szöveg
+      url: URL
+    richtext_field:
+      edit: Szerkesztés
+      preview: Előnézet
   site:
     about:
       next: Következő
diff --git a/config/locales/id.yml b/config/locales/id.yml
index f43a1fd0a..aacc61965 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -22,6 +22,7 @@
 # Author: JakArtisan
 # Author: Kenrick95
 # Author: Macofe
+# Author: Mnam23
 # Author: Pebaryan
 # Author: RXerself
 # Author: Rachmat04
@@ -215,7 +216,7 @@ id:
       description: iD (editor di dalam browser internet)
     remote:
       name: Pengendali Jarak Jauh
-      description: Remote Control (JOSM atau Merkaartor)
+      description: Remote Control (JOSM, Potlatch, Merkaartor)
   auth:
     providers:
       none: Tidak ada
@@ -443,8 +444,8 @@ id:
     new:
       title: Entri Baru Catatan Harian
     form:
-      location: 'Lokasi:'
-      use_map_link: gunakan peta
+      location: Lokasi
+      use_map_link: Gunakan Peta
     index:
       title: Catatan harian pengguna
       title_friends: Catatan harian teman
@@ -2398,13 +2399,13 @@ id:
     account:
       title: Edit akun
       my settings: Pengaturan saya
-      current email address: 'Alamat Email Saat Ini:'
-      external auth: 'Autentikasi Eksternal:'
+      current email address: Alamat surel saat ini
+      external auth: Autentikasi Eksternal
       openid:
         link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: Apa ini?
       public editing:
-        heading: 'Mengedit secara publik:'
+        heading: Menyunting secara publik
         enabled: Diaktifkan. Tidak anonim dan dapat mengedit data.
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: Apa ini?
@@ -2422,7 +2423,7 @@ id:
           anda menjadi pengguna umum.</li><li>Tindakan ini tidak dapat dikembalikan
           dan semua pengguna baru akan diatur sebagai pengguna umum secara standar.</li></ul>
       contributor terms:
-        heading: 'Syarat-syarat Kontributor:'
+        heading: Syarat-syarat Kontributor
         agreed: Anda telah menyetujui Persyaratan Kontributor yang baru.
         not yet agreed: Anda belum menyetujui Persyaratan Kontributor yang baru.
         review link text: Silahkan ikuti link ini untuk kenyamanan Anda untuk meninjau
@@ -2431,7 +2432,7 @@ id:
           Anda berada dalam Domain publik.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: Apa ini?
-      image: 'Gambar:'
+      image: Gambar
       gravatar:
         gravatar: Gunakan Gravatar
         link: https://wiki.openstreetmap.org/wiki/Gravatar
@@ -2443,7 +2444,7 @@ id:
       replace image: Ganti gambar saat ini
       image size hint: (kotak gambar yang dapat bekerja terbaik paling tidak berukuran
         100x100)
-      home location: 'Lokasi Beranda:'
+      home location: Lokasi Beranda
       no home location: Anda telah memasukkan lokasi rumah Anda.
       update home location on click: Memperbarui lokasi rumah ketika saya klik pada
         peta?
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 30954ea09..13eb8fa7d 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Chiak
+# Author: Dušan Kreheľ
 # Author: Helix84
 # Author: Jose1711
 # Author: KuboF
@@ -26,6 +27,8 @@ sk:
     formats:
       friendly: '%e. %B %Y o %H:%M'
   helpers:
+    file:
+      prompt: Vybrať súbor
     submit:
       diary_comment:
         create: Uložiť
@@ -38,7 +41,7 @@ sk:
         create: Odoslať
       client_application:
         create: Registrovať
-        update: Upraviť
+        update: Aktualizovať
       redaction:
         create: Vytvoriť revíziu
         update: Uložiť revíziu
@@ -90,6 +93,7 @@ sk:
       way_tag: Značka cesty
     attributes:
       client_application:
+        name: Meno (povinné)
         callback_url: URL pre spätné volanie (callback)
         support_url: URL s podporou
       diary_comment:
@@ -232,6 +236,7 @@ sk:
       entry_html: Relácia %{relation_name}
       entry_role_html: Relácia %{relation_name} (ako %{relation_role})
     not_found:
+      title: Nenájdené
       sorry: 'Ľutujeme, %{type} #%{id} nebolo možné nájsť.'
       type:
         node: bod
@@ -240,6 +245,7 @@ sk:
         changeset: počet zmien
         note: poznámka
     timeout:
+      title: Vypršal časový limit
       sorry: Ľutujeme, ale načítanie dát %{type} číslo %{id} trvalo príliš dlho
       type:
         node: bod
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 6324943a9..4f18c3f09 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -823,6 +823,7 @@ te:
       status: స్థితి
       show: చూపించు
       edit: మార్చు
+      confirm: నిశ్చయించుకున్నారా?
       reason: 'నిరోధానికి కారణం:'
       back: అన్ని నిరోధాలను చూడండి
     block:
diff --git a/config/settings.yml b/config/settings.yml
index 049844d3d..3dd732972 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -95,9 +95,6 @@ imagery_blacklist:
   - "http://xdworld\\.vworld\\.kr:8080/.*"
   # Blacklist here
   - ".*\\.here\\.com[/:].*"
-  # Blacklist Kanton SH and GL
-  - ".*wms.geo.sh.ch.*Luftbild_201[06].*"
-  - ".*wms.geo.gl.ch.*ch.gl.imagery.orthofoto201[357].*"
 # URL of Overpass instance to use for feature queries
 overpass_url: "https://overpass-api.de/api/interpreter"
 # Routing endpoints
diff --git a/package.json b/package.json
index 7e12125bc..79f324107 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "jquery-simulate": "^1.0.2",
     "jquery.cookie": "^1.4.1",
     "leaflet": "^1.6.0",
-    "leaflet.locatecontrol": "^0.72.0",
+    "leaflet.locatecontrol": "^0.73.0",
     "ohauth": "^1.0.0",
     "qs": "^6.9.4"
   },
diff --git a/yarn.lock b/yarn.lock
index 4829895ef..7e7f55779 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -247,9 +247,9 @@ eslint-visitor-keys@^2.0.0:
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
 eslint@^7.3.1:
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz#4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83"
-  integrity sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==
+  version "7.22.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.22.0.tgz#07ecc61052fec63661a2cab6bd507127c07adc6f"
+  integrity sha512-3VawOtjSJUQiiqac8MQc+w457iGLfuNGLFn8JmF051tTKbh5/x/0vlcEj8OgDCaw7Ysa2Jn8paGshV7x2abKXg==
   dependencies:
     "@babel/code-frame" "7.12.11"
     "@eslint/eslintrc" "^0.4.0"
@@ -268,7 +268,7 @@ eslint@^7.3.1:
     file-entry-cache "^6.0.1"
     functional-red-black-tree "^1.0.1"
     glob-parent "^5.0.0"
-    globals "^12.1.0"
+    globals "^13.6.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
@@ -276,7 +276,7 @@ eslint@^7.3.1:
     js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
-    lodash "^4.17.20"
+    lodash "^4.17.21"
     minimatch "^3.0.4"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
@@ -408,6 +408,13 @@ globals@^12.1.0:
   dependencies:
     type-fest "^0.8.1"
 
+globals@^13.6.0:
+  version "13.6.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.6.0.tgz#d77138e53738567bb96a3916ff6f6b487af20ef7"
+  integrity sha512-YFKCX0SiPg7l5oKYCJ2zZGxcXprVXHcSnVuvzrT3oSENQonVLqM5pf9fN5dLGZGyCjhw8TN8Btwe/jKnZ0pjvQ==
+  dependencies:
+    type-fest "^0.20.2"
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -514,10 +521,10 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
-leaflet.locatecontrol@^0.72.0:
-  version "0.72.2"
-  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.72.2.tgz#513787f983bce029c100a79aedc9eb98383100e0"
-  integrity sha512-MNi7m+TlQFwiz5jq5W9vcGjwBHsh1PGxjKjONYd0NezuSLdj9dNjRsupLXtF2fNnX+s+tPNzP7V+Nmg6TKvhHA==
+leaflet.locatecontrol@^0.73.0:
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.73.0.tgz#768d9edb0470f86c913ea6c2a70ec62380fd45c5"
+  integrity sha512-e6v6SyDU2nzG5AiH80eH7qhXw5J+EfgmEFHkuzTRC9jqCSbfAm/3HlZDuoa9WYsaZbn5ovvqNeaLW/JSMsgg5g==
 
 leaflet@^1.6.0:
   version "1.7.1"
@@ -532,10 +539,10 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-lodash@^4.17.20:
-  version "4.17.20"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+lodash@^4.17.20, lodash@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 minimatch@^3.0.4:
   version "3.0.4"
@@ -723,6 +730,11 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
 type-fest@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"