From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 27 Sep 2023 14:47:44 +0000 (+0100)
Subject: Merge pull request #4201 from AntonKhorev/issues-limit-settings
X-Git-Tag: live~1310
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0a046673d630a4618c27559875ce613465d85d3c?ds=sidebyside;hp=-c

Merge pull request #4201 from AntonKhorev/issues-limit-settings

Move max value of issues counter to settings
---

0a046673d630a4618c27559875ce613465d85d3c
diff --combined config/locales/en.yml
index 530dad207,98ecbe8a7..da346e8e8
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -5,6 -5,8 +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
@@@ -228,7 -230,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})"
@@@ -2697,7 -2698,6 +2699,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
@@@ -2966,7 -2966,6 +2968,7 @@@
          cyclosm: CyclOSM
          cycle_map: Cycle Map
          transport_map: Transport Map
 +        tracestracktop_topo: Tracestrack Topo
          hot: Humanitarian
          opnvkarte: ÖPNVKarte
        layers:
@@@ -2987,8 -2986,6 +2989,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:
diff --combined config/settings.yml
index e228247e0,0352a85e0..214f8a284
--- a/config/settings.yml
+++ b/config/settings.yml
@@@ -43,6 -43,8 +43,8 @@@ max_note_request_area: 2
  default_note_query_limit: 100
  # Maximum limit on the number of notes returned by the note search api method
  max_note_query_limit: 10000
+ # Maximum value of open issues counter for moderators, anything equal or greater to this value "n" is shown as "n+"
+ max_issues_count: 99
  # Zoom level to use for postcode results from the geocoder
  postcode_zoom: 15
  # Timeout for API calls in seconds
@@@ -117,8 -119,6 +119,8 @@@ fossgis_valhalla_url: "https://valhalla
  #wikipedia_auth_secret: ""
  # Thunderforest authentication details
  #thunderforest_key: ""
 +# Tracestrack authentication details
 +#tracestrack_key: ""
  # Key for generating TOTP tokens
  #totp_key: ""
  # Enforce Content-Security-Policy