Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg

Conflicts:
	config/locales/diaspora/en.yml

app/views/users/getting_started.html.haml

@@ -33,11 +33,23 @@
       =t('.signup_steps')
 
   %h3{:style => "text-align:right;"}
-    = link_to "Edit your profile", getting_started_path(:step => 1)
+    - if @step != 1
+      = link_to t('.edit_profile'), getting_started_path(:step => 1)
+    - else
+      %span{:style => "color: green;"}
+        = t('.edit_profile')
     %br
-    = link_to "Define your aspects", getting_started_path(:step => 2)
+    - if @step != 2
+      = link_to t('.define_aspects'), getting_started_path(:step => 2)
+    - else
+      %span{:style => "color:green;"}
+        = t('.define_aspects')
     %br
-    = link_to "Connect your services", getting_started_path(:step => 3)
+    - if @step != 3
+      = link_to t('.connect_services'), getting_started_path(:step => 3)
+    - else
+      %span{:style => "color:green;"}
+        = t('.connect_services')
     %br
 
 .span-15.last

config/locales/diaspora/en.yml

@@ -132,6 +132,9 @@ en:
           'step_1':
               you_dont_have_any_photos: "You don't have any photos!  Go to the"
               page_to_upload_some:  "page to upload some."
+          edit_profile: "Edit your profile"
+          define_aspects: "Define your aspects"
+          connect_services: "Connect your services"
   comments:
       new_comment:
           comment: "Comment"