nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5232 from taro-k/develop5231

Browse source 
fix locale of invitation email subject #5231
This commit is contained in:
Jonne Haß 2014-09-19 12:36:55 +02:00
commit eb7d6083e3
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -48,6 +48,7 @@ The default for including jQuery from a CDN has changed. If you want to continue
* Move submit button to the right in conversations view [#4960](https://github.com/diaspora/diaspora/pull/4960) * Move submit button to the right in conversations view [#4960](https://github.com/diaspora/diaspora/pull/4960)
* Handle long URLs and titles in OpenGraph descriptions [#5208](https://github.com/diaspora/diaspora/pull/5208) * Handle long URLs and titles in OpenGraph descriptions [#5208](https://github.com/diaspora/diaspora/pull/5208)
* Fix deformed getting started popover [#5227](https://github.com/diaspora/diaspora/pull/5227) * Fix deformed getting started popover [#5227](https://github.com/diaspora/diaspora/pull/5227)
* Use correct locale for invitation subject [#5232](https://github.com/diaspora/diaspora/pull/5232)
## Features ## Features
* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105) * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)

2
app/assets/stylesheets/profile.css.scss
View file

@ -13,6 +13,8 @@
padding: 0; padding: 0;
} }
.avatar.large { margin-bottom: 0; }
ul#profile_information { ul#profile_information {
margin: 1em 0; margin: 1em 0;
> li { > li {

4
app/mailers/notifier.rb
View file

@ -43,11 +43,11 @@ class Notifier < ActionMailer::Base
@locale = locale @locale = locale
@invitation_code = invitation_code @invitation_code = invitation_code
mail_opts = {:to => email, :from => AppConfig.mail.sender_address, I18n.with_locale(locale) do
mail_opts = {:to => email, :from => AppConfig.mail.sender_address,
:subject => I18n.t('notifier.invited_you', :name => @inviter.name), :subject => I18n.t('notifier.invited_you', :name => @inviter.name),
:host => AppConfig.pod_uri.host} :host => AppConfig.pod_uri.host}
I18n.with_locale(locale) do
mail(mail_opts) do |format| mail(mail_opts) do |format|
format.text { render :layout => nil } format.text { render :layout => nil }
format.html { render :layout => nil } format.html { render :layout => nil }