Skip to content

Commit 3fb5538

Browse files
committed
fix(2447): show country emoji in profile
1 parent 0631b83 commit 3fb5538

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

templates/v3/user_profile_page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<div class="user-profile__container">
1515
<div class="user-profile__profile-card-row">
1616
{% with user_info as user %}
17-
{% include 'v3/includes/_user_card.html' with username=user.user_name avatar_url=user.avatar_url badge_name=user.featured_badge.name badge=user.featured_badge.badge member_since=user.member_since role=user.role flag_emoji='🇺🇸' compact=True %}
17+
{% include 'v3/includes/_user_card.html' with username=user.user_name avatar_url=user.avatar_url badge_name=user.featured_badge.name badge=user.featured_badge.badge member_since=user.member_since role=user.role flag_emoji=user.flag_emoji compact=True %}
1818
{% endwith %}
1919
<div class="user-profile__button-group">
2020
{% for link in top_links %}

users/models.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,10 +415,12 @@ def role(self):
415415

416416
@cached_property
417417
def flag_emoji(self):
418+
"""Flag for the user's saved country, or "" when none is set.
419+
420+
`unicode_flag` is already "" for a blank CountryField, which the
421+
user card treats as "hide the flag overlay".
418422
"""
419-
TODO: This is currently dummy data for testing
420-
"""
421-
return "🇺🇸"
423+
return self.country.unicode_flag
422424

423425
@staticmethod
424426
def get_user_by_github_url(url: str):

users/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ def get_v3_context_data(self, **kwargs):
211211
},
212212
"member_since": user.date_joined.year,
213213
"role": "Contributor",
214+
"flag_emoji": user.flag_emoji,
214215
}
215216

216217
# Data shared between both versions, Boost Github and Mailing List activity

0 commit comments

Comments
 (0)