From: Tom Hughes <tom@compton.nu>
Date: Sun, 5 Feb 2017 13:50:07 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1401'
X-Git-Tag: live~3636
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c57d2b29fc1f4647b460b6b74d072c409932e3f2?hp=-c

Merge remote-tracking branch 'openstreetmap/pull/1401'
---

c57d2b29fc1f4647b460b6b74d072c409932e3f2
diff --combined config/locales/en.yml
index cf80c0862,d9c6cc8dd..9389c0e2f
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1310,6 -1310,7 +1310,7 @@@ en
          commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
        details: "More details about the note can be found at %{url}."
      changeset_comment_notification:
+       hi: "Hi %{to_user},"
        greeting: "Hi,"
        commented:
          subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
@@@ -1319,6 -1320,7 +1320,7 @@@
          partial_changeset_with_comment: "with comment '%{changeset_comment}'"
          partial_changeset_without_comment: "without comment"
        details: "More details about the changeset can be found at %{url}."
+       unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
    message:
      inbox:
        title: "Inbox"
@@@ -2211,7 -2213,6 +2213,7 @@@
          header: Map Layers
          notes: Map Notes
          data: Map Data
 +        gps: Public GPS Traces
          overlays: Enable overlays for troubleshooting the map
          title: "Layers"
        copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
diff --combined test/test_helper.rb
index e535d1645,52d11027f..10a4eb397
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@@ -50,6 -50,8 +50,6 @@@ module ActiveSuppor
        set_fixture_class :gps_points => Tracepoint
        set_fixture_class :gpx_file_tags => Tracetag
  
 -      fixtures :client_applications
 -
        fixtures :redactions
      end
  
@@@ -183,5 -185,15 +183,15 @@@
        stub_request(:get, "http://api.hostip.info/country.php?ip=0.0.0.0")
        stub_request(:get, "http://api.hostip.info/country.php?ip=127.0.0.1")
      end
+ 
+     def email_text_parts(message)
+       message.parts.each_with_object([]) do |part, text_parts|
+         if part.content_type.start_with?("text/")
+           text_parts.push(part)
+         elsif part.multipart?
+           text_parts.concat(email_text_parts(part))
+         end
+       end
+     end
    end
  end