Skip to content

Commit

Permalink
added missing translation
Browse files Browse the repository at this point in the history
  • Loading branch information
danielgrippi committed Mar 9, 2011
1 parent c252cfa commit ac738df
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ GEM
yui-compressor (>= 0.9.1)
json (1.4.6)
json_pure (1.5.1)
launchy (0.3.7)
launchy (0.4.0)
configuration (>= 0.0.5)
rake (>= 0.8.1)
linecache (0.43)
Expand Down Expand Up @@ -323,7 +323,7 @@ GEM
rspec-core (2.5.1)
rspec-expectations (2.5.0)
diff-lcs (~> 1.1.2)
rspec-instafail (0.1.6)
rspec-instafail (0.1.7)
rspec-mocks (2.5.0)
rspec-rails (2.5.0)
actionpack (~> 3.0)
Expand All @@ -343,15 +343,15 @@ GEM
rubyntlm (0.1.1)
rubyzip (0.9.4)
selenium-client (1.2.18)
selenium-rc (2.3.1)
selenium-rc (2.3.2)
selenium-client (>= 1.2.18)
selenium-webdriver (0.1.3)
childprocess (~> 0.1.5)
ffi (~> 0.6.3)
json_pure
rubyzip
simple_oauth (0.1.4)
sinatra (1.1.3)
sinatra (1.2.0)
rack (~> 1.1)
tilt (< 2.0, >= 1.2.2)
subexec (0.0.4)
Expand Down
9 changes: 7 additions & 2 deletions app/views/conversations/index.haml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,13 @@
= render :partial => 'conversations/conversation', :collection => @conversations, :locals => {:authors => @authors, :unread_counts => @unread_counts}
= will_paginate @conversations
- else
%i
= t('.you_have_no_new_messages')
%br
%br
%br
%br
%div{:style => 'text-align:center;'}
%i
= t('.no_messages')

#conversation_show.span-16.prepend-8.last
- if @conversation
Expand Down
1 change: 1 addition & 0 deletions config/locales/diaspora/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@ en:
new_message: "New Message"
no_conversation_selected: "no conversation selected"
create_a_new_message: "create a new message"
no_messages: "no messages"
show:
reply: 'reply'
new:
Expand Down

0 comments on commit ac738df

Please sign in to comment.