From 905a982d35cee285a0df0ba7e2142b9ba2a62c90 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Fri, 29 Jul 2011 19:19:30 -0700 Subject: [PATCH] add two more default aspects for new users --- app/models/user.rb | 9 ++++++--- config/locales/diaspora/en.yml | 2 ++ spec/controllers/invitations_controller_spec.rb | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 746db1bda..f6fdcbdd6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -345,10 +345,13 @@ class User < ActiveRecord::Base def seed_aspects self.aspects.create(:name => I18n.t('aspects.seed.family')) - work = self.aspects.create(:name => I18n.t('aspects.seed.work')) + self.aspects.create(:name => I18n.t('aspects.seed.friends')) + self.aspects.create(:name => I18n.t('aspects.seed.work')) + aq = self.aspects.create(:name => I18n.t('aspects.seed.acquaintances')) + default_account = Webfinger.new('diasporahq@joindiaspora.com').fetch - self.share_with(default_account, work) - work + self.share_with(default_account, aq) + aq end def self.generate_key diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index a97f6ee7a..01ac41cc4 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -149,6 +149,8 @@ en: seed: family: "Family" work: "Work" + acquaintances: "Acquaintances" + friends: "Friends" index: donate: "Donate" keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!" diff --git a/spec/controllers/invitations_controller_spec.rb b/spec/controllers/invitations_controller_spec.rb index 8ac3bc764..58855a550 100644 --- a/spec/controllers/invitations_controller_spec.rb +++ b/spec/controllers/invitations_controller_spec.rb @@ -108,7 +108,7 @@ describe InvitationsController do it 'seeds the aspects' do put :update, @accept_params - invited.aspects.count.should == 2 + invited.aspects.count.should == 4 end it 'adds a contact' do