Merge pull request #241 from OpenHistoricalMap/staging

Update live site for user comment fix and otehr locale updates

images/web/Dockerfile

@@ -48,13 +48,13 @@ RUN npm install -g svgo
 
 # Install openstreetmap-website
 RUN rm -rf $workdir/html
-ENV OPENHISTORICALMAP_WEBSITE_GITSHA=9bf3c73f71b6749fff63095f15e6efb8dd978af3
+ENV OPENHISTORICALMAP_WEBSITE_GITSHA=a71a6b795dda0d9c908495cf8862fdb8e9bf02e3
 RUN git clone -b staging https://github.com/OpenHistoricalMap/ohm-website.git $workdir
 WORKDIR $workdir
 RUN git checkout $OPENHISTORICALMAP_WEBSITE_GITSHA
 
 # change the echo here with a reason for changing the commithash
-RUN echo 'update locale files with latest translations'
+RUN echo 'fix locale file for comment username'
 RUN git fetch
 
 # Install Ruby packages

images/web/config/settings.yml

@@ -41,6 +41,9 @@ postcode_zoom: 15
 api_timeout: 300
 # 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, 168, 336, 731, 4383, 8766, 87660]
 # Rate limit for message sending
@@ -84,12 +87,12 @@ oauth_key: "OAUTH_KEY"
 id_application: ""
 # Imagery to return in capabilities as blacklisted
 imagery_blacklist:
-  # Current Google imagery URLs have google or googleapis in the domain
-  - ".*\\.google(apis)?\\..*/.*"
-  # Blacklist VWorld
-  - "http://xdworld\\.vworld\\.kr:8080/.*"
-  # Blacklist here
-  - ".*\\.here\\.com[/:].*"
+# Current Google imagery URLs have google or googleapis in the domain
+- ".*\\.google(apis)?\\..*/.*"
+# Blacklist VWorld
+- "http://xdworld\\.vworld\\.kr:8080/.*"
+# Blacklist here
+- ".*\\.here\\.com[/:].*"
 # URL of Overpass instance to use for feature queries
 overpass_url: "https://overpass-api.de/api/interpreter"
 overpass_credentials: false
@@ -137,3 +140,9 @@ smtp_tls_verify_mode: "none"
 smtp_authentication: null
 smtp_user_name: null
 smtp_password: null
+
+# Rate limit for changeset comments
+min_changeset_comments_per_hour: 1
+initial_changeset_comments_per_hour: 6
+max_changeset_comments_per_hour: 60
+moderator_changeset_comments_per_hour: 36000