Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authordanielgrippi <danielgrippi@gmail.com>2011-08-04 02:08:27 +0400
committerdanielgrippi <danielgrippi@gmail.com>2011-08-04 05:02:57 +0400
commite23439d193a44f2eb48b68d69f8f5006757c2cb1 (patch)
tree34197ba4f036e60318916591b5f780ca239c9153 /config
parent984eef25be9e68e64329d2a185fb2b66affc4970 (diff)
fix cucumber; temporarily remove fetch featured users initilizer
Diffstat (limited to 'config')
-rw-r--r--config/initializers/fetch_featured_users.rb16
-rw-r--r--config/locales/diaspora/en.yml2
2 files changed, 10 insertions, 8 deletions
diff --git a/config/initializers/fetch_featured_users.rb b/config/initializers/fetch_featured_users.rb
index 7029bec96..76b75f5f8 100644
--- a/config/initializers/fetch_featured_users.rb
+++ b/config/initializers/fetch_featured_users.rb
@@ -1,7 +1,9 @@
-unless Rails.env == 'test' || AppConfig[:featured_users].count == Person.featured_users.count
- puts "Fetching featured users from remote servers..."
- AppConfig[:featured_users].each do |x|
- Webfinger.new(x).fetch
- end
- puts "Done fetching!"
-end
+#this breaks seed scripts
+#
+#unless Rails.env == 'test' || AppConfig[:featured_users].count == Person.featured_users.count
+# puts "Fetching featured users from remote servers..."
+# AppConfig[:featured_users].each do |x|
+# Webfinger.new(x).fetch
+# end
+# puts "Done fetching!"
+#end
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index e7cfb17bd..18282956b 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -780,7 +780,7 @@ en:
welcome: "Welcome!"
welcome_with_name: "Welcome, %{name}!"
- skip: "skip getting started"
+ skip: "Skip getting started"
fill_out_your_profile: "Fill out your profile"
profile_description: "Description of why you'd want to do this"