merged de41a9546514344c3c9415c9e340daf868963134 with i18n
This commit is contained in:
parent
e8d11e28d7
commit
b36bc14980
|
@ -49,7 +49,7 @@
|
||||||
<span class="d">
|
<span class="d">
|
||||||
<%= distance_of_time_in_words(@showing_user.created_at, Time.now) %>
|
<%= distance_of_time_in_words(@showing_user.created_at, Time.now) %>
|
||||||
<% if @showing_user.invited_by_user %>
|
<% if @showing_user.invited_by_user %>
|
||||||
<%= t('.byinvitationfrom') %>
|
<%= raw(t('.byinvitationfrom', :user => @showing_user.username)) %>
|
||||||
<%= link_to @showing_user.invited_by_user.try(:username),
|
<%= link_to @showing_user.invited_by_user.try(:username),
|
||||||
@showing_user.invited_by_user %>
|
@showing_user.invited_by_user %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -362,7 +362,7 @@ en:
|
||||||
storysubmissions: "with story submissions"
|
storysubmissions: "with story submissions"
|
||||||
disabled: "disabled"
|
disabled: "disabled"
|
||||||
joined: "Joined:"
|
joined: "Joined:"
|
||||||
byinvitationfrom: "by invitation from"
|
byinvitationfrom: "by <a href=\"/u/%{user}\">invitation</a> from"
|
||||||
banneduser: "Banned:"
|
banneduser: "Banned:"
|
||||||
bannedby: "by"
|
bannedby: "by"
|
||||||
hats: "Hats:"
|
hats: "Hats:"
|
||||||
|
|
|
@ -372,7 +372,7 @@ fr:
|
||||||
storysubmissions: "avec propositions d'infos"
|
storysubmissions: "avec propositions d'infos"
|
||||||
disabled: "désactivé"
|
disabled: "désactivé"
|
||||||
joined: "Inscrit :"
|
joined: "Inscrit :"
|
||||||
byinvitationfrom: "par invitation de"
|
byinvitationfrom: "par <a href=\"/u/%{user}\">invitation</a> de"
|
||||||
banneduser: "Banni :"
|
banneduser: "Banni :"
|
||||||
bannedby: "par"
|
bannedby: "par"
|
||||||
hats: "Chapeaux :"
|
hats: "Chapeaux :"
|
||||||
|
|
Loading…
Reference in a new issue