Merge branch 'master' of github.com:diaspora/diaspora

app/models/person.rb

@@ -110,7 +110,7 @@ class Person
     hcard = HCard.find profile.hcard.first[:href]
 
     new_person.url = hcard[:url]
-    new_person.profile = Profile.new(:first_name => hcard[:given_name], :last_name => hcard[:family_name])
+    new_person.profile = Profile.new(:first_name => hcard[:given_name], :last_name => hcard[:family_name], :image_url => hcard[:photo])
     if new_person.save
       new_person
     else

app/views/publics/hcard.erb

@@ -33,6 +33,12 @@
         <a href="<%= @person.url%>" rel="me" id="pod_location" class="url"><%= @person.url%></a>
         </dd>
       </dl>
+      <dl class="entity_photo">
+        <dt>Photo</dt>
+        <dd>
+        <span class="photo"><%= @person.profile.image_url%></span>
+        </dd>
+      </dl>
       <dl class="entity_note">
         <dt>Note</dt>
         <dd class="note">Diaspora is awesome! vi is better than emacs!</dd>

config/locales/diaspora/it.yml

@@ -85,6 +85,7 @@ it:
           create: "Crea"
       create:
           success: "Clicca sul segno più nella parte sinistra per dire a Diaspora chi può vedere il tuo nuovo aspetto."
+          failure: "Creazione dell'aspetto fallita."
       destroy:
           success: "%{name} è stato rimosso con successo."
       update:

lib/hcard.rb

@@ -7,6 +7,7 @@ module HCard
     doc = Nokogiri::HTML(Net::HTTP.get URI.parse(url))
     {:given_name => doc.css(".given_name").text,
     :family_name => doc.css(".family_name").text,
-    :url => doc.css("#pod_location").text}
+    :url => doc.css("#pod_location").text,
+    :photo => doc.css(".photo")}
   end
 end