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

0f15a94b · ibuler · 01261456 · e821d299 · 0f15a94b · 0f15a94b
Commit 0f15a94b authored Jan 29, 2018 by ibuler
Showing with 2 additions and 2 deletions

django.mo apps/i18n/zh/LC_MESSAGES/django.mo +0 -0

django.po apps/i18n/zh/LC_MESSAGES/django.po +0 -0

settings.py apps/jumpserver/settings.py +1 -1

project_structure.md docs/project_structure.md +1 -1

No files found.
--- a/apps/locale/zh/LC_MESSAGES/django.mo
+++ b/apps/locale/zh/LC_MESSAGES/django.mo
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
--- a/apps/jumpserver/settings.py
+++ b/apps/jumpserver/settings.py
@@ -241,7 +241,7 @@ USE_L10N = True
 USE_TZ = True

 # I18N translation
-LOCALE_PATHS = [os.path.join(BASE_DIR, 'locale'), ]
+LOCALE_PATHS = [os.path.join(BASE_DIR, 'i18n'), ]

 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.10/howto/static-files/

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