diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 248936e35d..19ab6b15e4 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -559,7 +559,7 @@ target_branch_not_exist = Target branch does not exist. [user] change_avatar = Change your avatar… -join_on = Joined on +joined_on = Joined on %s repositories = Repositories activity = Public Activity followers = Followers diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl index 295818f94b..a20dd755ea 100644 --- a/templates/explore/organizations.tmpl +++ b/templates/explore/organizations.tmpl @@ -23,7 +23,7 @@ {{svg "octicon-link"}} {{.Website}} {{end}} - {{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} {{DateTime "short" .CreatedUnix}} + {{svg "octicon-clock"}} {{$.locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix) | Safe}} diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index 0c1ba27448..1f3b944f5e 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -18,7 +18,7 @@ {{svg "octicon-mail"}} {{.Email}} {{end}} - {{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} {{DateTime "short" .CreatedUnix}} + {{svg "octicon-clock"}} {{$.locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix) | Safe}} diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl index fd9585b22d..e956f65e9f 100644 --- a/templates/repo/user_cards.tmpl +++ b/templates/repo/user_cards.tmpl @@ -18,7 +18,7 @@ {{else if .Location}} {{svg "octicon-location"}} {{.Location}} {{else}} - {{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} {{DateTime "short" .CreatedUnix}} + {{svg "octicon-clock"}} {{$.locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix) | Safe}} {{end}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 8d48474441..431961089d 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -73,7 +73,7 @@ {{end}} {{end}} -
  • {{svg "octicon-clock"}} {{.locale.Tr "user.join_on"}} {{DateTime "short" .ContextUser.CreatedUnix}}
  • +
  • {{svg "octicon-clock"}} {{.locale.Tr "user.joined_on" (DateTime "short" .ContextUser.CreatedUnix) | Safe}}
  • {{if and .Orgs .HasOrgsVisible}}