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

Merge pull request #2403 from gandaro/outdated-information-cubbies

Browse source 
deleted tokens:show:login_with_diaspora_is_comming
This commit is contained in:
Jonne Hass 2011-11-23 13:07:10 -08:00
commit a40fbc9617
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/views/tokens/show.html.haml
View file

@ -40,6 +40,3 @@
%h3 %h3
!= t('.connecting_is_simple', :diaspora_id => current_user.diaspora_handle, :href_link => 'http://cubbi.es/users/edit') != t('.connecting_is_simple', :diaspora_id => current_user.diaspora_handle, :href_link => 'http://cubbi.es/users/edit')
%p.subtle
= t('.log_in_with_diaspora_is_comming')

1
config/locales/diaspora/en.yml
View file

@ -865,7 +865,6 @@ en:
daniels_account: "Daniel's Diaspora account" daniels_account: "Daniel's Diaspora account"
making_the_connection: "Making the Connection" making_the_connection: "Making the Connection"
connecting_is_simple: "Connecting your Diaspora account is simple! Just enter your Diaspora ID (<b>%{diaspora_id}</b>) from your cubbies <a href='%{href_link}'>settings page</a> and hit connect." connecting_is_simple: "Connecting your Diaspora account is simple! Just enter your Diaspora ID (<b>%{diaspora_id}</b>) from your cubbies <a href='%{href_link}'>settings page</a> and hit connect."
log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
via: "(via %{link})" via: "(via %{link})"
authorizations: authorizations: