From: Tom Hughes Date: Thu, 25 Nov 2021 17:18:02 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/3381' X-Git-Tag: live~1915 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/54a158aef39a6a1bdca4ce030170d6f89fc06994?hp=17963b4da78c20a03da2dde101ee76a3c7b514ae Merge remote-tracking branch 'upstream/pull/3381' --- diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f66b60288..6ae40a3f5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,7 +17,7 @@ jobs: with: ruby-version: ${{ env.ruby }} - name: Cache gems - uses: actions/cache@v2.1.6 + uses: actions/cache@v2.1.7 with: path: vendor/bundle key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} @@ -41,7 +41,7 @@ jobs: with: ruby-version: ${{ env.ruby }} - name: Cache gems - uses: actions/cache@v2.1.6 + uses: actions/cache@v2.1.7 with: path: vendor/bundle key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} @@ -65,14 +65,14 @@ jobs: with: ruby-version: ${{ env.ruby }} - name: Cache gems - uses: actions/cache@v2.1.6 + uses: actions/cache@v2.1.7 with: path: vendor/bundle key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} restore-keys: | bundle-${{ env.os }}-${{ env.ruby }}- - name: Cache node modules - uses: actions/cache@v2.1.6 + uses: actions/cache@v2.1.7 with: path: node_modules key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }} @@ -100,7 +100,7 @@ jobs: with: ruby-version: ${{ env.ruby }} - name: Cache gems - uses: actions/cache@v2.1.6 + uses: actions/cache@v2.1.7 with: path: vendor/bundle key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3cedc6788..1d7c50350 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,14 +21,14 @@ jobs: with: ruby-version: ${{ matrix.ruby }} - name: Cache gems - uses: actions/cache@v2.1.6 + uses: actions/cache@v2.1.7 with: path: vendor/bundle key: bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-${{ hashFiles('Gemfile.lock') }} restore-keys: | bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}- - name: Cache node modules - uses: actions/cache@v2.1.6 + uses: actions/cache@v2.1.7 with: path: node_modules key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }} diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index f2afdcf7a..d9fa276ba 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -79,6 +79,16 @@ a { color: $blue; } +/* Rules for borders */ +/* These add additional colours to those provided by bootstrap */ +.border-grey { + border-color: $grey !important; +} + +.border-lightgrey { + border-color: $lightgrey !important; +} + /* Rules for the header */ #menu-icon { @@ -216,11 +226,6 @@ nav.secondary { } } - img.user_thumbnail_tiny { - border: 0; - border-radius: 3px; - } - #inboxanchor { display: inline-block; height: 25px; @@ -388,23 +393,6 @@ body.compact-nav { top: 20px; } } - - .icon.close { - float: right; - cursor: pointer; - } - - .flash { - padding: 15px; - - picture { - margin-right: -25px; - } - - div.message { - margin-left: 30px; - } - } } .overlay-sidebar #sidebar { @@ -819,38 +807,8 @@ tr.turn:hover { border-bottom: none; } - .paginate { - float: right; - padding: 1px 6px; - border: 1px solid $lightgrey; - border-radius: 3px; - } - - .browse-field { - margin-bottom: 10px; - - h4 { - padding: 5px 0 5px 10px; - font-size: 12px; - border: 1px solid $grey; - border-radius: 4px 4px 0 0; - background-color: $offwhite; - } - - p { - padding: 7px 10px; - font-size: 12px; - background-color: #FFF; - border: 1px solid $grey; - border-top: 0; - border-radius: 0 0 4px 4px; - } - } - .browse-tag-list { background-color: $offwhite; - border: 1px solid $grey; - border-radius: 3px; table-layout: fixed; border-collapse: separate; border-spacing: 0; @@ -902,16 +860,6 @@ tr.turn:hover { } } - .comments-header { - float: left; - } - - .subscribe-buttons { - float: left; - margin: 0 10px; - min-width: 80px; - } - .subscribe-buttons input { font-size: 90%; line-height: 15px; @@ -973,8 +921,6 @@ tr.turn:hover { .export_boxy { background: $lightgrey; - border: 1px solid $grey; - border-radius: 3px; #maxlat { margin-top: -1px; } #minlon { @@ -1082,7 +1028,6 @@ tr.turn:hover { .content_map { height: 200px; - border: 1px solid $grey; margin-bottom: $lineheight; } @@ -1124,26 +1069,9 @@ tr.turn:hover { padding-bottom: $lineheight/2; border-top: 1px solid $grey; - &:first-of-type { - margin-top: $lineheight/2; - } - &.deleted { background-color: #fee; } - - .post_heading { - margin-bottom: $lineheight; - - h2 { - margin-top: 0; - margin-bottom: $lineheight/2; - } - } - - img.user_thumbnail { - float: left; - } } /* Rules for the diary entry page */ @@ -1151,7 +1079,6 @@ tr.turn:hover { .diary_entries { #map { height: 400px; - border: 1px solid $grey; display: none; margin-bottom: $lineheight; } @@ -1180,10 +1107,6 @@ tr.turn:hover { } } -.diary_entries-show img.user_thumbnail { - float: left; -} - /* Rules for the log in page */ #login_auth_buttons { @@ -1199,7 +1122,6 @@ tr.turn:hover { .users-terms { .legale { - border: 1px solid $grey; padding: $lineheight; margin-bottom: $lineheight; overflow: auto; @@ -1312,8 +1234,6 @@ tr.turn:hover { /* Rules for "flash" notice boxes shown at the top of the content area */ .flash { - padding: $lineheight; - &.error { background-color: #ff7070; } @@ -1397,13 +1317,11 @@ tr.turn:hover { img.user_image { max-width: 100px; max-height: 100px; - border: 1px solid $grey; } img.user_thumbnail { max-width: 50px; max-height: 50px; - border: 1px solid $grey; } img.user_thumbnail_tiny { @@ -1411,7 +1329,6 @@ img.user_thumbnail_tiny { height: auto; max-width: 25px; max-height: 25px; - border: 1px solid $grey; } /* Rules for geo microformats */ diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss index d1d3db573..6cbbf1a27 100644 --- a/app/assets/stylesheets/parameters.scss +++ b/app/assets/stylesheets/parameters.scss @@ -15,6 +15,5 @@ $hovercolor: 20%; $headerHeight: 55px; $sidebarWidth: 350px; $keyline: 1px solid $lightgrey; -$border-radius: 3px; $list-highlight: #FFFFC0; $border: 1px solid $grey; diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb index 12f31bad2..312e1e54c 100644 --- a/app/controllers/diary_entries_controller.rb +++ b/app/controllers/diary_entries_controller.rb @@ -235,6 +235,8 @@ class DiaryEntriesController < ApplicationController end def comments + @title = t ".title", :user => @user.display_name + conditions = { :user_id => @user } conditions[:visible] = true unless can? :unhidecomment, DiaryEntry diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index eed55cd9d..a6161fa43 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -2,7 +2,7 @@ module UserHelper # User images def user_image(user, options = {}) - options[:class] ||= "user_image" + options[:class] ||= "user_image border border-grey" options[:alt] ||= "" if user.image_use_gravatar @@ -15,7 +15,7 @@ module UserHelper end def user_thumbnail(user, options = {}) - options[:class] ||= "user_thumbnail" + options[:class] ||= "user_thumbnail border border-grey" options[:alt] ||= "" if user.image_use_gravatar @@ -28,7 +28,7 @@ module UserHelper end def user_thumbnail_tiny(user, options = {}) - options[:class] ||= "user_thumbnail_tiny" + options[:class] ||= "user_thumbnail_tiny border border-grey" options[:alt] ||= "" if user.image_use_gravatar diff --git a/app/views/browse/_paging_nav.html.erb b/app/views/browse/_paging_nav.html.erb index 67f1c75a3..e13b1a9b8 100644 --- a/app/views/browse/_paging_nav.html.erb +++ b/app/views/browse/_paging_nav.html.erb @@ -1,5 +1,14 @@ -<% if pages.page_count > 1 %> - - <%= raw pagination_links_each(pages, {}) { |n| link_to(n, page_param => n) } %> - -<% end %> +
+
+

<%= heading %>

+
+ <% if pages.page_count > 1 %> +
+

+ + <%= raw pagination_links_each(pages, {}) { |n| link_to(n, page_param => n) } %> + +

+
+ <% end %> +
diff --git a/app/views/browse/_tag_details.html.erb b/app/views/browse/_tag_details.html.erb index 0e1a3fbef..0868bb8e5 100644 --- a/app/views/browse/_tag_details.html.erb +++ b/app/views/browse/_tag_details.html.erb @@ -1,6 +1,6 @@ <% unless tag_details.empty? %>

<%= t ".tags" %>

- +
<%= render :partial => "tag", :collection => tag_details.sort %>
<% end %> diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 496589a08..6aa0f11fb 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -10,21 +10,25 @@ <%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %> -

<%= t(".discussion") %>

- - <% if current_user %> -
-
- <% if @changeset.subscribers.exists?(current_user.id) %> - " data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" /> - <% else %> - " data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" /> - <% end %> -
+
+
+

<%= t(".discussion") %>

- <% end %> -
+ <% if current_user %> +
+ +
+ <% end %> +
<% if @comments.length > 0 %>
@@ -74,7 +78,7 @@
-
+
" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1" class="btn btn-sm btn-primary" />
@@ -86,10 +90,7 @@ <% end %> <% unless @ways.empty? %> -

- <%= type_and_paginated_count("way", @way_pages) %> - <%= render :partial => "paging_nav", :locals => { :pages => @way_pages, :page_param => "way_page" } %> -

+ <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("way", @way_pages), :pages => @way_pages, :page_param => "way_page" } %>
    <% @ways.each do |way| %>
  • <%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %>
    • @@ -98,10 +99,7 @@ <% end %> <% unless @relations.empty? %> -

    - <%= type_and_paginated_count("relation", @relation_pages) %> - <%= render :partial => "paging_nav", :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> -

    + <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("relation", @relation_pages), :pages => @relation_pages, :page_param => "relation_page" } %>
      <% @relations.each do |relation| %>
    • <%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class("relation", relation), :title => link_title(relation) } %>
      • @@ -110,10 +108,7 @@ <% end %> <% unless @nodes.empty? %> -

      - <%= type_and_paginated_count("node", @node_pages) %> - <%= render :partial => "paging_nav", :locals => { :pages => @node_pages, :page_param => "node_page" } %> -

      + <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("node", @node_pages), :pages => @node_pages, :page_param => "node_page" } %>
        <% @nodes.each do |node| %>
      • <%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :class => link_class("node", node), :title => link_title(node), :rel => link_follow(node) } %>
        • diff --git a/app/views/dashboards/show.html.erb b/app/views/dashboards/show.html.erb index 0f04dafb9..d0344ce79 100644 --- a/app/views/dashboards/show.html.erb +++ b/app/views/dashboards/show.html.erb @@ -6,7 +6,7 @@ <% if current_user and @user.id == current_user.id %>
        <% if @user.home_lat.nil? or @user.home_lon.nil? %> -
        +

        <%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %>

        <% else %> @@ -19,7 +19,7 @@ :icon => image_path("marker-red.png"), :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" }) } %> - <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %> + <%= tag.div "", :id => "map", :class => "content_map border border-grey rounded", :data => { :user => user_data } %> <% end %> <% friends = @user.friends %> diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb index 2b3dad055..68b0a265a 100644 --- a/app/views/diary_entries/_diary_entry.html.erb +++ b/app/views/diary_entries/_diary_entry.html.erb @@ -1,5 +1,5 @@
        -
        +
        <% if @user %>

        <%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %>

        <% else %> diff --git a/app/views/diary_entries/_form.html.erb b/app/views/diary_entries/_form.html.erb index ed7164e88..f72abc19e 100644 --- a/app/views/diary_entries/_form.html.erb +++ b/app/views/diary_entries/_form.html.erb @@ -5,7 +5,7 @@
        <%= t ".location" -%> - <%= tag.div "", :id => "map", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %> + <%= tag.div "", :id => "map", :class => "border border-grey rounded", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
        <%= f.text_field :latitude, :wrapper_class => "col-sm-4", :id => "latitude" %> diff --git a/app/views/diary_entries/comments.html.erb b/app/views/diary_entries/comments.html.erb index 5f08f8d30..e3a7ff23e 100644 --- a/app/views/diary_entries/comments.html.erb +++ b/app/views/diary_entries/comments.html.erb @@ -1,5 +1,6 @@ <% content_for :heading do %> -

        <%= t(".has_commented_on", :display_name => @user.display_name) %>

        +

        <%= t ".heading", :user => @user.display_name %>

        +

        <%= t ".subheading_html", :user => link_to(@user.display_name, user_path(@user)) %>

        <% end %> <% if @comments.empty? %> diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb index f8eabaeb3..5dda3ad5c 100644 --- a/app/views/layouts/_flash.html.erb +++ b/app/views/layouts/_flash.html.erb @@ -1,5 +1,5 @@ <% if flash[:error] %> -
        +
        " type="image/svg+xml" /> @@ -11,7 +11,7 @@ <% end %> <% if flash[:warning] %> -
        +
        " type="image/svg+xml"> @@ -23,7 +23,7 @@ <% end %> <% if flash[:notice] %> -
        +
        " type="image/svg+xml"> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 192b07614..0171752ff 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -81,7 +81,7 @@ <% if current_user && current_user.id %>
        - <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25) %> + <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-sm") %> <%= render :partial => "layouts/inbox" %> diff --git a/app/views/profiles/edit.html.erb b/app/views/profiles/edit.html.erb index 8eca6f4f7..c57f98a04 100644 --- a/app/views/profiles/edit.html.erb +++ b/app/views/profiles/edit.html.erb @@ -53,7 +53,7 @@ checked="checked" <% end %> id="updatehome" />
        - <%= tag.div "", :id => "map", :class => "content_map set_location" %> + <%= tag.div "", :id => "map", :class => "content_map set_location border border-grey rounded" %>
        <%= f.primary t(".save") %> diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb index e612ff1af..b3a3bd0e9 100644 --- a/app/views/site/export.html.erb +++ b/app/views/site/export.html.erb @@ -6,7 +6,7 @@ <%= hidden_field_tag "format", "osm", :autocomplete => "off" %>
        -
        +
        <%= text_field_tag("maxlat", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control mx-auto") %>
        <%= text_field_tag("minlon", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control") %> diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb index 05cf62e3e..58bddaca5 100644 --- a/app/views/users/terms.html.erb +++ b/app/views/users/terms.html.erb @@ -30,7 +30,7 @@ <% end %>
        -
        +
        <%= render :partial => "terms" %>
        diff --git a/config/locales/be.yml b/config/locales/be.yml index bceb460f8..d53a04dae 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -337,8 +337,8 @@ be: way: лінія relation: дачыненне start_rjs: - feature_warning: Неабходна загрузіць %{num_features} аб'ектаў, што можа запаволіць - ваш браўзэр. Вы ўпэўнены, што жадаеце праглядзець гэтыя дадзеныя? + feature_warning: Неабходна загрузіць %{num_features} аб’ектаў, што можа запаволіць + ваш браўзер. Вы ўпэўнены, што жадаеце праглядзець гэтыя даныя? load_data: Сцягнуць дадзеныя loading: Загрузка... tag_details: @@ -1713,7 +1713,7 @@ be: user_page_link: старонка карыстальніка anon_edits_link_text: Даведацца ў чым справа. id_not_configured: iD не быў настроены - no_iframe_support: Ваш браўзэр не падтрымлівае HTML iframe, якія неабходныя + no_iframe_support: Ваш браўзер не падтрымлівае рамкі HTML, якія з’яўляюцца неабходнымі для гэтай функцыі. export: title: Экспарт diff --git a/config/locales/de.yml b/config/locales/de.yml index 2a74f8c2a..97f76c953 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -2856,6 +2856,7 @@ de: no_authorization_code: Kein Autorisierungscode unknown_signature_algorithm: Unbekannter Signaturalgorithmus invalid_scope: Ungültiger Bereich + unknown_error: Authentifizierung fehlgeschlagen auth_association: heading: Deine ID ist noch nicht mit einem OpenStreetMap-Konto verknüpft. option_1: |- diff --git a/config/locales/en.yml b/config/locales/en.yml index 7dae05c57..db77a816e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -504,7 +504,9 @@ en: title: "OpenStreetMap diary entries" description: "Recent diary entries from users of OpenStreetMap" comments: - has_commented_on: "%{display_name} has commented on the following diary entries" + title: "Diary Comments added by %{user}" + heading: "%{user}'s Diary Comments" + subheading_html: "Diary Comments added by %{user}" no_comments: "No diary comments" post: Post when: When diff --git a/config/locales/es.yml b/config/locales/es.yml index 71fe50ec2..5c90cb4b3 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -2043,10 +2043,10 @@ es: Austria: Contiene datos de         Stadt Wien (bajo CC BY), Land Vorarlberg y Land Tirol (bajo licencia CC BY AT con modificaciones). - contributors_au_html: 'Australia: Contiene datos procedentes - de PSMA - Australia Limite con licencia de Commonwealth of Australia bajo CC BY 4.0.' + contributors_au_html: 'Australia: Contiene o se ha desarrollado + usando límites administrativos de © Geoscape + Australia con licencia de la Commonwealth de Australia bajo licencia + Creative Commons Atribución 4.0 Internacional (CC BY 4.0).' contributors_ca_html: 'Canadá: contiene datos de GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) y StatCan (Geography Division, Statistics diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 0f296e278..ac2646e37 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -2870,6 +2870,7 @@ fr: no_authorization_code: Aucun code d’autorisation unknown_signature_algorithm: Algorithme de signature inconnu invalid_scope: Étendue non valide + unknown_error: Échec d’authentification auth_association: heading: Votre ID n’est pas encore associé à un compte OpenStreetMap. option_1: Si vous êtes nouveau sur OpenStreetMap, veuillez créer un nouveau diff --git a/config/locales/fy.yml b/config/locales/fy.yml index e46933f51..badb30df9 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -19,12 +19,17 @@ fy: diary_entry: create: Publisearje update: Bywurkje + issue_comment: + create: Reäksje taheakje message: create: Ferstjoere client_application: update: Bywurkje doorkeeper_application: update: Bywurkje + redaction: + create: Redigearring oanmeitsje + update: Redigearring bewarje trace: create: Oplade update: Feroarings bewarje @@ -64,7 +69,7 @@ fy: way_tag: Linelebel attributes: diary_comment: - body: Tekst + body: Ynhâld diary_entry: user: Meidogger title: Underwerp @@ -99,6 +104,8 @@ fy: report: category: Selektearje in reden foar jo melding user: + auth_provider: Autentifikaasje-oanbieder + auth_uid: Autentifikaasje-UID email: E-mail email_confirmation: Befêstiging e-mail new_email: Nij e-mailadres @@ -112,6 +119,8 @@ fy: pass_crypt: Wachtwurd pass_crypt_confirmation: Wachtwurd befêstigje help: + trace: + tagstring: skaat mei komma's user: email_confirmation: Jo adres wurdt net publikelik toand; sjoch ús Privacybelied @@ -281,7 +290,7 @@ fy: note: notysje timeout: title: Tiid ferrûn - sorry: Spitich, it opfreegjen fan 'e data foar %{type}-ID %{id} duorre te lang. + sorry: Spitich, it opheljen fan 'e data foar %{type}-ID %{id} duorre te lang. type: node: punt way: line @@ -290,12 +299,12 @@ fy: note: notysje redacted: redaction: Redigearring %{id} - message_html: '%{type}-ferzje %{version} kin nei redaksje net werjûn wurde. - Sjoch %{redaction_link} foar ynformaasje.' + message_html: Ferzje %{version} fan %{type} kin nei redaksje net werjûn wurde. + Sjoch %{redaction_link} foar ynformaasje. type: - node: Punt - way: Line - relation: Relaasje + node: punt + way: line + relation: relaasje start_rjs: feature_warning: '%{num_features} skaaimerken wurde laden, wat jo webblêder traach meitsje kin of dat er net mear reägearret. Wolle jo wier dy data werjaan?' @@ -303,6 +312,14 @@ fy: loading: Laden ... tag_details: tags: Lebels + wiki_link: + key: De wiki-beskriuwingsside foar it lebel %{key} + tag: De wiki-beskriuwingsside foar it lebel %{key}=%{value} + wikidata_link: It item %{page} op Wikidata + wikipedia_link: It artikel %{page} op 'e Wikipedy + wikimedia_commons_link: It bestân %{page} op Wikimedia Commons + telephone_link: '%{phone_number} skilje' + colour_preview: Proefbyld kleur %{colour_value} note: title: 'Notysje: %{id}' new_note: Nije notysje @@ -352,6 +369,21 @@ fy: no_more_area: Gjin wizigingssets mear yn dizze krite. no_more_user: Gjin wizigingssets mear fan dizze meidogger. load_more: Mear lade + timeout: + sorry: Spitich, it opheljen fan 'e list wizigingssets dy't jo fregen duorre + te lang. + changeset_comments: + comment: + comment: 'Nije reäksje op wizigingsset #%{changeset_id} fan %{author}' + commented_at_by_html: Bywurke %{when} troch %{user} + comments: + comment: 'Nije reäksje op wizigingsset #%{changeset_id} fan %{author}' + index: + title_all: Oerlis oer OpenStreetMap-wizigingsset + title_particular: 'Oerlis oer OpenStreetMap-wizigingsset #%{changeset_id}' + timeout: + sorry: Spitich, it opheljen fan 'e list wizigingssetreäksjes dy't jo fregen + duorre te lang. dashboards: contact: km away: '%{count}km fuort' @@ -389,6 +421,7 @@ fy: new_title: In nij stik yn myn meidoggerdeiboek skriuwe my_diary: Myn deiboek no_entries: Gjin deiboekstikken + recent_entries: Deiboekstikken fan koartby older_entries: Aldere stikken newer_entries: Nijere stikken edit: @@ -402,6 +435,7 @@ fy: login: Meld jo oan no_such_entry: title: Deiboekstik ûnbekend + heading: 'Gjin stik mei ID: %{id}' diary_entry: posted_by_html: Pleatst troch %{link_user} op %{created} yn it %{language_link}. updated_at_html: Lêst bywurke op %{updated}. @@ -440,7 +474,7 @@ fy: make_friend: heading: '%{user} as freon tafoegje?' button: As freon tafoegje - success: '%{name} is no jo freon!' + success: '%{name} is no jo freon(dinne)!' failed: Spitich, %{name} as freon tafoegjen mislearre. already_a_friend: Jo binne al freonen mei %{name}. remove_friend: @@ -467,12 +501,19 @@ fy: station: Kabelbaanstasjon aeroway: aerodrome: Fleanfjild + airstrip: Lâningsstripe apron: Platfoarm gate: Gate + hangar: Hangaar helipad: Helyhaven + holding_position: Wachtposysje + navigationaid: Grûnljochten loftfeart + parking_position: Parkearposysje runway: Start-/lâningsbaan + taxilane: Taksystripe taxiway: Taksybaan - terminal: Terminal + terminal: Passazjiershal + windsock: Wynsek amenity: animal_boarding: Bistepinsjon animal_shelter: Biste-asyl @@ -662,10 +703,16 @@ fy: railway: Histoaryske spoarwei roman_road: Romeinske wei ruins: Ruïne + rune_stone: Runestien stone: Stien tomb: Tombe tower: Toer + wayside_chapel: Weikapel + wayside_cross: Weikrús + wayside_shrine: Weiskryn wreck: Wrak + junction: + "yes": Krusing landuse: allotments: Folkstunen basin: Wetterbekken @@ -792,6 +839,7 @@ fy: estate_agent: Makelder lawyer: Jurist ngo: Kantoar NGO + telecommunication: Tillekommunikaasjekantoar travel_agent: Reisburo "yes": Kantoar place: @@ -819,7 +867,7 @@ fy: square: Plein state: Steat subdivision: Dielgebiet - suburb: Foarstêd + suburb: Stedsdiel town: Stêd village: Doarp "yes": Plak @@ -932,6 +980,7 @@ fy: level7: Gemeentegrins level8: Stedsgrins level9: Doarpsgrins + level10: Stedsdielgrins level11: Buertgrins types: cities: Grutte stêden @@ -949,8 +998,10 @@ fy: home: Nei jo fêste lokaasje logout: Ofmelde log_in: Oanmelde + log_in_tooltip: Oanmelde mei in besteand akkount sign_up: Ynskriuwe start_mapping: Set útein + sign_up_tooltip: In akkount foar bewurkjen oanmeitsje edit: Bewurkje history: Skiednis export: Eksportearje @@ -1157,6 +1208,7 @@ fy: no_such_message: title: Berjocht ûnbekend heading: Berjocht ûnbekend + body: Spitich, der is gjin berjocht mei dy ID. outbox: title: Utfek my_inbox: Myn ynfek @@ -1189,9 +1241,22 @@ fy: destroyed: Berjocht wiske passwords: lost_password: + title: Wachtwurd kwyt + heading: Wachtwurd fergetten? email address: 'E-mailadres:' + new password button: Nij wachtwurd + help_text: Folje it e-mailadres yn dat jo by it ynskriuwen brûkt hawwe. Wy stjoere + der dan in keppeling hinne dy't jo brûke kinne en stel jo wachtwurd op 'e + nij yn. + notice email on way: Spitich dat jo 'm kwyt binne :-( mar in e-mail is ûnderweis, + dat jo kinne gau in nijenien ynstelle. + notice email cannot find: Koe dat e-mailadres net fine, spitich. reset_password: + title: Nij wachtwurd + heading: Wachtwurd op 'e nij ynstelle foar %{user} + reset: Nij wachtwurd flash changed: Jo wachtwurd is feroare. + flash token bad: Haw dat bewiisteken net fûn, de URL efkes neisjen? preferences: show: title: Myn foarkarren @@ -1396,7 +1461,7 @@ fy: - -taksybaan apron: - Lofthavenplatfoarm - - -terminal + - -passazjiershal admin: Bestjoerlike grins forest: Bosk wood: Wâld @@ -1458,9 +1523,17 @@ fy: identifiable: Identifisearber (werjûn yn 'e trajektelist en as identifisearbere, oardere punten mei tiidstimpels) new: + upload_trace: GPS-trajekt oplade + visibility_help: wat betsjut dat? + visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces help: Help + help_url: https://wiki.openstreetmap.org/wiki/Upload + create: + upload_trace: GPS-trajekt oplade edit: cancel: Annulearje + visibility_help: wat betsjut dat? + visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces update: updated: Trajekt bywurke trace_optionals: @@ -1590,7 +1663,7 @@ fy: edits: Bewurkings traces: Trajekten notes: Kaartnotysjes - remove as friend: Freon ôffiere + remove as friend: Freon ôf add as friend: Freon tafoegje mapper since: 'Kaartmakker sûnt:' ct status: 'Bydragersbetingsten:' @@ -1627,6 +1700,7 @@ fy: heading: Bydragersbetingsten agreed: Jo binne akkoart gien mei de nije Bydragersbetingsten. not yet agreed: Jo binne noch net akkoart gien mei de nije Bydragersbetingsten. + link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: wat is dit? save changes button: Feroarings bewarje index: @@ -1864,4 +1938,9 @@ fy: show: description: 'Beskriuwing:' user: 'Auteur:' + validations: + leading_whitespace: begjint mei wytromte + trailing_whitespace: einiget mei wytromte + invalid_characters: befettet ûnjildige tekens + url_characters: befettet spesjale URL-tekens (%{characters}) ... diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 3dc288187..9b9b219a8 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -2479,6 +2479,7 @@ ko: no_authorization_code: 인증 코드가 없습니다. unknown_signature_algorithm: 알려지지 않은 인증 알고리즘 invalid_scope: 잘못된 범위 + unknown_error: 인증 실패 auth_association: heading: 당신의 ID는 아직 OpenStreetMap 계정에 등록되지 않았습니다. option_1: 만약 당신이 OpenStreetMap에 처음이시면, 아래 양식을 사용해 새 계정을 만들어 주세요. diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 4a1b29a78..20edb15a3 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -2747,6 +2747,7 @@ mk: no_authorization_code: Нема код за овластување unknown_signature_algorithm: Непознат алгоритам на потпис invalid_scope: Неважечки делокруг + unknown_error: Заверката не успеа auth_association: heading: Вашата назнака сè уште не е здружена со сметка на OpenStreetMap. option_1: Доколку сте нови на OpenStreetMap, направете сметка користејќи го diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml index f813dc749..2764e7546 100644 --- a/config/locales/nqo.yml +++ b/config/locales/nqo.yml @@ -1505,4 +1505,6 @@ nqo: public editing: enabled link text: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟ disabled link text: ߡߎ߲߬ߠߊ߫ ߒߠߋ ߕߍ߫ ߛߋ߫ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߍ߫ ߟߊ߫؟ + auth_failure: + unknown_error: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߓߘߊ߫ ߗߌߙߏ߲߫ ... diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 06cee6c9b..141016410 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -3062,7 +3062,7 @@ pl: queryfeature_disabled_tooltip: Przybliż mapę, aby obejrzeć dane obiektów changesets: show: - comment: Komentować + comment: Komentarz subscribe: Obserwuj unsubscribe: Nie obserwuj hide_comment: ukryj @@ -3083,7 +3083,7 @@ pl: resolve: Oznacz jako rozwiązaną reactivate: Ponownie aktywuj comment_and_resolve: Skomentuj i rozwiąż - comment: Komentować + comment: Dodaj komentarz edit_help: Proszę przesunąć mapę i przybliżyć modyfikowane położenie, a następnie kliknąć tutaj. directions: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index e02c65f9a..c236bd80a 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -757,6 +757,7 @@ ru: loading_dock: Загрузочный док love_hotel: Отель любви marketplace: Рынок + mobile_money_agent: Агент мобильных денег monastery: Монастырь money_transfer: Перевод денег motorcycle_parking: Парковка для мотоциклов @@ -883,6 +884,8 @@ ru: electrician: Электрик electronics_repair: Ремонт электроники gardener: Садовник + glaziery: Стекольщик + handicraft: Ремесло painter: Художник photographer: Фотограф plumber: Сантехник diff --git a/config/locales/sat.yml b/config/locales/sat.yml index 65647a814..5e516eb11 100644 --- a/config/locales/sat.yml +++ b/config/locales/sat.yml @@ -23,6 +23,8 @@ sat: client_application: create: ᱧᱩᱛᱩᱢ ᱚᱞ update: ᱦᱟᱹᱞᱤᱭᱟᱹᱜ + doorkeeper_application: + update: ᱟᱹᱨᱩ ᱯᱷᱮᱨᱟᱣ trace: create: ᱞᱟᱫᱮ update: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱱᱪᱟᱣ ᱢᱮ diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 870d933c9..7cc250ead 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -1974,11 +1974,10 @@ sv: och länka direkt till licenserna. I media där länkar ej är möjliga (t.ex. tryckt material), förslÃ¥r vi att du hänvisar dina läsare till openstreetmap.org (förslagsvis genom att expandera 'OpenStreetMap' till hela denna adress), till opendatacommons.org, och om relevant till creativecommons.org. - credit_3_1_html: 'Kartrutorna i “standardstilen” pÃ¥ www.openstreetmap.org + credit_3_1_html: Kartrutorna i “standardstilen” pÃ¥ www.openstreetmap.org är ett producerat verk av OpenStreetMap Foundation med hjälp av OpenStreetMap-data - under licensen Open Database. Använder du dessa rutor, vänligen använd följande - erkännande: “Baskarta och data frÃ¥n OpenStreetMap och OpenStreetMap - Foundation”.' + under licensen Open Database. När du använder denna kartstil krävs samma + erkännande som för kartdata. credit_4_html: |- För en navigerbar elektronisk karta, ska källhänvisningen synas i ena hörnet av kartan. Till exempel: @@ -2561,6 +2560,8 @@ sv: confirm_delete: Radera den här applikationen? client_id: Klient-ID client_secret: Klienthemlighet + client_secret_warning: Se till att spara denna hemlighet - den kommer inte vara + tillgänglig igen permissions: Behörigheter redirect_uris: Omdirigerings-URI:er not_found: @@ -2780,6 +2781,7 @@ sv: no_authorization_code: Ingen behörighetskod unknown_signature_algorithm: Okänd signaturalgoritm invalid_scope: Ogiltiga omfattning + unknown_error: Autentisering misslyckades auth_association: heading: Ditt ID är inte associerat med ett OpenStreetMap-konto ännu. option_1: |- diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 6300a059d..ab3647e06 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -2822,6 +2822,7 @@ uk: no_authorization_code: Немає коду авторизації unknown_signature_algorithm: Невідомий алгоритм підпису invalid_scope: Недійсна область + unknown_error: Помилка автентифікації auth_association: heading: Ваш ID ще не пов'язаний з обліковим записом OpenStreetMap. option_1: Якщо ви вперше в OpenStreetMap – створіть новий обліковий запис, використовуючи diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml index 322044caa..d54f87a7f 100644 --- a/config/locales/xmf.yml +++ b/config/locales/xmf.yml @@ -992,6 +992,9 @@ xmf: waterway: artificial: ხელუანური წყაროლინი canal: არხი + users: + auth_failure: + unknown_error: ავთენტიფიკაციაქ ვეგშართჷ user_blocks: show: created: 'გიჭყჷ:' diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb index 33e483652..b1e9b72f2 100644 --- a/test/controllers/diary_entries_controller_test.rb +++ b/test/controllers/diary_entries_controller_test.rb @@ -319,7 +319,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1 end assert_select "div#content", :count => 1 do - assert_select "div.post_heading", :text => /#{new_title}/, :count => 1 + assert_select "h2", :text => /#{new_title}/, :count => 1 # This next line won't work if the text has been run through the htmlize function # due to formatting that could be introduced assert_select "p", :text => /#{new_body}/, :count => 1 @@ -339,7 +339,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1 end assert_select "div#content", :count => 1 do - assert_select "div.post_heading", :text => /#{new_title}/, :count => 1 + assert_select "h2", :text => /#{new_title}/, :count => 1 # This next line won't work if the text has been run through the htmlize function # due to formatting that could be introduced assert_select "p", :text => /#{new_body}/, :count => 1 diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb index 8cef4d2dc..11a47a195 100644 --- a/test/helpers/user_helper_test.rb +++ b/test/helpers/user_helper_test.rb @@ -8,12 +8,12 @@ class UserHelperTest < ActionView::TestCase gravatar_user = create(:user, :image_use_gravatar => true) image = user_image(user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_image(user, :class => "foo") assert_match %r{^$}, image image = user_image(gravatar_user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_image(gravatar_user, :class => "foo") assert_match %r{^$}, image @@ -24,13 +24,13 @@ class UserHelperTest < ActionView::TestCase gravatar_user = create(:user, :image_use_gravatar => true) image = user_thumbnail(user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_thumbnail(user, :class => "foo") assert_match %r{^$}, image image = user_thumbnail(gravatar_user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_thumbnail(gravatar_user, :class => "foo") assert_match %r{^$}, image @@ -41,13 +41,13 @@ class UserHelperTest < ActionView::TestCase gravatar_user = create(:user, :image_use_gravatar => true) image = user_thumbnail_tiny(user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_thumbnail_tiny(user, :class => "foo") assert_match %r{^$}, image image = user_thumbnail_tiny(gravatar_user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_thumbnail_tiny(gravatar_user, :class => "foo") assert_match %r{^$}, image