merged de41a9546514344c3c9415c9e340daf868963134 with i18n

app/views/users/show.html.erb

@@ -49,7 +49,7 @@
   <span class="d">
     <%= distance_of_time_in_words(@showing_user.created_at, Time.now) %>
     <% if @showing_user.invited_by_user %>
-      <%= t('.byinvitationfrom') %>
+      <%= raw(t('.byinvitationfrom', :user => @showing_user.username)) %>
       <%= link_to @showing_user.invited_by_user.try(:username),
         @showing_user.invited_by_user %>
     <% end %>

config/locales/en.yml

@@ -362,7 +362,7 @@ en:
       storysubmissions: "with story submissions"
       disabled: "disabled"
       joined: "Joined:"
-      byinvitationfrom: "by invitation from"
+      byinvitationfrom: "by <a href=\"/u/%{user}\">invitation</a> from"
       banneduser: "Banned:"
       bannedby: "by"
       hats: "Hats:"

config/locales/fr.yml

@@ -372,7 +372,7 @@ fr:
       storysubmissions: "avec propositions d'infos"
       disabled: "désactivé"
       joined: "Inscrit :"
-      byinvitationfrom: "par invitation de"
+      byinvitationfrom: "par <a href=\"/u/%{user}\">invitation</a> de"
       banneduser: "Banni :"
       bannedby: "par"
       hats: "Chapeaux :"