Skip to content

Commit

Permalink
Actualizado modelo talks
Browse files Browse the repository at this point in the history
- Adicionados campos meses y presencialidad
- Actualizado el archivo de traducción
- Migraciones para talks creadas desde 0
  • Loading branch information
Scot3004 committed Oct 7, 2023
1 parent bffbafd commit 33e8f6c
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 68 deletions.
1 change: 1 addition & 0 deletions .envs/.local/.django
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
# ------------------------------------------------------------------------------
USE_DOCKER=yes
IPYTHONDIR=/app/.ipython
LANG=es_CO.UTF-8
38 changes: 27 additions & 11 deletions locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-06 00:00-0500\n"
"POT-Creation-Date: 2023-10-07 12:27-0500\n"
"PO-Revision-Date: 2023-09-05 23:34-0500\n"
"Last-Translator: Sergio Orozco <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -43,30 +43,46 @@ msgid "English"
msgstr "Inglés"

#: temii/talks/models.py:18
msgid "On site"
msgstr "En sitio"

#: temii/talks/models.py:19
msgid "Virtual"
msgstr "Virtual"

#: temii/talks/models.py:22
msgid "Name"
msgstr "Nombre"

#: temii/talks/models.py:19
#: temii/talks/models.py:23
msgid "Description"
msgstr "Descripción"

#: temii/talks/models.py:20
#: temii/talks/models.py:24
msgid "Level"
msgstr "Nivel"

#: temii/talks/models.py:21
#: temii/talks/models.py:25
msgid "Language"
msgstr "Lenguaje"

#: temii/talks/models.py:22
#: temii/talks/models.py:26
msgid "Timezone"
msgstr "Zona horaria"

#: temii/talks/models.py:23
#: temii/talks/models.py:27
msgid "Comments"
msgstr "Comentarios"

#: temii/talks/models.py:26
#: temii/talks/models.py:28
msgid "Precense"
msgstr "Presencialidad"

#: temii/talks/models.py:29
msgid "Months"
msgstr "Meses"

#: temii/talks/models.py:32
msgid "Talk"
msgstr "Charla"

Expand Down Expand Up @@ -345,21 +361,21 @@ msgstr ""
msgid "My Profile"
msgstr "Mi perfil"

#: temii/templates/users/user_detail.html:17 temii/users/forms.py:37
#: temii/templates/users/user_detail.html:19 temii/users/forms.py:37
#: temii/users/models.py:23
msgid "Bio"
msgstr "Biografia"

#: temii/templates/users/user_detail.html:20 temii/users/forms.py:36
#: temii/templates/users/user_detail.html:22 temii/users/forms.py:36
#: temii/users/models.py:22
msgid "Phone"
msgstr "Telefono"

#: temii/templates/users/user_detail.html:30
#: temii/templates/users/user_detail.html:32
msgid "Update"
msgstr "Actualizar"

#: temii/templates/users/user_detail.html:31
#: temii/templates/users/user_detail.html:33
msgid "E-Mail"
msgstr "Coreo electrónico"

Expand Down
31 changes: 24 additions & 7 deletions temii/talks/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 4.1.8 on 2023-09-06 02:05
# Generated by Django 4.2.1 on 2023-10-07 18:07

from django.conf import settings
from django.db import migrations, models
Expand All @@ -17,21 +17,38 @@ class Migration(migrations.Migration):
name="Talk",
fields=[
("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
("name", models.CharField(max_length=60)),
("description", models.CharField(max_length=300)),
("name", models.CharField(max_length=60, verbose_name="Name")),
("description", models.CharField(max_length=300, verbose_name="Description")),
(
"level",
models.PositiveIntegerField(
choices=[(1, "Beginner"), (2, "Intermediate"), (3, "Advanced")], default=1
choices=[(1, "Beginner"), (2, "Intermediate"), (3, "Advanced")],
default=1,
verbose_name="Level",
),
),
(
"language",
models.CharField(choices=[("es", "Spanish"), ("en", "English")], default="es", max_length=2),
models.CharField(
choices=[("es", "Spanish"), ("en", "English")],
default="es",
max_length=2,
verbose_name="Language",
),
),
("timezone", models.CharField(max_length=60, verbose_name="Timezone")),
("comments", models.CharField(max_length=300, verbose_name="Comments")),
(
"precense",
models.PositiveIntegerField(
choices=[("1", "On site"), ("2", "Virtual")], default="1", verbose_name="Precense"
),
),
("timezone", models.CharField(max_length=60)),
("comments", models.CharField(max_length=300)),
("months", models.CharField(blank=True, max_length=100, verbose_name="Months")),
("user", models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
],
options={
"verbose_name": "Talk",
},
),
]

This file was deleted.

6 changes: 6 additions & 0 deletions temii/talks/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,19 @@ class Language(models.TextChoices):
ES = "es", _("Spanish")
EN = "en", _("English")

class InPerson(models.TextChoices):
ON_SITE = 1, _("On site")
VIRTUAL = 2, _("Virtual")

user = models.ForeignKey(User, on_delete=models.PROTECT)
name = models.CharField(_("Name"), max_length=60)
description = models.CharField(_("Description"), max_length=300)
level = models.PositiveIntegerField(_("Level"), choices=Level.choices, default=Level.BEGINNER)
language = models.CharField(_("Language"), max_length=2, choices=Language.choices, default=Language.ES)
timezone = models.CharField(_("Timezone"), max_length=60)
comments = models.CharField(_("Comments"), max_length=300)
precense = models.PositiveIntegerField(_("Precense"), choices=InPerson.choices, default=InPerson.ON_SITE)
months = models.CharField(_("Months"), max_length=100, blank=True)

class Meta:
verbose_name = _("Talk")

0 comments on commit 33e8f6c

Please sign in to comment.