diff options
| author | Alex Gessner <alex.gessner@gmail.com> | 2019-03-28 13:01:09 -0400 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-28 18:01:09 +0100 |
| commit | 69141dca26f8a28d3aff63387b1c8d2bba7fdfa3 (patch) | |
| tree | 258b59ecbce99855bccb4fd679a5eb3d9938acb0 /config | |
| parent | 026dd75208223a8ceb8f3e82699a123d68b9a1c7 (diff) | |
squashed identity proof updates (#10375)
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 3 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index d91e89d95..64467be39 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -648,10 +648,13 @@ en: keybase: invalid_token: Keybase tokens are hashes of signatures and must be 66 hex characters verification_failed: Keybase does not recognize this token as a signature of Keybase user %{kb_username}. Please retry from Keybase. + wrong_user: Cannot create a proof for %{proving} while logged in as %{current}. Log in as %{proving} and try again. explanation_html: Here you can cryptographically connect your other identities, such as a Keybase profile. This lets other people send you encrypted messages and trust content you send them. i_am_html: I am %{username} on %{service}. identity: Identity inactive: Inactive + publicize_checkbox: 'And toot this:' + publicize_toot: 'It is proven! I am %{username} on %{service}: %{url}' status: Verification status view_proof: View proof imports: diff --git a/config/routes.rb b/config/routes.rb index 194b4c09b..a98dbb700 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -354,6 +354,7 @@ Rails.application.routes.draw do resources :followers, only: :index, controller: 'accounts/follower_accounts' resources :following, only: :index, controller: 'accounts/following_accounts' resources :lists, only: :index, controller: 'accounts/lists' + resources :identity_proofs, only: :index, controller: 'accounts/identity_proofs' member do post :follow |