FEATURE: Continue to Discourse links are now buttons, and those pages will redirect automatically after 5 seconds
This commit is contained in:
parent
b29b94046c
commit
b4ad70d767
|
@ -0,0 +1,7 @@
|
|||
<script language="javascript">
|
||||
(function() {
|
||||
setTimeout(function() {
|
||||
window.location.href = '/';
|
||||
}, 5000);
|
||||
})();
|
||||
</script>
|
|
@ -5,8 +5,8 @@
|
|||
</div>
|
||||
<%else%>
|
||||
<h2><%= t 'change_email.confirmed' %></h2>
|
||||
<p>
|
||||
<%= raw t('change_email.please_continue', link: link_to(SiteSetting.title, '/')) %>
|
||||
</p>
|
||||
<br>
|
||||
<a class="btn" href="/"><%= t('change_email.please_continue', site_name: SiteSetting.title) %></a>
|
||||
<%= render partial: 'auto_redirect_home' %>
|
||||
<%end%>
|
||||
</div>
|
||||
</div>
|
|
@ -18,7 +18,10 @@
|
|||
<%- if @requires_approval %>
|
||||
<%= t 'login.not_approved' %>
|
||||
<% else %>
|
||||
<%= link_to( t('password_reset.continue', site_name: SiteSetting.title), '/' ) %>
|
||||
<br>
|
||||
<br>
|
||||
<a class="btn" href="/"><%= t('password_reset.continue', site_name: SiteSetting.title) %></a>
|
||||
<%= render partial: 'auto_redirect_home' %>
|
||||
<% end %>
|
||||
</p>
|
||||
<% else %>
|
||||
|
|
|
@ -6,15 +6,14 @@
|
|||
</div>
|
||||
<%else%>
|
||||
<h2><%= t 'activation.welcome_to', site_name: SiteSetting.title %></h2>
|
||||
<p>
|
||||
<br>
|
||||
|
||||
<% if @needs_approval %>
|
||||
<%= t 'activation.approval_required' %>
|
||||
<p><%= t 'activation.approval_required' %></p>
|
||||
<% else %>
|
||||
<br>
|
||||
<%= raw t('activation.please_continue', link: link_to(SiteSetting.title, '/')) %></a>.
|
||||
<p><%= t('activation.please_continue') %></p>
|
||||
<p><a class="btn" href="/"><%= t('activation.continue_button', site_name: SiteSetting.title) -%></a></p>
|
||||
<%= render partial: 'auto_redirect_home' %>
|
||||
<% end %>
|
||||
</p>
|
||||
|
||||
<%end%>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -389,13 +389,14 @@ en:
|
|||
|
||||
change_email:
|
||||
confirmed: "Your email has been updated."
|
||||
please_continue: "Please continue to %{link}"
|
||||
please_continue: "Continue to %{site_name}"
|
||||
error: "There was an error changing your email address. Perhaps the address is already in use?"
|
||||
|
||||
activation:
|
||||
action: "Activate your account"
|
||||
already_done: "Sorry, this account confirmation link is no longer valid. Perhaps your account is already active?"
|
||||
please_continue: "Your new account is confirmed, and you are now logged in. Continue to %{link}"
|
||||
please_continue: "Your new account is confirmed, and you are now logged in."
|
||||
continue_button: "Continue to %{site_name}"
|
||||
welcome_to: "Welcome to %{site_name}!"
|
||||
approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!"
|
||||
|
||||
|
|
Loading…
Reference in New Issue