mirror of https://github.com/mastodon/mastodon
Change OpenGraph description on sign-up page to reflect invite (#11744)
This commit is contained in:
parent
34adc8784a
commit
3221f998dd
|
@ -8,4 +8,16 @@ module InstanceHelper
|
||||||
def site_hostname
|
def site_hostname
|
||||||
@site_hostname ||= Addressable::URI.parse("//#{Rails.configuration.x.local_domain}").display_uri.host
|
@site_hostname ||= Addressable::URI.parse("//#{Rails.configuration.x.local_domain}").display_uri.host
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def description_for_sign_up
|
||||||
|
prefix = begin
|
||||||
|
if @invite.present?
|
||||||
|
I18n.t('auth.description.prefix_invited_by_user', name: @invite.user.account.username)
|
||||||
|
else
|
||||||
|
I18n.t('auth.description.prefix_sign_up')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
safe_join([prefix, I18n.t('auth.description.suffix')], ' ')
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
= t('auth.register')
|
= t('auth.register')
|
||||||
|
|
||||||
- content_for :header_tags do
|
- content_for :header_tags do
|
||||||
= render partial: 'shared/og'
|
= render partial: 'shared/og', locals: { description: description_for_sign_up }
|
||||||
|
|
||||||
= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
|
= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
|
||||||
= render 'shared/error_messages', object: resource
|
= render 'shared/error_messages', object: resource
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
- thumbnail = @instance_presenter.thumbnail
|
- thumbnail = @instance_presenter.thumbnail
|
||||||
- description = strip_tags(@instance_presenter.site_short_description.presence || @instance_presenter.site_description.presence || t('about.about_mastodon_html'))
|
- description ||= strip_tags(@instance_presenter.site_short_description.presence || @instance_presenter.site_description.presence || t('about.about_mastodon_html'))
|
||||||
|
|
||||||
%meta{ name: 'description', content: description }/
|
%meta{ name: 'description', content: description }/
|
||||||
|
|
||||||
|
|
|
@ -569,6 +569,10 @@ en:
|
||||||
checkbox_agreement_without_rules_html: I agree to the <a href="%{terms_path}" target="_blank">terms of service</a>
|
checkbox_agreement_without_rules_html: I agree to the <a href="%{terms_path}" target="_blank">terms of service</a>
|
||||||
delete_account: Delete account
|
delete_account: Delete account
|
||||||
delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
|
delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
|
||||||
|
description:
|
||||||
|
prefix_invited_by_user: "@%{name} invites you to join this server of Mastodon!"
|
||||||
|
prefix_sign_up: Sign up on Mastodon today!
|
||||||
|
suffix: With an account, you will be able to follow people, post updates and exchange messages with users from any Mastodon server and more!
|
||||||
didnt_get_confirmation: Didn't receive confirmation instructions?
|
didnt_get_confirmation: Didn't receive confirmation instructions?
|
||||||
forgot_password: Forgot your password?
|
forgot_password: Forgot your password?
|
||||||
invalid_reset_password_token: Password reset token is invalid or expired. Please request a new one.
|
invalid_reset_password_token: Password reset token is invalid or expired. Please request a new one.
|
||||||
|
|
Loading…
Reference in New Issue