Merge pull request #2 from LQDJudge/master

merge from master

.gitignore

@@ -5,7 +5,7 @@
 *.py[co]
 *.mo
 *~
-# dmoj/local_settings.py
+dmoj/local_settings.py
 resources/style.css
 resources/content-description.css
 resources/ranks.css

README.md

@@ -15,8 +15,8 @@ python dmojauto-conf
 + python manage.py runbridged
 + dmoj 0.0.0.0 -p 9999 -c judge/conf1.yml (depend on port in the local_settings.py and directory of conf file)
 
-### 7. Change vietnamese:
+### 7. Update vietnamese translation:
- - go to /home/cuom1999/DMOJ/site/locale/vi
+ - go to locale/vi
- - open .po file
+ - modify .po file
  - python manage.py compilemessages
  - python manage.py compilejsi18n

dmoj/local_settings.py

@@ -24,7 +24,7 @@ INSTALLED_APPS += (
 )
 
 #path to problem folder
-DMOJ_PROBLEM_DATA_ROOT = '/home/cuom1999/DMOJ/problems'
+DMOJ_PROBLEM_DATA_ROOT = '/home/Projects/CP/LQDJudge/problems'
 
 # Caching. You can use memcached or redis instead.
 # Documentation: <https://docs.djangoproject.com/en/1.11/topics/cache/>
@@ -41,7 +41,7 @@ DATABASES = {
         'ENGINE': 'django.db.backends.mysql', 
         'NAME': 'dmoj',
         'USER': 'dmoj',
-        'PASSWORD': '<password>',
+        'PASSWORD': 'admintl97p1',
         'HOST': '127.0.0.1',
         'OPTIONS': {
             'charset': 'utf8mb4',
@@ -56,8 +56,8 @@ DATABASES = {
 
 # Internationalization.
 # Documentation: <https://docs.djangoproject.com/en/1.11/topics/i18n/>
-LANGUAGE_CODE = 'en-ca'
+LANGUAGE_CODE = 'vi'
-DEFAULT_USER_TIME_ZONE = 'America/Mexico_City'
+DEFAULT_USER_TIME_ZONE = 'Asia/Ho_Chi_Minh'
 USE_I18N = True
 USE_L10N = True
 USE_TZ = True
@@ -108,11 +108,11 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 # A tuple of (name, email) pairs that specifies those who will be mailed
 # when the server experiences an error when DEBUG = False.
 ADMINS = (
-    ('cuom1999', 'your.email@example.com'),
+    ('luongd', 'doannguyenthanhluong@gmail.com'),
 )
 
 # The sender for the aforementioned emails.
-SERVER_EMAIL = 'DMOJ: Modern Online Judge <errors@dmoj.ca>'
+SERVER_EMAIL = 'LQDOJ: Le Quy Don Online Judge <errors@lqdoj.com>'
 
 
 ##################################################
@@ -124,7 +124,7 @@ SERVER_EMAIL = 'DMOJ: Modern Online Judge <errors@dmoj.ca>'
 # webserver to serve the static files. This is the directory where all the 
 # static files DMOJ uses will be collected to.
 # You must configure your webserver to serve this directory as /static/ in production.
-STATIC_ROOT = '/home/cuom1999/DMOJ/static_root'
+STATIC_ROOT = '/home/luongd/Projects/LQDJudge/online-judge/static_root'
 
 # URL to access static files.
 #STATIC_URL = '/static/'
@@ -137,8 +137,8 @@ STATIC_ROOT = '/home/cuom1999/DMOJ/static_root'
 ############################################
 
 ## DMOJ site display settings.
-SITE_NAME = 'FOOJ'
+SITE_NAME = 'LQDOJ'
-SITE_LONG_NAME = 'FOOJ: Modern Online Judge'
+SITE_LONG_NAME = 'LQDOJ: Le Quy Don Online Judge'
 SITE_ADMIN_EMAIL = 'admin@example.com'
 TERMS_OF_SERVICE_URL = '//dmoj.ca/tos' # Use a flatpage.
 

dmoj/settings.py

@@ -30,8 +30,8 @@ DEBUG = True
 ALLOWED_HOSTS = []
 
 SITE_ID = 1
-SITE_NAME = 'DMOJ'
+SITE_NAME = 'LQDOJ'
-SITE_LONG_NAME = 'DMOJ: Modern Online Judge'
+SITE_LONG_NAME = 'LQDOJ: Le Quy Don Online Judge'
 SITE_ADMIN_EMAIL = False
 
 DMOJ_REQUIRE_STAFF_2FA = True
@@ -145,7 +145,7 @@ else:
 
     WPADMIN = {
         'admin': {
-            'title': 'DMOJ Admin',
+            'title': 'LQDOJ Admin',
             'menu': {
                 'top': 'wpadmin.menu.menus.BasicTopMenu',
                 'left': 'wpadmin.menu.custom.CustomModelLeftMenuWithDashboard',

templates/about/about.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block body %}
-    <p style="font-size:40px;">
+    <b style="font-size:40px;">
-        I am <b><a href="https://codeforces.com/profile/cuom1999" style="color:red;" target="_blank">cuom1999</a></b>.
+        Le Quy Don's online judge.
-    </p>
+    </b>
 {% endblock %}