From 09329725210aa435583c770c381b9bc61e0d7d7a Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Fri, 5 May 2023 19:06:31 +0000
Subject: [PATCH] Change `join_on` translation to `joined_on` and include
 placeholder for the date

---
 options/locale/locale_en-US.ini      | 2 +-
 templates/explore/organizations.tmpl | 2 +-
 templates/explore/users.tmpl         | 2 +-
 templates/repo/user_cards.tmpl       | 2 +-
 templates/user/profile.tmpl          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index fc5eccb2db241..d6a410e8e9679 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 295818f94bde5..a20dd755ea5b0 100644
--- a/templates/explore/organizations.tmpl
+++ b/templates/explore/organizations.tmpl
@@ -23,7 +23,7 @@
 								{{svg "octicon-link"}}
 								<a href="{{.Website}}" rel="nofollow">{{.Website}}</a>
 							{{end}}
-							{{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} {{DateTime "short" .CreatedUnix}}
+							{{svg "octicon-clock"}} {{$.locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix) | Safe}}
 						</div>
 					</div>
 				</div>
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl
index 0c1ba27448c11..1f3b944f5eda3 100644
--- a/templates/explore/users.tmpl
+++ b/templates/explore/users.tmpl
@@ -18,7 +18,7 @@
 								{{svg "octicon-mail"}}
 								<a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a>
 							{{end}}
-							{{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} {{DateTime "short" .CreatedUnix}}
+							{{svg "octicon-clock"}} {{$.locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix) | Safe}}
 						</div>
 					</div>
 				</div>
diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl
index fd9585b22d649..e956f65e9fba7 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}}
 				</div>
 			</li>
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 5463270854e71..02e13e3a4596b 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -73,7 +73,7 @@
 									</li>
 								{{end}}
 							{{end}}
-							<li>{{svg "octicon-clock"}} {{.locale.Tr "user.join_on"}} {{DateTime "short" .ContextUser.CreatedUnix}}</li>
+							<li>{{svg "octicon-clock"}} {{.locale.Tr "user.joined_on" (DateTime "short" .ContextUser.CreatedUnix) | Safe}}</li>
 							{{if and .Orgs .HasOrgsVisible}}
 							<li>
 								<ul class="user-orgs">