Merge remote-tracking branch 'upstream/pull/5310'

diff --git a/Gemfile.lock b/Gemfile.lock
index d3a61841ade9f977be8ba708039e9e38f8887f53..86a69b9f5831c9ea4db1c408bcf7ef2236b120f2 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -112,8 +112,8 @@ GEM
     autoprefixer-rails (10.4.19.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1001.0)
-    aws-sdk-core (3.211.0)
+    aws-partitions (1.1004.0)
+    aws-sdk-core (3.212.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -121,14 +121,14 @@ GEM
     aws-sdk-kms (1.95.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.169.0)
+    aws-sdk-s3 (1.170.1)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
-    benchmark (0.3.0)
+    benchmark (0.4.0)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
@@ -208,10 +208,10 @@ GEM
       reline (>= 0.3.8)
     debug_inspector (1.2.0)
     deep_merge (1.2.2)
-    delayed_job (4.1.12)
-      activesupport (>= 3.0, < 8.0)
-    delayed_job_active_record (4.1.10)
-      activerecord (>= 3.0, < 8.0)
+    delayed_job (4.1.13)
+      activesupport (>= 3.0, < 9.0)
+    delayed_job_active_record (4.1.11)
+      activerecord (>= 3.0, < 9.0)
       delayed_job (>= 3.0, < 5)
     docile (1.4.1)
     doorkeeper (5.7.1)
@@ -297,7 +297,7 @@ GEM
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.5)
-    hashdiff (1.1.1)
+    hashdiff (1.1.2)
     hashie (5.0.0)
     highline (3.1.1)
       reline
@@ -345,7 +345,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.7.6)
+    json (2.8.1)
     jwt (2.9.3)
       base64
     kgio (2.11.4)
@@ -382,14 +382,14 @@ GEM
     minitest (5.25.1)
     minitest-focus (1.4.0)
       minitest (>= 4, < 6)
-    msgpack (1.7.3)
+    msgpack (1.7.5)
     multi_json (1.15.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
     nap (1.1.0)
-    net-http (0.4.1)
+    net-http (0.5.0)
       uri
-    net-imap (0.5.0)
+    net-imap (0.5.1)
       date
       net-protocol
     net-pop (0.1.2)
@@ -455,7 +455,7 @@ GEM
       omniauth (~> 2.0)
     open4 (1.3.4)
     openstreetmap-deadlock_retry (1.3.1)
-    ostruct (0.6.0)
+    ostruct (0.6.1)
     overcommit (0.64.1)
       childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
@@ -468,7 +468,7 @@ GEM
     popper_js (2.11.8)
     progress (3.6.0)
     pstore (0.1.3)
-    psych (5.1.2)
+    psych (5.2.0)
       stringio
     public_suffix (6.0.1)
     puma (5.6.9)
@@ -540,14 +540,14 @@ GEM
     rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.10)
+    reline (0.5.11)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
     rexml (3.3.9)
     rinku (2.0.6)
     rotp (6.3.0)
-    rouge (4.4.0)
+    rouge (4.5.1)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
     rubocop (1.68.0)
@@ -560,7 +560,7 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.34.0)
+    rubocop-ast (1.35.0)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -594,7 +594,7 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    securerandom (0.3.1)
+    securerandom (0.3.2)
     selenium-webdriver (4.23.0)
       base64 (~> 0.2)
       logger (~> 1.4)
@@ -636,7 +636,7 @@ GEM
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
     tilt (2.4.0)
-    timeout (0.4.1)
+    timeout (0.4.2)
     turbo-rails (2.0.11)
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)

diff --git a/app/assets/javascripts/richtext.js b/app/assets/javascripts/richtext.js
index 56aad8c73a2c8642f09d4cc1d6b6f54f5b5a6f4d..0c0a699230078a2cdbbfe0cdc5cebb66d05a21df 100644 (file)
--- a/app/assets/javascripts/richtext.js
+++ b/app/assets/javascripts/richtext.js
@@ -6,8 +6,10 @@
    */
   $(document).on("change", ".richtext_container textarea", function () {
     var container = $(this).closest(".richtext_container");
+    var preview = container.find(".tab-pane[id$='_preview']");
 
-    container.find(".tab-pane[id$='_preview']").empty();
+    preview.children(".richtext_placeholder").attr("hidden", true);
+    preview.children(".richtext").empty();
   });
 
   /*
@@ -31,14 +33,14 @@
     var editor = container.find("textarea");
     var preview = container.find(".tab-pane[id$='_preview']");
 
-    if (preview.contents().length === 0) {
-      preview.oneTime(500, "loading", function () {
-        preview.addClass("loading");
+    if (preview.children(".richtext").contents().length === 0) {
+      preview.oneTime(200, "loading", function () {
+        preview.children(".richtext_placeholder").removeAttr("hidden");
       });
 
-      preview.load(editor.data("previewUrl"), { text: editor.val() }, function () {
+      preview.children(".richtext").load(editor.data("previewUrl"), { text: editor.val() }, function () {
         preview.stopTime("loading");
-        preview.removeClass("loading");
+        preview.children(".richtext_placeholder").attr("hidden", true);
       });
     }
   });

diff --git a/app/views/shared/_richtext_field.html.erb b/app/views/shared/_richtext_field.html.erb
index 5b84fd6ed889bce1d774cdbb746082a946b8056a..eb11aa13cab3cfa0d927666f54209572056c74da 100644 (file)
--- a/app/views/shared/_richtext_field.html.erb
+++ b/app/views/shared/_richtext_field.html.erb
@@ -15,7 +15,14 @@
       <div id="<%= id %>_edit" class="tab-pane show active">
         <%= builder.text_area(attribute, options.merge(:wrapper => false, "data-preview-url" => preview_url(:type => type))) %>
       </div>
-      <div id="<%= id %>_preview" class="tab-pane richtext text-break"></div>
+      <div id="<%= id %>_preview" class="tab-pane">
+        <div class="richtext_placeholder text-center py-5" hidden>
+          <div class="spinner-border" role="status">
+            <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
+          </div>
+        </div>
+        <div class="richtext text-break"></div>
+      </div>
       <div id="<%= id %>_help" class="tab-pane">
         <div class="card bg-body-tertiary h-100">
           <div class="card-body">

diff --git a/config/locales/az.yml b/config/locales/az.yml
index 945d9172fcbbbec01d49cd8ee9c9d6dd6569fb55..917cf11bdef9cb11d28da213a0579c90eacfffad 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -13,6 +13,7 @@
 # Author: Vugar 1981
 # Author: Wertuose
 # Author: Şeyx Şamil
+# Author: Əkrəm Cəfər
 ---
 az:
   time:
@@ -134,7 +135,7 @@ az:
         other: təxminən %{count} saat əvvəl
       half_a_minute: yarım dəqiqə əvvəl
   editor:
-    default: Susmaya görə (hal-hazırda %{name})
+    default: Defolt (hal-hazırda %{name})
     id:
       name: iD
       description: iD (brauzerdaxili redaktə)

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 282b2ec50fda5f2ddbe32065d641ad91c8ce7d55..fd2297d509001c47382ff498776ec6ac803a1be5 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -533,14 +533,18 @@ cy:
         closed: Caëwyd
         belongs_to: Awdur
     subscribe:
+      heading: Tanysgrifio i'r drafodaeth grŵp newid ganlynol?
       button: Tanysgrifio i drafodaeth
     unsubscribe:
+      heading: Dad-danysgrifio i'r drafodaeth grŵp newid ganlynol?
       button: Dad-danysgrifio o'r drafodaeth
     heading:
       title: Grŵp newid %{id}
       created_by_html: Crëwyd gan %{link_user} ar %{created}.
     no_such_entry:
       heading: 'Dim cofnod gyda''r id: %{id}'
+      body: Mae'n ddrwg gennym, nid oes grŵp newid gyda'r id %{id}. Gwiriwch eich
+        sillafu, neu efallai bod y ddolen rydych chi wedi ei chlicio arni'n anghywir.
     show:
       title: 'Grŵp newid: %{id}'
       created: 'Crëwyd: %{when}'
@@ -668,6 +672,7 @@ cy:
         title: Cofnodion dyddiadur OpenStreetMap
         description: Cofnodion dyddiadur diweddar gan ddefnyddwyr OpenStreetMap
     subscribe:
+      heading: Tanysgrifio i'r drafodaeth cofnod dyddiadur ganlynol?
       button: Tanysgrifio i drafodaeth
     unsubscribe:
       heading: Dad-danysgrifio o'r drafodaeth cofnod dyddiadur ganlynol?
@@ -1263,7 +1268,7 @@ cy:
           educational_institution: Sefydliad Addysgol
           employment_agency: Asiantaeth Cyflogi
           energy_supplier: Swyddfa Gyflenwr Ynni
-          estate_agent: Gwerthwr Tai
+          estate_agent: Asiant Eiddo
           financial: Swyddfa Gyllid
           government: Swyddfa Llywodraeth
           insurance: Swyddfa Yswiriant
@@ -1379,7 +1384,7 @@ cy:
           e-cigarette: Siop E-Sigaréts
           electronics: Siop Electroneg
           erotic: Siop Erotig
-          estate_agent: Gwerthwr Tai
+          estate_agent: Asiant Eiddo
           fabric: Siop Ddeunydd
           farm: Siop Fferm
           fashion: Siop Ffasiwn
@@ -1783,6 +1788,10 @@ cy:
         partial_changeset_without_comment: dim sylw
       details: 'Ateb neu ddysgu mwy am y grŵp newid: %{url}.'
       details_html: 'Ateb neu ddysgu mwy am y grŵp newid: %{url}.'
+      unsubscribe: Gallwch ddad-danysgrifio o ddiweddariadau i'r grŵp newid hwn yn
+        %{url}.
+      unsubscribe_html: Gallwch ddad-danysgrifio o ddiweddariadau i'r grŵp newid hwn
+        yn %{url}.
   confirmations:
     confirm:
       heading: Gwiriwch eich e-byst!
@@ -2657,6 +2666,7 @@ cy:
       application: Ap
       permissions: Caniatadau
       last_authorized: Awdurdodwyd Ddiweddaf
+      no_applications_html: Nid ydych wedi awdurdodi unrhyw apiau %{oauth2} eto.
     application:
       revoke: Dirymu Mynediad
       confirm_revoke: Dirymu mynediad ar gyfer yr ap hwn?

diff --git a/config/locales/da.yml b/config/locales/da.yml
index f692feaacd48707646dff1b02c984c6faa82de66..e6715c975f6451814b5a5a62b03add157a71d070 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -2552,7 +2552,7 @@ da:
     show:
       title: Viser spor %{name}
       heading: Viser spor %{name}
-      pending: VENTENDE
+      pending: AFVENTENDE
       filename: 'Filnavn:'
       download: hent
       uploaded: 'Overført:'
@@ -2571,7 +2571,7 @@ da:
       visibility: 'Synlighed:'
       confirm_delete: Slet dette spor?
     trace:
-      pending: VENTENDE
+      pending: AFVENTENDE
       count_points:
         one: '%{count} punkt'
         other: '%{count} punkter'

diff --git a/config/locales/my.yml b/config/locales/my.yml
index 9cfc23f2c103ce2e57023113dadfd824911ee2c1..d214bd5ce559af385c03740212947e7a6f77f513 100644 (file)
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -3,10 +3,16 @@
 # Export driver: phpyaml
 # Author: Dr Lotus Black
 # Author: Ninjastrikers
+# Author: Zyh333222
 # Author: ခွန်ပညာႏ(တောင်ႏကီꩻ)
 # Author: သူထွန်း
 ---
 my:
+  time:
+    formats:
+      friendly: |-
+        %e %B %Y
+         at %H:%M
   helpers:
     file:
       prompt: ဖိုင်ရွေးပါ

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 955d9a7fadd74c2238b0adabb1915e8ff50d4cdd..31f37fa7e8b7ff54c923cba16b895e119173469a 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -2267,44 +2267,61 @@ sc:
           cycleway_local: Pista tziclàbile locale
           footway: Caminu pro pedones
           rail: Ferrovia
+          train: Trenu
           subway: Metropolitana
+          light_rail: Trenu lèbiu/metropolitana lèbia
+          tram: Tram
+          bus: Postale
           cable_car: Funivia
           chair_lift: ascensore carrotzina
           runway: Pista de aeroportu
           taxiway: carrera de furriada
           apron: Àrea de parchègiu de sos aèreos
           admin: Làcana amministrativa
+          capital: Capitale
+          city: Tzitade
+          vineyard: Bìngia
           forest: Litu
           wood: Buscu
+          farmland: Terras de coltivu
+          grass: Erba
+          meadow: Pradu
+          bare_rock: Roca nuda
+          sand: Arena
           golf: Campu de golf
           park: Parcu
           common: Comunu
+          built_up: Zona fraigada
           resident: Àrea de residèntzia
           retail: Àrea cummertziale
           industrial: Àrea industriale
           commercial: Àrea cummertziale
           heathland: Istruvina
           lake: Lagu
-          reservoir: riserva de abba
+          reservoir: Riserva de abba
           farm: Fatoria
           brownfield: Terrinu industriale abbandonadu
           cemetery: Campusantu
           allotments: Giardinos familiares
           pitch: Campu isportivu
           centre: Tzentru isportivu
+          beach: Marina
           reserve: Reserva naturale
           military: Zona militare
           school: Iscola
-          university: universidade
+          university: Universidade
+          hospital: Ispidale
           building: Edifìtziu significativu
           station: Istatzione ferroviària
+          tram_stop: Firmada de su tram
           summit: Cùcuru de monte
-          peak: cùcuru
+          peak: Cùcuru
           tunnel: Lìnia trategiada = galleria
           bridge: Oros nieddos = ponte
           private: Atzessu privadu
           destination: Atzessu pro sa destinatzione
           construction: Caminos in costrutzione
+          bus_stop: Firmada de su postale
           bicycle_shop: Butega de bitzicletas
           bicycle_parking: Parchègiu pro bitzicletas
           toilets: Còmodu
@@ -2505,24 +2522,26 @@ sc:
       oauth2_applications: Aplicatziones OAuth 2
       oauth2_authorizations: Autorizatziones OAuth 2
     auth_providers:
+      openid_url: URL OpenID
+      openid_login_button: Sighi
       openid:
         title: Intra cun OpenID
-        alt: Intra cun un'URL de OpenID
+        alt: Logotipu de OpenID
       google:
         title: Intra cun Google
-        alt: Intra cun un'OpenID de Google
+        alt: Logotipu de Google
       facebook:
         title: Intra cun Facebook
-        alt: Intra cun unu contu de Facebook
+        alt: Logotipu de Facebook
       microsoft:
         title: Intra cun Microsoft
-        alt: Intra cun unu contu de Microsoft
+        alt: Logotipu de Microsoft
       github:
         title: Intra cun GitHub
-        alt: Intra cun unu contu de GitHub
+        alt: Logotipu de GitHub
       wikipedia:
         title: Intra cun Wikipedia
-        alt: Intra cun unu contu de Wikipedia
+        alt: Logotipu de Wikipedia
   oauth:
     permissions:
       missing: No as cuntzèdidu s'atzessu a custa caraterìstica  a s'aplicatzione
@@ -2582,6 +2601,7 @@ sc:
       title: Sas aplicatziones autorizadas meas
       application: Aplicatzione
       permissions: Permissos
+      last_authorized: Ùrtima autorizatzione
       no_applications_html: No as galu autorizadu peruna aplicatzione %{oauth2}.
     application:
       revoke: Rèvoca s'atzessu
@@ -2589,6 +2609,8 @@ sc:
   users:
     new:
       title: Iscrie·ti
+      tab_title: Registrati·ti
+      signup_to_authorize_html: Registra·ti cun OpenStreetMap pro atzèdere a %{client_app_name}.
       no_auto_account_create: A dolu mannu como non semus in gradu de creare unu contu
         pro tene in automàticu.
       please_contact_support_html: Cuntata %{support_link} pro fàghere in manera chi
@@ -2596,12 +2618,15 @@ sc:
         su prus in presse chi podimus.
       support: assistèntzia
       about:
-        header: Lìbera e modificàbile
+        header: Lìbera e modificàbile.
         paragraph_1: A diferèntzia de àteras mapas, OpenStreetMap est totu realizada
           dae persones che a tie e chie si siat la podet currègere, agiornare, iscarrigare
           o impreare in manera lìbera.
-        paragraph_2: Registra·ti pro incumintzare a contribuire. T'amus a imbiare
-          una lìtera eletrònica pro cunfirmare su contu tuo.
+        paragraph_2: Registra·ti pro incumintzare a contribuire.
+        welcome: Bene bènnidu in OpenStreetMap
+      duplicate_social_email: Si tenes giai unu contu de OpenStreetMap e boles impreare
+        unu frunidore de identidade esternu, intra impreende sa crae tua e muda sas
+        impostaduras de su contu tuo.
       display name description: Su nùmene de utente chi s'at a mustrare in manera
         pùblica. Lu podes cambiare prus a tardu in sas preferèntzias.
       by_signing_up:
@@ -2836,6 +2861,12 @@ sc:
       reason: Resone de su blocu
       status: Istadu
       revoker_name: Revocadu dae
+    navigation:
+      all_blocks: Totu sos blocos
+      blocks_on_me: Blocos subra a mene
+      blocks_by_me: Blocos fatos dae mene
+      block: 'Blocu #%{id}'
+      new_block: Blocu nou
   notes:
     index:
       title: Notas insertadas o cummentadas dae %{user}
@@ -2884,12 +2915,16 @@ sc:
       intro: As agatadu una faddina o carchi cosa chi mancat? Informa sos àteros mapadores
         a manera chi lu potzant acontzare. Move su marcadore a sa positzione curreta
         e iscrie una nota pro descrìere su problema.
+      anonymous_warning_log_in: intra
+      anonymous_warning_sign_up: registra·ti
       advice: Sa nota tua est pùblica e si podet impreare pro atualizare sa mapa,
         duncas non nch'insertes peruna informatzione personale o informatzione de
         mapas cun deretu de autore o elencos.
       add: Annanghe una nota
     notes_paging_nav:
       showing_page: Pàgina %{page}
+      next: Imbeniente
+      previous: Antepostu
   javascripts:
     close: Serra
     share:

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index f54160404ebfce64b3cb4fba3112066c96c0405e..2a6d11089e9c630c3daf5be1a0c70f0184dbb5e1 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1522,8 +1522,8 @@ sr:
       destroy_button: Обриши
       back: Назад
       wrong_user: Пријављени сте као '%{user}', али порука коју сте желели да прочитате
-        ниÑ\98е поÑ\81лаÑ\82а Ñ\82ом коÑ\80иÑ\81никÑ\83. Ð\9fÑ\80иÑ\98авиÑ\82е Ñ\81е као иÑ\81пÑ\80аван коÑ\80иÑ\81ник да биÑ\81Ñ\82е Ñ\98е
-        прочитали.
+        ниÑ\81Ñ\82е поÑ\81лали ви или Ñ\82ом коÑ\80иÑ\81никÑ\83. Ð\9fÑ\80иÑ\98авиÑ\82е Ñ\81е као иÑ\81пÑ\80аван коÑ\80иÑ\81ник да
+        биÑ\81Ñ\82е Ñ\98е пÑ\80оÑ\87иÑ\82али.
     sent_message_summary:
       destroy_button: Обриши
     heading: