Skip to content

Commit 050e0b3

Browse files
mhall119mhall119
committed
Merge branch 'master' of github.com:GetTogetherComm/GetTogether
2 parents 1552c24 + f51a98e commit 050e0b3

9 files changed

Lines changed: 100 additions & 23 deletions

File tree

‎events/migrations/0052_auto_20200412_2030.py‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# Generated by Django 2.0.12 on 2020-04-12 20:30
2+
3+
import django.db.models.deletion
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [("events", "0051_add_team_membership_invites")]
10+
11+
operations = [
12+
migrations.AlterModelOptions(
13+
name="category",
14+
options={"verbose_name": "Category", "verbose_name_plural": "Categories"},
15+
),
16+
migrations.AlterModelOptions(
17+
name="city",
18+
options={
19+
"ordering": ("name",),
20+
"verbose_name": "City",
21+
"verbose_name_plural": "Cities",
22+
},
23+
),
24+
migrations.AlterField(
25+
model_name="organization",
26+
name="description",
27+
field=models.TextField(blank=True, null=True, verbose_name="Description"),
28+
),
29+
migrations.AlterField(
30+
model_name="sponsor",
31+
name="description",
32+
field=models.TextField(blank=True, null=True, verbose_name="Description"),
33+
),
34+
migrations.AlterField(
35+
model_name="team",
36+
name="about_page",
37+
field=models.TextField(blank=True, null=True, verbose_name="About page"),
38+
),
39+
migrations.AlterField(
40+
model_name="team",
41+
name="city",
42+
field=models.ForeignKey(
43+
blank=True,
44+
null=True,
45+
on_delete=django.db.models.deletion.CASCADE,
46+
to="events.City",
47+
verbose_name="City",
48+
),
49+
),
50+
migrations.AlterField(
51+
model_name="team",
52+
name="description",
53+
field=models.TextField(blank=True, null=True, verbose_name="Description"),
54+
),
55+
migrations.AlterField(
56+
model_name="topic",
57+
name="category",
58+
field=models.ForeignKey(
59+
on_delete=django.db.models.deletion.CASCADE,
60+
to="events.Category",
61+
verbose_name="Category",
62+
),
63+
),
64+
]

‎events/models/locale.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ class Meta:
8484
class City(models.Model):
8585
class Meta:
8686
ordering = ("name",)
87+
verbose_name = _("City")
8788
verbose_name_plural = _("Cities")
8889

8990
name = models.CharField(_("Name"), max_length=100)

‎events/models/profiles.py‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,9 @@ class Organization(models.Model):
328328
format="PNG",
329329
)
330330

331-
description = models.TextField(blank=True, null=True)
331+
description = models.TextField(
332+
verbose_name=_("Description"), blank=True, null=True
333+
)
332334

333335
def save(self, *args, **kwargs):
334336
if not self.slug:
@@ -394,7 +396,7 @@ def __str__(self):
394396

395397
class Sponsor(models.Model):
396398
name = models.CharField(_("Sponsor Name"), max_length=256, null=False, blank=False)
397-
description = models.TextField(blank=True, null=True)
399+
description = models.TextField(verbose_name=_("Description"), blank=True, null=True)
398400
web_url = models.URLField(_("Website"), null=True, blank=True)
399401
logo = ProcessedImageField(
400402
verbose_name=_("Logo"),
@@ -455,15 +457,19 @@ class Team(models.Model):
455457
format="PNG",
456458
)
457459

458-
description = models.TextField(blank=True, null=True)
460+
description = models.TextField(
461+
verbose_name=_("Description"), blank=True, null=True
462+
)
459463

460-
about_page = models.TextField(blank=True, null=True)
464+
about_page = models.TextField(
465+
verbose_name=_("About page"), blank=True, null=True
466+
)
461467

462468
country = models.ForeignKey(
463469
Country, null=True, blank=True, on_delete=models.CASCADE
464470
)
465471
spr = models.ForeignKey(SPR, null=True, blank=True, on_delete=models.CASCADE)
466-
city = models.ForeignKey(City, null=True, blank=True, on_delete=models.CASCADE)
472+
city = models.ForeignKey(City, verbose_name=_("City"), null=True, blank=True, on_delete=models.CASCADE)
467473

468474
web_url = models.URLField(_("Website"), null=True, blank=True)
469475
email = models.EmailField(_("Email Address"), null=True, blank=True)
@@ -659,6 +665,7 @@ class TeamSerializer(serializers.ModelSerializer):
659665

660666
class Meta:
661667
model = Team
668+
verbose_name = _("Team")
662669
fields = ("id", "name", "slug", "latitude", "longitude", "web_url")
663670

664671

@@ -693,6 +700,7 @@ class Category(models.Model):
693700
img_url = models.URLField(blank=False, null=False)
694701

695702
class Meta:
703+
verbose_name = "Category"
696704
verbose_name_plural = "Categories"
697705

698706
def __str__(self):
@@ -705,7 +713,11 @@ def save(self, *args, **kwargs):
705713

706714
class Topic(models.Model):
707715
category = models.ForeignKey(
708-
Category, on_delete=models.CASCADE, null=False, blank=False
716+
Category,
717+
verbose_name = "Category",
718+
on_delete=models.CASCADE,
719+
null=False,
720+
blank=False,
709721
)
710722
name = models.CharField(max_length=256)
711723
slug = models.CharField(max_length=256, blank=True)

‎events/templates/events/team_list.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<td>{{ team.country.name|default:'' }}</td>
88
<td>{{ team.spr.name|default:'' }}</td>
99
<td>{{ team.city.name|default:'' }}</td>
10-
<td><a href="{% url 'show-profile' team.owner_profile.id %}" title="{{team.owner_profile}}'s profile">{{ team.owner_profile }}</a></td>
10+
<td><a href="{% url 'show-profile' team.owner_profile.id %}" title="{% blocktrans %}{{team.owner_profile}}'s profile{% endblocktrans %}">{{ team.owner_profile }}</a></td>
1111
<td>{{ team.created_time }}</td>
1212
</tr>
1313
{% endfor %}

‎get_together/static/favicon/site.webmanifest‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
33
"short_name": "GetTogether",
44
"icons": [
55
{
6-
"src": "/android-chrome-36x36.png",
6+
"src": "/static/favicon/android-chrome-36x36.png",
77
"sizes": "36x36",
88
"type": "image/png"
99
},
1010
{
11-
"src": "/android-chrome-48x48.png",
11+
"src": "/static/favicon/android-chrome-48x48.png",
1212
"sizes": "48x48",
1313
"type": "image/png"
1414
},
1515
{
16-
"src": "/android-chrome-72x72.png",
16+
"src": "/static/favicon/android-chrome-72x72.png",
1717
"sizes": "72x72",
1818
"type": "image/png"
1919
},
2020
{
21-
"src": "/android-chrome-96x96.png",
21+
"src": "/static/favicon/android-chrome-96x96.png",
2222
"sizes": "96x96",
2323
"type": "image/png"
2424
},
2525
{
26-
"src": "/android-chrome-144x144.png",
26+
"src": "/static/favicon/android-chrome-144x144.png",
2727
"sizes": "144x144",
2828
"type": "image/png"
2929
},
3030
{
31-
"src": "/android-chrome-192x192.png",
31+
"src": "/static/favicon/android-chrome-192x192.png",
3232
"sizes": "192x192",
3333
"type": "image/png"
3434
},
3535
{
36-
"src": "/android-chrome-256x256.png",
36+
"src": "/static/favicon/android-chrome-256x256.png",
3737
"sizes": "256x256",
3838
"type": "image/png"
3939
}

‎get_together/templates/get_together/base.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134

135135
{% if tip %}
136136
<div class="alerts">
137-
<div class="alert {{ tip.tags }}"><strong>{% trans "Tip:" %}" </strong>{{ tip.text|safe }}</div>
137+
<div class="alert {{ tip.tags }}"><strong>{% trans "Tip:" %} </strong>{{ tip.text|safe }}</div>
138138
</div>
139139
{% endif %}
140140

‎get_together/templates/get_together/events/show_event.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ <h2>
274274
<div class="media gt-profile">
275275
<img class="mr-1 gt-profile-avatar" src="{{node.author.avatar_url}}" width="32px" height="32px">
276276
<span class="gt-profile-badges">{% for badge in node.author.user.account.badges.all %}<img class="mr-0 gt-profile-badge" src="{{badge.img_url}}" title="{{badge.name}}" width="16px" height="16px">{% endfor %}</span>
277-
<a href="{% url 'show-profile' node.author.id %}" title="{{node.author}}'s profile">{{node.author}}</a>
277+
<a href="{% url 'show-profile' node.author.id %}" title="{% blocktrans %}{{node.author}}'s profile{% endblocktrans %}">{{node.author}}</a>
278278
</div>
279279
<span class="gt-hover-expose">{% if node.created_time != node.updated_time %}<i class="far fa-edit text-muted" title="{% trans 'Updated:' %} {{ node.local_updated_time}}"></i> {% endif %}{{ node.local_created_time }}</span>
280280
</div>
@@ -284,10 +284,10 @@ <h2>
284284
<p id="comment-body-{{node.id}}" style="white-space: pre-wrap;">{{ node.body }}</p>
285285
<span class="gt-hover-expose">
286286
{% if request.user.profile == node.author %}
287-
<small><a href="javascript:void(null)" onClick="editComment({{node.id}});"><i class="fa fa-edit"></i> Edit</a></small>&nbsp;
287+
<small><a href="javascript:void(null)" onClick="editComment({{node.id}});"><i class="fa fa-edit"></i> {% trans "Edit" %}</a></small>&nbsp;
288288
{% endif %}
289289
{% if can_edit_team or request.user.profile == node.author %}
290-
<small><a href="{% url 'comment-delete' node.id %}"><i class="fa fa-times"></i> Delete</a></small>
290+
<small><a href="{% url 'comment-delete' node.id %}"><i class="fa fa-times"></i> {% trans "Delete" %}</a></small>
291291
{% endif %}
292292
</span>
293293
</div>
@@ -357,7 +357,7 @@ <h2>
357357
<span class="gt-profile-badges">{% for badge in attendee.user.user.account.badges.all %}<img class="mr-0 gt-profile-badge" src="{{badge.img_url}}" title="{{badge.name}}" width="16px" height="16px">{% endfor %}</span>
358358
<div class="media-body">
359359
<h6 class="mt-2 mb-0">
360-
<a href="{% url 'show-profile' attendee.user.id %}" title="{{attendee.user}}'s profile">{{attendee.user}}</a>
360+
<a href="{% url 'show-profile' attendee.user.id %}" title="{% blocktrans %}{{attendee.user}}'s profile{% endblocktrans %}">{{attendee.user}}</a>
361361
{% if attendee.user.user == request.user and not event.is_over %}
362362
{% if attendee.status == attendee.YES %}
363363
<span class="badge badge-success dropdown-toggle align-top" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ attendee.status_name }}</span>

‎get_together/templates/get_together/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h3>{% trans "Nearby Events" %}</h3>
3939
<div class="d-flex justify-content-between align-items-center">
4040
<small class="text-muted">{{ event.local_start_time }}<br/>{{event.location_name}}</small>
4141
<div class="btn-group">
42-
<a class="btn btn-primary" href="{{event.event_url}}">View</a></span>
42+
<a class="btn btn-primary" href="{{event.event_url}}">{% trans "View" %}</a></span>
4343
</div>
4444
</div>
4545
</div>
@@ -55,7 +55,7 @@ <h3>{% trans "Nearby Events" %}</h3>
5555
{% blocktrans %}There are no events within {{ distance }}km of you.{% endblocktrans %}
5656
{% endif %}
5757
<a class="btn btn-success btn-sm" href="{% url 'create-event-team-select' %}">{% trans "Create one now" %}</a>
58-
or
58+
{% trans "or" %}
5959
<a class="btn btn-primary btn-sm" href="{% url 'all-events' %}">{% trans "View all events" %}</a>
6060
</div>
6161
</div>
@@ -131,7 +131,7 @@ <h3>{% trans "Nearby Teams" %}</h3>
131131
{% blocktrans %}There are no teams within {{ distance }}km of you.{% endblocktrans %}
132132
{% endif %}
133133
<a class="btn btn-success btn-sm" href="{% url 'create-team' %}">{% trans "Create one now" %}</a>
134-
or
134+
{% trans "or" %}
135135
<a class="btn btn-primary btn-sm" href="{% url 'all-teams' %}">{% trans "View all teams" %}</a>
136136
</div>
137137
</div>

‎get_together/templates/get_together/teams/team_page_base.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ <h4>{% trans "Members" %}</h4><hr/>
6767
<img class="mr-1 gt-profile-avatar" src="{{member.user.avatar_url}}" width="32px" height="32px">
6868
<span class="gt-profile-badges">{% for badge in member.user.user.account.badges.all %}<img class="mr-0 gt-profile-badge" src="{{badge.img_url}}" title="{{badge.name}}" width="16px" height="16px">{% endfor %}</span>
6969
<div class="media-body">
70-
<h6 class="mt-0 mb-0"><a href="{% url 'show-profile' member.user.id %}" title="{{member.user}}'s profile">{{member.user}}</a></h6>
70+
<h6 class="mt-0 mb-0"><a href="{% url 'show-profile' member.user.id %}" title="{% blocktrans %}{{member.user}}'s profile{% endblocktrans %}">{{member.user}}</a></h6>
7171
{% if member.role > 0 %}<small class="text-muted">{{ member.role_name }}</small>{% endif %}
7272
</div>
7373
</div>

0 commit comments

Comments
 (0)