github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

pull/1007/head
ibuler 2018-01-29 17:04:09 +08:00
parent 012614562f e821d2995d
commit 0f15a94b08
4 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
apps/locale/zh/LC_MESSAGES/django.mo → apps/i18n/zh/LC_MESSAGES/django.mo
View File

0
apps/locale/zh/LC_MESSAGES/django.po → apps/i18n/zh/LC_MESSAGES/django.po
View File

2
apps/jumpserver/settings.py
View File

@ -241,7 +241,7 @@ USE_L10N = True
USE_TZ = True USE_TZ = True
# I18N translation # I18N translation
LOCALE_PATHS = [os.path.join(BASE_DIR, 'locale'), ] LOCALE_PATHS = [os.path.join(BASE_DIR, 'i18n'), ]
# Static files (CSS, JavaScript, Images) # Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.10/howto/static-files/ # https://docs.djangoproject.com/en/1.10/howto/static-files/

2
docs/project_structure.md
View File

@ -45,6 +45,6 @@
│ │ └── wsgi.py │ │ └── wsgi.py
│ ├── manage.py │ ├── manage.py
│ ├── static // 项目静态资源目录 │ ├── static // 项目静态资源目录
│ ├── static // 项目多语言目录 │   ├── i18n                     // 项目多语言目录
│ └── templates // 项目模板目录 │ └── templates // 项目模板目录
``` ```