image name and mexican flag

bear-rsg · Jul 19, 2024 · 9b77eeb · 9b77eeb
1 parent f90ea6d
commit 9b77eeb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/django/core/templates/base.html b/django/core/templates/base.html
@@ -112,15 +112,15 @@ <h1>{% translate 'ProjectTitle' %}</h1>
 
         <!-- Language -->
         <div id="language-show">
-            {% if LANGUAGE_CODE == 'es' %}🇪🇸{% elif LANGUAGE_CODE == 'en' %}🇬🇧{% endif%}
+            {% if LANGUAGE_CODE == 'es' %}🇲🇽{% elif LANGUAGE_CODE == 'en' %}🇬🇧{% endif%}
         </div>
         <div id="language-popup">
             <ul id="lang-options" class="navbar-nav">
                 {% get_available_languages as languages %}
                 {% for lang_code, lang_name in languages %}
                     <li>
                         <a href="{% language_url lang_code request.get_full_path %}">
-                            {% if lang_code == 'es' %}🇪🇸{% elif lang_code == 'en' %}🇬🇧{% endif%}
+                            {% if lang_code == 'es' %}🇲🇽{% elif lang_code == 'en' %}🇬🇧{% endif%}
                             {{ lang_name }}
                         </a>
                     </li>

diff --git a/django/photographs/migrations/0002_photograph_image_name.py b/django/photographs/migrations/0002_photograph_image_name.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.14 on 2024-07-19 13:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('photographs', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='photograph',
+            name='image_name',
+            field=models.CharField(blank=True, help_text='A brief name/title for the image', max_length=255, null=True),
+        ),
+    ]
diff --git a/django/photographs/models.py b/django/photographs/models.py
@@ -13,6 +13,7 @@ class Photograph(models.Model):
     related_name = 'photographs'
 
     image = models.ImageField(upload_to='photographs', blank=True, null=True)
+    image_name = models.CharField(max_length=255, blank=True, null=True, help_text="A brief name/title for the image")
     description_es = RichTextUploadingField(blank=True, null=True, verbose_name='Description (Spanish)')
     description_en = RichTextUploadingField(blank=True, null=True, verbose_name='Description (English)')
     acknowledgements = models.TextField(blank=True, null=True)
@@ -29,15 +30,11 @@ class Photograph(models.Model):
     def admin_url(self):
         return reverse('admin:photographs_photograph_change', args=[self.id])
 
-    @property
-    def image_name(self):
-        return str(self.image.name).split('/')[-1].split('.')[0]
-
     def __str__(self):
-        return f'Photograph #{self.id}: {self.image_name}'
+        return self.image_name if self.image_name else f'Photograph #{self.id}'
 
     def get_absolute_url(self):
-        return reverse('photographs:detail', args=[self.meta_slug])
+        return reverse('photographs:detail', args=[self.id])
 
 
 class PhotographUserContribution(models.Model):