Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

master to live #8

Merged
merged 2 commits into from
Jun 28, 2024
Merged

master to live #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c2dbfa
changed title
mike-allaway Jun 28, 2024
f90ea6d
Merge pull request #7 from bear-rsg/dev
mike-allaway Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 14 additions & 18 deletions django/core/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-09 17:31+0000\n"
"POT-Creation-Date: 2024-06-28 08:24+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -18,54 +18,50 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: core/settings.py:92
#: core/settings.py:104
msgid "Spanish"
msgstr ""

#: core/settings.py:93
#: core/settings.py:105
msgid "English"
msgstr ""

#: core/templates/base.html:7 core/templates/base.html:47
#: core/templates/base.html:8 core/templates/base.html:48
msgid "ProjectTitle"
msgstr "Encarnación de Díaz"
msgstr "Enrique Aguilar Ugarte en Encarnación de Díaz"

#: core/templates/base.html:60
msgid "Welcome"
msgstr ""

#: core/templates/base.html:66
#: core/templates/base.html:61
msgid "Photographs"
msgstr ""

#: core/templates/base.html:72
#: core/templates/base.html:67
msgid "About"
msgstr ""

#: core/templates/base.html:78
#: core/templates/base.html:73
msgid "Updates"
msgstr ""

#: core/templates/base.html:84
#: core/templates/base.html:79
msgid "Get Involved"
msgstr ""

#: core/templates/base.html:106
#: core/templates/base.html:101
msgid "Privacy"
msgstr ""

#: core/templates/base.html:107
#: core/templates/base.html:102
msgid "Legal"
msgstr ""

#: core/templates/base.html:108
#: core/templates/base.html:103
msgid "Freedom of Information"
msgstr ""

#: core/templates/base.html:109
#: core/templates/base.html:104
msgid "Cookies"
msgstr ""

#: core/templates/base.html:110
#: core/templates/base.html:105
msgid "Accessibility"
msgstr ""
36 changes: 18 additions & 18 deletions django/core/locale/es/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-09 17:31+0000\n"
"POT-Creation-Date: 2024-06-28 08:24+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -18,54 +18,54 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: core/settings.py:92
#: core/settings.py:104
msgid "Spanish"
msgstr ""

#: core/settings.py:93
#: core/settings.py:105
msgid "English"
msgstr ""

#: core/templates/base.html:7 core/templates/base.html:47
#: core/templates/base.html:8 core/templates/base.html:48
msgid "ProjectTitle"
msgstr "Encarnación de Díaz: Fotohistorias de la Cristiada"

#: core/templates/base.html:60
msgid "Welcome"
msgstr "Bienvenido"
msgstr ""
"Enrique Aguilar Ugarte en Encarnación de Díaz"

#: core/templates/base.html:66
#: core/templates/base.html:61
msgid "Photographs"
msgstr "Fotografías"

#: core/templates/base.html:72
#: core/templates/base.html:67
msgid "About"
msgstr "Acerca de"

#: core/templates/base.html:78
#: core/templates/base.html:73
msgid "Updates"
msgstr "Actualizaciones"

#: core/templates/base.html:84
#: core/templates/base.html:79
msgid "Get Involved"
msgstr "Involucrarse"

#: core/templates/base.html:106
#: core/templates/base.html:101
msgid "Privacy"
msgstr "Privacidad"

#: core/templates/base.html:107
#: core/templates/base.html:102
msgid "Legal"
msgstr "Legal"

#: core/templates/base.html:108
#: core/templates/base.html:103
msgid "Freedom of Information"
msgstr "Libertad de Información"

#: core/templates/base.html:109
#: core/templates/base.html:104
msgid "Cookies"
msgstr "Cookies"

#: core/templates/base.html:110
#: core/templates/base.html:105
msgid "Accessibility"
msgstr "Accesibilidad"

#~ msgid "Welcome"
#~ msgstr "Bienvenido"
2 changes: 1 addition & 1 deletion django/core/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Encarnación de Díaz: Photohistories of the Cristero War project at the University of Birmingham">
<meta name="description" content="'Enrique Aguilar Ugarte en Encarnación de Díaz: Miradas fotográficas sobre la Guerra Cristera (1926-29)' project at the University of Birmingham">
<meta name="author" content="University of Birmingham">

<!-- CSS -->
Expand Down
6 changes: 3 additions & 3 deletions django/pages/templates/pages/page-welcome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<section id="welcome-banner">
<div id="welcome-banner-content">
<div id="welcome-banner-content-title">
Encarnación de Díaz
Enrique Aguilar Ugarte<br>en Encarnación de Díaz
</div>
<hr>
<div id="welcome-banner-content-tagline">
{% if LANGUAGE_CODE == 'es' %}
Fotohistorias de la Cristiada
Miradas fotográficas sobre<br>la Guerra Cristera (1926-29)
{% elif LANGUAGE_CODE == 'en' %}
Photohistories of the Cristero War
Photohistories of the Cristero War (1926-29)
{% endif %}
</div>
</div>
Expand Down
Loading