Skip to content

Commit

Permalink
Merge pull request #29 from LKKTGB/bump_Django_to_3.2
Browse files Browse the repository at this point in the history
Bump Django to 3.2
  • Loading branch information
badboy99tw committed Apr 25, 2021
2 parents f343fd0 + e0a7336 commit 913e612
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 10 deletions.
8 changes: 4 additions & 4 deletions requirements.txt
@@ -1,12 +1,12 @@
dj-database-url==0.5.0
django-debug-toolbar==1.11.1
django-debug-toolbar==3.2.1
django-embed-video==1.2.0
django-grappelli==2.12.2
django-grappelli==2.15.1
django-solo==1.1.3
Django==2.2.20
Django==3.2
gunicorn==19.9.0
psycopg2==2.8.6
social-auth-app-django==3.1.0
social-auth-core==3.0.0
Unidecode==1.0.23
whitenoise==4.1.2
whitenoise==5.2.0
4 changes: 3 additions & 1 deletion thiamsu/settings/base.py
Expand Up @@ -136,8 +136,10 @@
# Internationalization
# https://docs.djangoproject.com/en/1.11/topics/i18n/

DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'

LOCALE_PATHS = [os.path.join(BASE_DIR, "locale")]
LANGUAGE_CODE = "zh-Hant"
LANGUAGE_CODE = "zh-hant"

TIME_ZONE = "Asia/Taipei"

Expand Down
2 changes: 1 addition & 1 deletion thiamsu/templates/thiamsu/base.html
@@ -1,4 +1,4 @@
{% load staticfiles song_search %}
{% load static song_search %}
<!DOCTYPE html>
<html lang="en">
<head>
Expand Down
2 changes: 1 addition & 1 deletion thiamsu/templates/thiamsu/chart.html
@@ -1,5 +1,5 @@
{% extends 'thiamsu/base.html' %}
{% load staticfiles %}
{% load static %}

{% block content %}
<div class="row context-header charts-header">
Expand Down
2 changes: 1 addition & 1 deletion thiamsu/templates/thiamsu/privacy_policy.html
@@ -1,5 +1,5 @@
{% extends 'thiamsu/base.html' %}
{% load staticfiles %}
{% load static %}

{% block content %}
<div class="row policy">
Expand Down
2 changes: 1 addition & 1 deletion thiamsu/templates/thiamsu/song_list.html
@@ -1,5 +1,5 @@
{% extends 'thiamsu/base.html' %}
{% load pagination staticfiles list_sorting %}
{% load pagination static list_sorting %}

{% block content %}

Expand Down
2 changes: 1 addition & 1 deletion thiamsu/templates/thiamsu/user_profile.html
@@ -1,5 +1,5 @@
{% extends 'thiamsu/song_list.html' %}
{% load staticfiles %}
{% load static %}

{% block page_title %}{{ viewee.get_full_name }} - {{ block.super }}{% endblock %}

Expand Down

0 comments on commit 913e612

Please sign in to comment.