diff --git a/events/migrations/0052_auto_20200412_2030.py b/events/migrations/0052_auto_20200412_2030.py new file mode 100644 index 0000000..53fd0fb --- /dev/null +++ b/events/migrations/0052_auto_20200412_2030.py @@ -0,0 +1,64 @@ +# Generated by Django 2.0.12 on 2020-04-12 20:30 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [("events", "0051_add_team_membership_invites")] + + operations = [ + migrations.AlterModelOptions( + name="category", + options={"verbose_name": "Category", "verbose_name_plural": "Categories"}, + ), + migrations.AlterModelOptions( + name="city", + options={ + "ordering": ("name",), + "verbose_name": "City", + "verbose_name_plural": "Cities", + }, + ), + migrations.AlterField( + model_name="organization", + name="description", + field=models.TextField(blank=True, null=True, verbose_name="Description"), + ), + migrations.AlterField( + model_name="sponsor", + name="description", + field=models.TextField(blank=True, null=True, verbose_name="Description"), + ), + migrations.AlterField( + model_name="team", + name="about_page", + field=models.TextField(blank=True, null=True, verbose_name="About page"), + ), + migrations.AlterField( + model_name="team", + name="city", + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + to="events.City", + verbose_name="City", + ), + ), + migrations.AlterField( + model_name="team", + name="description", + field=models.TextField(blank=True, null=True, verbose_name="Description"), + ), + migrations.AlterField( + model_name="topic", + name="category", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="events.Category", + verbose_name="Category", + ), + ), + ] diff --git a/events/models/locale.py b/events/models/locale.py index 853a5f6..8277990 100644 --- a/events/models/locale.py +++ b/events/models/locale.py @@ -84,6 +84,7 @@ class Meta: class City(models.Model): class Meta: ordering = ("name",) + verbose_name = _("City") verbose_name_plural = _("Cities") name = models.CharField(_("Name"), max_length=100) diff --git a/events/models/profiles.py b/events/models/profiles.py index 99e59fd..25c74c2 100644 --- a/events/models/profiles.py +++ b/events/models/profiles.py @@ -328,7 +328,9 @@ class Organization(models.Model): format="PNG", ) - description = models.TextField(blank=True, null=True) + description = models.TextField( + verbose_name=_("Description"), blank=True, null=True + ) def save(self, *args, **kwargs): if not self.slug: @@ -394,7 +396,7 @@ def __str__(self): class Sponsor(models.Model): name = models.CharField(_("Sponsor Name"), max_length=256, null=False, blank=False) - description = models.TextField(blank=True, null=True) + description = models.TextField(verbose_name=_("Description"), blank=True, null=True) web_url = models.URLField(_("Website"), null=True, blank=True) logo = ProcessedImageField( verbose_name=_("Logo"), @@ -455,15 +457,19 @@ class Team(models.Model): format="PNG", ) - description = models.TextField(blank=True, null=True) + description = models.TextField( + verbose_name=_("Description"), blank=True, null=True + ) - about_page = models.TextField(blank=True, null=True) + about_page = models.TextField( + verbose_name=_("About page"), blank=True, null=True + ) country = models.ForeignKey( Country, null=True, blank=True, on_delete=models.CASCADE ) spr = models.ForeignKey(SPR, null=True, blank=True, on_delete=models.CASCADE) - city = models.ForeignKey(City, null=True, blank=True, on_delete=models.CASCADE) + city = models.ForeignKey(City, verbose_name=_("City"), null=True, blank=True, on_delete=models.CASCADE) web_url = models.URLField(_("Website"), null=True, blank=True) email = models.EmailField(_("Email Address"), null=True, blank=True) @@ -659,6 +665,7 @@ class TeamSerializer(serializers.ModelSerializer): class Meta: model = Team + verbose_name = _("Team") fields = ("id", "name", "slug", "latitude", "longitude", "web_url") @@ -693,6 +700,7 @@ class Category(models.Model): img_url = models.URLField(blank=False, null=False) class Meta: + verbose_name = "Category" verbose_name_plural = "Categories" def __str__(self): @@ -705,7 +713,11 @@ def save(self, *args, **kwargs): class Topic(models.Model): category = models.ForeignKey( - Category, on_delete=models.CASCADE, null=False, blank=False + Category, + verbose_name = "Category", + on_delete=models.CASCADE, + null=False, + blank=False, ) name = models.CharField(max_length=256) slug = models.CharField(max_length=256, blank=True) diff --git a/events/templates/events/team_list.html b/events/templates/events/team_list.html index 23492e7..1adeefe 100644 --- a/events/templates/events/team_list.html +++ b/events/templates/events/team_list.html @@ -7,7 +7,7 @@ {{ team.country.name|default:'' }} {{ team.spr.name|default:'' }} {{ team.city.name|default:'' }} - {{ team.owner_profile }} + {{ team.owner_profile }} {{ team.created_time }} {% endfor %} diff --git a/get_together/static/favicon/site.webmanifest b/get_together/static/favicon/site.webmanifest index 06e4885..fd95741 100644 --- a/get_together/static/favicon/site.webmanifest +++ b/get_together/static/favicon/site.webmanifest @@ -3,37 +3,37 @@ "short_name": "GetTogether", "icons": [ { - "src": "/android-chrome-36x36.png", + "src": "/static/favicon/android-chrome-36x36.png", "sizes": "36x36", "type": "image/png" }, { - "src": "/android-chrome-48x48.png", + "src": "/static/favicon/android-chrome-48x48.png", "sizes": "48x48", "type": "image/png" }, { - "src": "/android-chrome-72x72.png", + "src": "/static/favicon/android-chrome-72x72.png", "sizes": "72x72", "type": "image/png" }, { - "src": "/android-chrome-96x96.png", + "src": "/static/favicon/android-chrome-96x96.png", "sizes": "96x96", "type": "image/png" }, { - "src": "/android-chrome-144x144.png", + "src": "/static/favicon/android-chrome-144x144.png", "sizes": "144x144", "type": "image/png" }, { - "src": "/android-chrome-192x192.png", + "src": "/static/favicon/android-chrome-192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "/android-chrome-256x256.png", + "src": "/static/favicon/android-chrome-256x256.png", "sizes": "256x256", "type": "image/png" } diff --git a/get_together/templates/get_together/base.html b/get_together/templates/get_together/base.html index 7ca0020..20c0238 100644 --- a/get_together/templates/get_together/base.html +++ b/get_together/templates/get_together/base.html @@ -134,7 +134,7 @@ {% if tip %}
-
{% trans "Tip:" %}" {{ tip.text|safe }}
+
{% trans "Tip:" %} {{ tip.text|safe }}
{% endif %} diff --git a/get_together/templates/get_together/events/show_event.html b/get_together/templates/get_together/events/show_event.html index 8540df0..fc2c7e5 100644 --- a/get_together/templates/get_together/events/show_event.html +++ b/get_together/templates/get_together/events/show_event.html @@ -274,7 +274,7 @@

{% for badge in node.author.user.account.badges.all %}{% endfor %} - {{node.author}} + {{node.author}}
{% if node.created_time != node.updated_time %} {% endif %}{{ node.local_created_time }} @@ -284,10 +284,10 @@

{{ node.body }}

{% if request.user.profile == node.author %} - Edit  + {% trans "Edit" %}  {% endif %} {% if can_edit_team or request.user.profile == node.author %} - Delete + {% trans "Delete" %} {% endif %} @@ -357,7 +357,7 @@

{% for badge in attendee.user.user.account.badges.all %}{% endfor %}
- {{attendee.user}} + {{attendee.user}} {% if attendee.user.user == request.user and not event.is_over %} {% if attendee.status == attendee.YES %} diff --git a/get_together/templates/get_together/index.html b/get_together/templates/get_together/index.html index 4d359bf..bf0a577 100644 --- a/get_together/templates/get_together/index.html +++ b/get_together/templates/get_together/index.html @@ -39,7 +39,7 @@

{% trans "Nearby Events" %}

{{ event.local_start_time }}
{{event.location_name}}
- View + {% trans "View" %}
@@ -55,7 +55,7 @@

{% trans "Nearby Events" %}

{% blocktrans %}There are no events within {{ distance }}km of you.{% endblocktrans %} {% endif %} {% trans "Create one now" %} - or + {% trans "or" %} {% trans "View all events" %} @@ -131,7 +131,7 @@

{% trans "Nearby Teams" %}

{% blocktrans %}There are no teams within {{ distance }}km of you.{% endblocktrans %} {% endif %} {% trans "Create one now" %} - or + {% trans "or" %} {% trans "View all teams" %} diff --git a/get_together/templates/get_together/teams/team_page_base.html b/get_together/templates/get_together/teams/team_page_base.html index 1ebbc51..e0aa3b9 100644 --- a/get_together/templates/get_together/teams/team_page_base.html +++ b/get_together/templates/get_together/teams/team_page_base.html @@ -67,7 +67,7 @@

{% trans "Members" %}

{% for badge in member.user.user.account.badges.all %}{% endfor %}
-
{{member.user}}
+
{{member.user}}
{% if member.role > 0 %}{{ member.role_name }}{% endif %}