From: Andy Allan Date: Wed, 27 Apr 2022 15:29:54 +0000 (+0100) Subject: Merge pull request #3536 from JesseWeinstein/dittaeva_ancient_patch X-Git-Tag: live~2209 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/082880fca682abc3b3ccd39b3479305046126f97?hp=91ba00c03e868eafa9cfa35bc34c7b84a339f9ad Merge pull request #3536 from JesseWeinstein/dittaeva_ancient_patch Meaningful and disambiguating class/type labels (from 2012) --- diff --git a/Gemfile b/Gemfile index a0dce8dbc..c4f8d2537 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "7.0.2.3" +gem "rails", "7.0.2.4" # Require json for multi_json gem "json" diff --git a/Gemfile.lock b/Gemfile.lock index 7cf079f98..18ee9e3d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,73 +3,73 @@ GEM specs: aasm (5.2.0) concurrent-ruby (~> 1.0) - actioncable (7.0.2.3) - actionpack (= 7.0.2.3) - activesupport (= 7.0.2.3) + actioncable (7.0.2.4) + actionpack (= 7.0.2.4) + activesupport (= 7.0.2.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.2.3) - actionpack (= 7.0.2.3) - activejob (= 7.0.2.3) - activerecord (= 7.0.2.3) - activestorage (= 7.0.2.3) - activesupport (= 7.0.2.3) + actionmailbox (7.0.2.4) + actionpack (= 7.0.2.4) + activejob (= 7.0.2.4) + activerecord (= 7.0.2.4) + activestorage (= 7.0.2.4) + activesupport (= 7.0.2.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.2.3) - actionpack (= 7.0.2.3) - actionview (= 7.0.2.3) - activejob (= 7.0.2.3) - activesupport (= 7.0.2.3) + actionmailer (7.0.2.4) + actionpack (= 7.0.2.4) + actionview (= 7.0.2.4) + activejob (= 7.0.2.4) + activesupport (= 7.0.2.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.2.3) - actionview (= 7.0.2.3) - activesupport (= 7.0.2.3) + actionpack (7.0.2.4) + actionview (= 7.0.2.4) + activesupport (= 7.0.2.4) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) actionpack-page_caching (1.2.4) actionpack (>= 4.0.0) - actiontext (7.0.2.3) - actionpack (= 7.0.2.3) - activerecord (= 7.0.2.3) - activestorage (= 7.0.2.3) - activesupport (= 7.0.2.3) + actiontext (7.0.2.4) + actionpack (= 7.0.2.4) + activerecord (= 7.0.2.4) + activestorage (= 7.0.2.4) + activesupport (= 7.0.2.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.2.3) - activesupport (= 7.0.2.3) + actionview (7.0.2.4) + activesupport (= 7.0.2.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) active_record_union (1.3.0) activerecord (>= 4.0) - activejob (7.0.2.3) - activesupport (= 7.0.2.3) + activejob (7.0.2.4) + activesupport (= 7.0.2.4) globalid (>= 0.3.6) - activemodel (7.0.2.3) - activesupport (= 7.0.2.3) - activerecord (7.0.2.3) - activemodel (= 7.0.2.3) - activesupport (= 7.0.2.3) + activemodel (7.0.2.4) + activesupport (= 7.0.2.4) + activerecord (7.0.2.4) + activemodel (= 7.0.2.4) + activesupport (= 7.0.2.4) activerecord-import (1.4.0) activerecord (>= 4.2) - activestorage (7.0.2.3) - actionpack (= 7.0.2.3) - activejob (= 7.0.2.3) - activerecord (= 7.0.2.3) - activesupport (= 7.0.2.3) + activestorage (7.0.2.4) + actionpack (= 7.0.2.4) + activejob (= 7.0.2.4) + activerecord (= 7.0.2.4) + activesupport (= 7.0.2.4) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.2.3) + activesupport (7.0.2.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -86,20 +86,20 @@ GEM autoprefixer-rails (10.4.2.0) execjs (~> 2) aws-eventstream (1.2.0) - aws-partitions (1.577.0) - aws-sdk-core (3.130.1) + aws-partitions (1.580.0) + aws-sdk-core (3.130.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.55.0) + aws-sdk-kms (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.113.0) + aws-sdk-s3 (1.113.2) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sigv4 (1.4.0) + aws-sigv4 (1.5.0) aws-eventstream (~> 1, >= 1.0.2) better_errors (2.9.1) coderay (>= 1.0.0) @@ -167,7 +167,7 @@ GEM railties (>= 5) doorkeeper-i18n (5.2.3) doorkeeper (>= 5.2) - dry-configurable (0.14.0) + dry-configurable (0.15.0) concurrent-ruby (~> 1.0) dry-core (~> 0.6) dry-container (0.9.0) @@ -265,7 +265,7 @@ GEM json (2.6.1) jwt (2.3.0) kgio (2.11.4) - kramdown (2.3.2) + kramdown (2.4.0) rexml libxml-ruby (3.2.2) listen (3.7.1) @@ -376,20 +376,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) - rails (7.0.2.3) - actioncable (= 7.0.2.3) - actionmailbox (= 7.0.2.3) - actionmailer (= 7.0.2.3) - actionpack (= 7.0.2.3) - actiontext (= 7.0.2.3) - actionview (= 7.0.2.3) - activejob (= 7.0.2.3) - activemodel (= 7.0.2.3) - activerecord (= 7.0.2.3) - activestorage (= 7.0.2.3) - activesupport (= 7.0.2.3) + rails (7.0.2.4) + actioncable (= 7.0.2.4) + actionmailbox (= 7.0.2.4) + actionmailer (= 7.0.2.4) + actionpack (= 7.0.2.4) + actiontext (= 7.0.2.4) + actionview (= 7.0.2.4) + activejob (= 7.0.2.4) + activemodel (= 7.0.2.4) + activerecord (= 7.0.2.4) + activestorage (= 7.0.2.4) + activesupport (= 7.0.2.4) bundler (>= 1.15.0) - railties (= 7.0.2.3) + railties (= 7.0.2.4) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -402,9 +402,9 @@ GEM rails-i18n (7.0.3) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.2.3) - actionpack (= 7.0.2.3) - activesupport (= 7.0.2.3) + railties (7.0.2.4) + actionpack (= 7.0.2.4) + activesupport (= 7.0.2.4) method_source rake (>= 12.2) thor (~> 1.0) @@ -414,19 +414,19 @@ GEM rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) - regexp_parser (2.3.0) + regexp_parser (2.3.1) request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) rinku (2.0.6) rotp (6.2.0) - rubocop (1.27.0) + rubocop (1.28.2) parallel (~> 1.10) parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.16.0, < 2.0) + rubocop-ast (>= 1.17.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.17.0) @@ -572,7 +572,7 @@ DEPENDENCIES r2 (~> 0.2.7) rack-cors rack-uri_sanitizer - rails (= 7.0.2.3) + rails (= 7.0.2.4) rails-controller-testing rails-i18n (~> 7.0.0) rinku (>= 2.0.6) diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 5505ee4a9..a4b8b2642 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,4 +1,4 @@ -

+

<%= t "browse.version" %> #<%= common_details.version %>

@@ -11,24 +11,27 @@ <% end %>

-

- <%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html", - :time => time_ago_in_words(common_details.timestamp, :scope => :"datetime.distance_in_words_ago"), - :user => changeset_user_link(common_details.changeset), - :title => l(common_details.timestamp) %> - · - <%= t "browse.in_changeset" %> - #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %> -

+ <%= render :partial => "tag_details", :object => common_details.tags %> diff --git a/config/application.rb b/config/application.rb index 10a2372db..b801c8b5f 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,6 +1,6 @@ require_relative "boot" -if ENV["OPENSTREETMAP_STATUS"] == "database_offline" +if ENV.fetch("OPENSTREETMAP_STATUS", nil) == "database_offline" require "active_model/railtie" require "active_job/railtie" require "active_storage/engine" diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 01192e060..84fce61ae 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -184,7 +184,7 @@ fa: home_lon: طول جغرافیایی languages: زبان‌های مورد ترجیح preferred_editor: ویرایش‌گر مورد ترجیح - pass_crypt: رمز عبور + pass_crypt: اسم رمز pass_crypt_confirmation: تأیید رمز عبور help: doorkeeper/application: diff --git a/config/locales/id.yml b/config/locales/id.yml index 86070dbd0..6bfa48020 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -259,6 +259,12 @@ id: entry: comment: Komentar full: Catatan lengkap + account: + deletions: + show: + retain_email: Alamat surel Anda akan dipertahankan. + confirm_delete: Apakah Anda yakin? + cancel: Batal accounts: edit: title: Edit akun @@ -294,14 +300,17 @@ id: dan menyetujui Persyaratan Kontributor yang baru. agreed_with_pd: Anda juga telah menyatakan bahwa Anda mempertimbangkan suntingan Anda berada dalam Domain publik. - link: https://www.osmfoundation.org/wiki/License/Contributor_Terms + link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms link text: Apa ini? save changes button: Simpan Perubahan make edits public button: Membuat seluruh suntingan saya menjadi publik + delete_account: Hapus Akun... update: success_confirm_needed: Informasi pengguna telah berhasil diperbarui. Periksa email untuk melakukan konfirmasi alamat email. success: Informasi mengenai pengguna sudah berhasil diperbarui. + destroy: + success: Akun Telah Dihapus. browse: created: Dibuat closed: Ditutup @@ -654,6 +663,7 @@ id: bicycle_rental: Penyewaan Sepeda bicycle_repair_station: Bengkel Sepeda biergarten: Taman Bir + blood_bank: Bank Darah boat_rental: Penyewaan Perahu brothel: Bordil bureau_de_change: Penukaran Valuta Asing @@ -691,10 +701,11 @@ id: ice_cream: Es Krim internet_cafe: Warung Internet kindergarten: Taman Kanak-kanak - language_school: Sekolah bahasa + language_school: Sekolah Bahasa library: Perpustakaan marketplace: Pasar monastery: Biara + money_transfer: Layanan Transfer Uang motorcycle_parking: Parkir Motor music_school: Sekolah Musik nightclub: Klub Malam @@ -961,6 +972,7 @@ id: advertising: Iklan antenna: Antena beacon: Sinyal Pandu + beam: Balok beehive: Sarang Lebah breakwater: Pemecah Gelombang bridge: Jembatan @@ -1003,11 +1015,13 @@ id: mountain_pass: "yes": Perlintasan Pegunungan natural: + atoll: Atol bay: Teluk beach: Pantai cape: Tanjung cave_entrance: Pintu Masuk Gua cliff: Tebing + coastline: Pesisir crater: Kawah dune: Bukit Pasir fell: Tebangan @@ -1020,11 +1034,13 @@ id: hill: Bukit hot_spring: Mata Air Panas island: Pulau + isthmus: Tanah Genting land: Lahan marsh: Rawa moor: Tegalan mud: Lumpur peak: Puncak + peninsula: Semenanjung point: Titik reef: Batu Karang ridge: Punggung Bukit @@ -1037,6 +1053,7 @@ id: stone: Batu strait: Selat tree: Pohon + tundra: Tundra valley: Lembah volcano: Gunung berapi water: Air @@ -1109,6 +1126,7 @@ id: platform: Peron Kereta preserved: Jalur Kereta Terlindungi proposed: Kereta Api yang Diusulkan + rail: Rel spur: Sepur Kereta station: Stasiun Kereta Api stop: Perhentian Kereta Api @@ -1117,6 +1135,7 @@ id: switch: Titik Kereta Api tram: Jalur Trem tram_stop: Perhentian Trem + turntable: Pemutar Rel yard: Emplasemen shop: agrarian: Toko Pertanian @@ -1152,6 +1171,7 @@ id: cosmetics: Toko Kosmetik craft: Toko Suplai Kriya curtain: Toko Tirai + dairy: Toko Produk Susu deli: Siap saji department_store: Toko serba ada discount: Toko Barang Obral @@ -1966,7 +1986,7 @@ id: peta cetak) tanpa izin eksplisit dari pemegang hak cipta. infringement_2_html: |- Jika Anda percaya bahwa materi berhak cipta telah tidak tepat - ditambahkan ke OpenStreetMap database atau situs ini, silakan lihat prosedur takedown kami atau kirimkan file langsung pada + ditambahkan ke OpenStreetMap database atau situs ini, silakan lihat prosedur takedown kami atau kirimkan file langsung pada pengajuan halaman on-line. trademarks_title_html: Merek dagang trademarks_1_html: OpenStreetMap, logo lup, dan State of the Map adalah merek @@ -2505,7 +2525,7 @@ id: consider_pd: Sebagai tambahan perjanjian di atas, saya menganggap kontribusi saya berada di dalam Domain Publik consider_pd_why: apa ini? - consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain + consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain guidance_html: 'Informasi untuk membantu Anda memahami persyaratan ini: sebuah ringkasan yang mudah dibaca dan beberapa terjemahan informal' @@ -2520,6 +2540,9 @@ id: italy: Italia rest_of_world: Bagian lain dari dunia terms_declined_flash: + terms_declined_html: Kami mohon maaf Anda tidak menerima Persyaratan Kontributor + baru. Untuk informasi lebih lanjut, silakan lihat %{terms_declined_link}. + terms_declined_link: halaman wiki ini terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined no_such_user: title: Pengguna tersebut tidak ditemukan @@ -2537,8 +2560,11 @@ id: my profile: Profilku my settings: Pengaturanku my comments: Komentarku + my_preferences: Preferensi Saya + my_dashboard: Dasbor Saya blocks on me: Blok kepada saya blocks by me: Blok oleh saya + edit_profile: Sunting Profil send message: Kirim Pesan diary: Catatan Harian edits: Suntingan @@ -2970,6 +2996,8 @@ id: flash: Redaksi dihancurkan. error: Ada kesalahan menghancurkan Redaksi ini. validations: + leading_whitespace: punya ruang putih di depan + trailing_whitespace: punya ruang putih di belakang invalid_characters: mengandung karakter yang tidak dikenal url_characters: mengandung karakter URL khusus (%{characters}) ... diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index ce2625165..876d908fc 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -80,7 +80,7 @@ zh-CN: dir: ltr time: formats: - friendly: '%Y年%B月%e日 %H:%M' + friendly: '%Y年%B%e日 %H:%M' blog: '%Y年%B%e日' helpers: file: diff --git a/config/settings.yml b/config/settings.yml index 2172d2d87..e0e844778 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -86,8 +86,7 @@ default_editor: "id" # Imagery to return in capabilities as blacklisted imagery_blacklist: # Current Google imagery URLs have google or googleapis in the domain - # with a vt or kh endpoint, and x, y and z query parameters - - ".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*){3}.*" + - ".*\\.google(apis)?\\..*/.*" # Blacklist VWorld - "http://xdworld\\.vworld\\.kr:8080/.*" # Blacklist here