nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reword the web handler setting

Browse source 
fixes #7838

closes #7909
This commit is contained in:
flaburgan 2018-10-27 00:13:47 +02:00 committed by Benjamin Neff
parent dae1717da8
commit 65e0f90b86
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -3,6 +3,7 @@
## Refactor ## Refactor
* Make setting up a development environment 9001% easier by adding a Docker-based setup [#7870](https://github.com/diaspora/diaspora/pull/7870) * 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 ## Bug fixes

3
app/views/users/_edit.haml
View file

@ -184,7 +184,8 @@
.col-md-12 .col-md-12
%h3#protocol-handler %h3#protocol-handler
= t(".protocol_handler.title") = 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 .form-group
%button.btn.btn-default#register-protocol-handler %button.btn.btn-default#register-protocol-handler
= t(".protocol_handler.register") = t(".protocol_handler.register")

5
config/locales/diaspora/en.yml
View file

@ -1261,8 +1261,9 @@ en:
protocol_handler: protocol_handler:
title: "web+diaspora:// 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." 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."
register: "Register" 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: privacy_settings:
title: "Privacy settings" title: "Privacy settings"