Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Renamed 'download_link' to 'share_link'

  • Loading branch information...
commit 1b4db0d1c0bb0cbd9be7838604f7f474070ca3a3 1 parent 70b9246
@mischa78 mischa78 authored
View
2  app/controllers/share_links_controller.rb
@@ -24,7 +24,7 @@ def create
@share_link = @file.share_links.build(params[:share_link])
if @share_link.save
- UserMailer.download_link_email(current_user, @share_link).deliver
+ UserMailer.share_link_email(current_user, @share_link).deliver
redirect_to folder_url(@folder), :notice => t(:shared_successfully)
else
render :action => 'new'
View
7 app/mailers/user_mailer.rb
@@ -4,9 +4,8 @@ def reset_password_email(user)
mail(:to => user.email, :subject => t(:reset_password_email_subject))
end
- def download_link_email(user, share_link)
- @user = user
- @share_link = share_link
- mail(:to => user.email, :bcc => share_link.emails, :subject => t(:download_link_email_subject))
+ def share_link_email(user, share_link)
+ @user, @share_link = user, share_link
+ mail(:to => user.email, :bcc => share_link.emails, :subject => t(:share_link_email_subject))
end
end
View
2  app/views/share_links/new.html.erb
@@ -2,7 +2,7 @@
<h1><%= content_for :title %></h1>
<%= form_for [@file, @share_link], :url => { :action => 'create' } do |f| %>
- <%= f.error_messages :header_message => t(:download_link_could_not_be_sent) %>
+ <%= f.error_messages :header_message => t(:share_link_could_not_be_sent) %>
<p>
<%= t :you_are_about_to_share_the_following_file %>:<br>
<span class="shared_file">
View
0  ...views/user_mailer/download_link_email.en.text.erb → app/views/user_mailer/share_link_email.de.text.erb
File renamed without changes
View
0  ...views/user_mailer/download_link_email.de.text.erb → app/views/user_mailer/share_link_email.en.text.erb
File renamed without changes
View
0  ...views/user_mailer/download_link_email.nl.text.erb → app/views/user_mailer/share_link_email.nl.text.erb
File renamed without changes
View
4 config/locales/de.yml
@@ -336,9 +336,9 @@ de:
two_months_from_now: Two months from now
three_months_from_now: Three months from now
half_year_from_now: A half year from now
- download_link_could_not_be_sent: The download link could not be sent
+ share_link_could_not_be_sent: The download link could not be sent
are_invalid_due_to: "is invalid due to %{email}"
- download_link_email_subject: '[Boxroom] Someone shared a file with you'
+ share_link_email_subject: '[Boxroom] Someone shared a file with you'
shared_successfully: The file was shared successfully.
#shared/_header
View
4 config/locales/en.yml
@@ -327,9 +327,9 @@
two_months_from_now: Two months from now
three_months_from_now: Three months from now
half_year_from_now: A half year from now
- download_link_could_not_be_sent: The download link could not be sent
+ share_link_could_not_be_sent: The download link could not be sent
are_invalid_due_to: "is invalid due to %{email}"
- download_link_email_subject: '[Boxroom] Someone shared a file with you'
+ share_link_email_subject: '[Boxroom] Someone shared a file with you'
shared_successfully: The file was shared successfully.
#shared/_header
View
4 config/locales/nl.yml
@@ -330,9 +330,9 @@ nl:
two_months_from_now: Over twee maanden
three_months_from_now: Over drie maanden
half_year_from_now: Over een half jaar
- download_link_could_not_be_sent: De download link kon niet verstuurd worden
+ share_link_could_not_be_sent: De download link kon niet verstuurd worden
are_invalid_due_to: "is ongeldig vanwege %{email}"
- download_link_email_subject: '[Boxroom] Iemand heeft een bestand met u gedeeld'
+ share_link_email_subject: '[Boxroom] Iemand heeft een bestand met u gedeeld'
shared_successfully: De download link is verstuurd.
#shared/_header
Please sign in to comment.
Something went wrong with that request. Please try again.