From: Tom Hughes Date: Thu, 30 May 2019 17:06:58 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/2225' X-Git-Tag: live~3608 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/f99c383318c4f9ea15639f0566f3e42db4e2c8b1?hp=-c Merge remote-tracking branch 'upstream/pull/2225' --- f99c383318c4f9ea15639f0566f3e42db4e2c8b1 diff --combined config/locales/en.yml index ec6591226,bc852600c..516dad37a --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -5,11 -5,6 +5,11 @@@ en formats: friendly: "%e %B %Y at %H:%M" blog: "%e %B %Y" + helpers: + submit: + diary_entry: + create: "Publish" + update: "Update" activerecord: errors: messages: @@@ -287,14 -282,7 +287,14 @@@ diary_entries: new: title: New Diary Entry - publish_button: "Publish" + form: + subject: "Subject:" + body: "Body:" + language: "Language:" + location: "Location:" + latitude: "Latitude:" + longitude: "Longitude:" + use_map_link: "use map" index: title: "Users' diaries" title_friends: "Friends' diaries" @@@ -308,7 -296,15 +308,7 @@@ older_entries: Older Entries newer_entries: Newer Entries edit: - title: "Edit diary entry" - subject: "Subject:" - body: "Body:" - language: "Language:" - location: "Location:" - latitude: "Latitude:" - longitude: "Longitude:" - use_map_link: "use map" - save_button: "Save" + title: Edit Diary Entry marker_text: Diary entry location show: title: "%{user}'s diary | %{title}" @@@ -1093,7 -1089,6 +1093,7 @@@ partners_ucl: "UCL" partners_bytemark: "Bytemark Hosting" partners_partners: "partners" + tou: "Terms of Use" osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out." osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out." donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund." @@@ -1304,7 -1299,7 +1304,7 @@@ This site and many other related services are formally operated by the OpenStreetMap Foundation (OSMF) on behalf of the community. Use of all OSMF operated services is subject - to our + to our Terms of Use, Acceptable Use Policies and our Privacy Policy
Please contact the OSMF @@@ -2030,19 -2025,14 +2030,19 @@@ terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see this wiki page." terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: - title: "Contributor terms" - heading: "Contributor terms" - read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions." - consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain" + title: "Terms" + heading: "Terms" + heading_ct: "Contributor terms" + read and accept with tou: "Please read the contributor agreement and the terms of use, check both checkboxes when done and then press the continue button." + contributor_terms_explain: "This agreement governs the terms for your existing and future contributions." + read_ct: "I have read and agree to the above contributor terms" + tou_explain_html: "These %{tou_link} govern the use of the website and other infrastructure provided by the OSMF. Please click on the link, read and aggree to the text." + read_tou: "I have read and agree to the Terms of Use" + consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain" consider_pd_why: "what's this?" consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain guidance: 'Information to help understand these terms: a human readable summary and some informal translations' - agree: Agree + continue: Continue declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" decline: "Decline" you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue." @@@ -2321,14 -2311,27 +2321,27 @@@ confirm: "Are you sure you wish to revoke this block?" revoke: "Revoke!" flash: "This block has been revoked." - period: - one: "1 hour" - other: "%{count} hours" helper: time_future: "Ends in %{time}." until_login: "Active until the user logs in." time_future_and_until_login: "Ends in %{time} and after the user has logged in." time_past: "Ended %{time} ago." + block_duration: + hours: + one: "1 hour" + other: "%{count} hours" + days: + one: "1 day" + other: "%{count} days" + weeks: + one: "1 week" + other: "%{count} weeks" + months: + one: "1 month" + other: "%{count} months" + years: + one: "1 year" + other: "%{count} years" blocks_on: title: "Blocks on %{name}" heading: "List of blocks on %{name}" @@@ -2427,7 -2430,6 +2440,7 @@@ title: "Layers" copyright: "© OpenStreetMap contributors" donate_link_text: "" + terms: "Website and API terms" site: edit_tooltip: Edit the map edit_disabled_tooltip: Zoom in to edit the map diff --combined config/settings.yml index 51d3ed2c9,988b55a63..a664b78b0 --- a/config/settings.yml +++ b/config/settings.yml @@@ -42,7 -42,7 +42,7 @@@ api_timeout: 30 # Timeout for web pages in seconds web_timeout: 30 # Periods (in hours) which are allowed for user blocks - user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96] + user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96, 168, 336, 731, 4383, 8766, 87660] # Rate limit for message sending max_messages_per_hour: 60 # Domain for handling message replies @@@ -57,8 -57,6 +57,8 @@@ nearby_users: 3 nearby_radius: 50 # Spam threshold spam_threshold: 50 +# Delay diary entries from appearing in the feed for this many hours +diary_feed_delay: 0 # Default legale (jurisdiction location) for contributor terms default_legale: GB # Use the built-in jobs queue for importing traces