Merge branch 'next-minor' into develop

Changelog.md

@@ -17,6 +17,7 @@
 ## Refactor
 
 * Make setting up a development environment 9001% easier by adding a Docker-based setup [#7870](https://github.com/diaspora/diaspora/pull/7870)
+* Improve `web+diaspora://` handler description [#7909](https://github.com/diaspora/diaspora/pull/7909)
 
 ## Bug fixes
 

app/views/users/_edit.haml

@@ -184,7 +184,8 @@
       .col-md-12
         %h3#protocol-handler
           = t(".protocol_handler.title")
-        %p= t(".protocol_handler.description")
+        %p= t(".protocol_handler.description", pod_url: AppConfig.pod_uri.site)
+        %p= t(".protocol_handler.browser")
         .form-group
           %button.btn.btn-default#register-protocol-handler
             = t(".protocol_handler.register")

config/locales/diaspora/en.yml

@@ -1261,8 +1261,9 @@ en:
 
       protocol_handler:
         title: "web+diaspora:// protocol handler"
-        description: "Clicking this button will ask your browser to install a handler that allows us to open web+diaspora:// URLs on your home pod. This is currently experimental and interactions will depend on your browser."
-        register: "Register"
+        description: "web+diaspora:// is a new web protocol that we have introduced. Any link to a diaspora* page on an external website that uses this protocol can be opened in the pod on which your diaspora* account is registered. Click the button below to set your browser to use %{pod_url} to recognise external web+diaspora:// links."
+        browser: "This protocol is currently in the experimental stage and the success of interactions using it will depend on your browser. If you want to manage or remove this handler, you will do this via your browser settings. The button below will always be enabled, and you need to set the handler separately in each browser you use."
+        register: "Register web+diaspora:// handler on this browser"
 
     privacy_settings:
       title: "Privacy settings"

features/support/env.rb

@@ -77,3 +77,8 @@ Before do |scenario|
   # Reset overridden settings
   AppConfig.reset_dynamic!
 end
+
+After do |scenario|
+  Capybara.save_path = ENV["SCREENSHOT_PATH"]
+  page.save_screenshot("#{Time.now.utc} #{scenario.name}.png", full: true) if scenario.failed? && ENV["SCREENSHOT_PATH"]
+end