From: Andy Allan <git@gravitystorm.co.uk>
Date: Thu, 26 Oct 2023 12:06:56 +0000 (+0100)
Subject: Merge pull request #4170 from osmcz/cuzk
X-Git-Tag: live~477
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/98bfaace9aeba7fb387596cc16b2e661506173c6?hp=-c

Merge pull request #4170 from osmcz/cuzk

Add contributor info for Czechia for copyright web page
---

98bfaace9aeba7fb387596cc16b2e661506173c6
diff --combined config/locales/en.yml
index cd7d67947,6fa9ef9be..158f19ac4
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -5,8 -5,6 +5,8 @@@ en
      formats:
        friendly: "%e %B %Y at %H:%M"
        blog: "%e %B %Y"
 +  count:
 +    at_least_pattern: "%{count}+"
    helpers:
      file:
        prompt: Choose file
@@@ -214,7 -212,7 +214,7 @@@
        openid: OpenID
        google: Google
        facebook: Facebook
 -      windowslive: Microsoft
 +      microsoft: Microsoft
        github: GitHub
        wikipedia: Wikipedia
    api:
@@@ -230,7 -228,6 +230,7 @@@
          reopened_at_by_html: "Reactivated %{when} by %{user}"
        rss:
          title: "OpenStreetMap Notes"
 +        description_all: "A list of reported, commented on or closed notes"
          description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
          description_item: "An rss feed for note %{id}"
          opened: "new note (near %{place})"
@@@ -559,31 -556,10 +559,31 @@@
        newer_comments: "Newer Comments"
        older_comments: "Older Comments"
    doorkeeper:
 +    errors:
 +      messages:
 +        account_selection_required: "The authorization server requires end-user account selection"
 +        consent_required: "The authorization server requires end-user consent"
 +        interaction_required: "The authorization server requires end-user interaction"
 +        login_required: "The authorization server requires end-user authentication"
      flash:
        applications:
          create:
            notice: Application Registered.
 +    openid_connect:
 +      errors:
 +        messages:
 +          # Configuration error messages
 +          auth_time_from_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner missing configuration."
 +          reauthenticate_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner missing configuration."
 +          resource_owner_from_access_token_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token missing configuration."
 +          select_account_for_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner missing configuration."
 +          subject_not_configured: "ID Token generation failed due to Doorkeeper::OpenidConnect.configure.subject missing configuration."
 +    scopes:
 +      address: "View your physical address"
 +      email: "View your email address"
 +      openid: "Authenticate your account"
 +      phone: "View your phone number"
 +      profile: "View your profile information"
    errors:
      contact:
        contact_url: https://wiki.openstreetmap.org/wiki/Contact
@@@ -1809,7 -1785,7 +1809,7 @@@
          facebook:
            title: Login with Facebook
            alt: Login with a Facebook Account
 -        windowslive:
 +        microsoft:
            title: Login with Microsoft
            alt: Login with a Microsoft Account
          github:
@@@ -2019,6 -1995,12 +2019,12 @@@
            Resources Canada), and StatCan (Geography Division,
            Statistics Canada).
          contributors_ca_canada: Canada
+         contributors_cz_credit_html: |
+           %{czechia}: Contains data from the State Administration of Land Surveying
+           and Cadastre licensed under %{cc_licence_link}
+         contributors_cz_czechia: Czechia
+         contributors_cz_cc_licence: Creative Commons Attribution 4.0 International licence (CC BY 4.0)
+         contributors_cz_cc_licence_url: https://creativecommons.org/licenses/by/4.0/
          contributors_fi_credit_html: |
            %{finland}: Contains data from the
            National Land Survey of Finland's Topographic Database
@@@ -2551,7 -2533,6 +2557,7 @@@
      permissions:
        missing: "You have not permitted the application access to this facility"
      scopes:
 +      openid: Sign-in using OpenStreetMap
        read_prefs: Read user preferences
        write_prefs: Modify user preferences
        write_diary: Create diary entries, comments and make friends
@@@ -2721,7 -2702,6 +2727,7 @@@
        remove as friend: Unfriend
        add as friend: Add Friend
        mapper since: "Mapper since:"
 +      uid: "User id:"
        ct status: "Contributor terms:"
        ct undecided: Undecided
        ct declined: Declined
@@@ -2904,9 -2884,7 +2910,9 @@@
      index:
        title: "Notes submitted or commented on by %{user}"
        heading: "%{user}'s Notes"
 -      subheading_html: "Notes submitted or commented on by %{user}"
 +      subheading_html: "Notes %{submitted} or %{commented} by %{user}"
 +      subheading_submitted: "submitted"
 +      subheading_commented: "commented on"
        no_notes: No notes
        id: "Id"
        creator: "Creator"
@@@ -2990,7 -2968,6 +2996,7 @@@
          cyclosm: CyclOSM
          cycle_map: Cycle Map
          transport_map: Transport Map
 +        tracestracktop_topo: Tracestrack Topo
          hot: Humanitarian
          opnvkarte: ÖPNVKarte
        layers:
@@@ -3011,8 -2988,6 +3017,8 @@@
        andy_allan: Andy Allan
        opnvkarte_credit: "Tiles courtesy of %{memomaps_link}"
        memomaps: MeMoMaps
 +      tracestrack_credit: "Tiles courtesy of %{tracestrack_link}"
 +      tracestrack: Tracestrack
        hotosm_credit: "Tiles style by %{hotosm_link} hosted by %{osm_france_link}"
        hotosm_name: Humanitarian OpenStreetMap Team
      site: