Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Change remote interaction dialog to use specific actions (#9743)

Browse source 
* Change remote interaction dialog to use specific actions

Instead of just "interact", use different strings based on whether
it's a reply, reblog or favourite. Add explanation why the step
is necessary in the first place

* Remove obsolete strings
This commit is contained in:
Eugen Rochko 2019-01-07 15:36:26 +01:00 • committed by GitHub
parent 43c61bca60
commit 5654535728
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 31 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/views/remote_interaction/new.html.haml
View file

@ -1,6 +1,6 @@
.form-container
.follow-prompt
%h2= t('remote_interaction.prompt')
%h2= t("remote_interaction.#{@interaction_type}.prompt")
.public-layout
.activity-stream.activity-stream--highlighted
@ -9,9 +9,13 @@
= simple_form_for @remote_follow, as: :remote_follow, url: remote_interaction_path(@status) do |f|
= render 'shared/error_messages', object: @remote_follow
= hidden_field_tag :type, @interaction_type
= f.input :acct, placeholder: t('remote_follow.acct'), input_html: { autocapitalize: 'none', autocorrect: 'off' }
.actions
= f.button :button, t('remote_interaction.proceed'), type: :submit
= f.button :button, t("remote_interaction.#{@interaction_type}.proceed"), type: :submit
%p.hint.subtle-hint= t('remote_follow.no_account_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started')
%p.hint.subtle-hint
= t('remote_follow.reason_html', instance: site_hostname)
= t('remote_follow.no_account_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started')