From 1f792a9e3c7c31da1bce2fdb82987cab5f6b2a00 Mon Sep 17 00:00:00 2001 From: chenchen1750 Date: Mon, 29 Jan 2018 11:07:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E6=94=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=93=E6=9E=84=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修正"项目多语言目录" --- docs/project_structure.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/project_structure.md b/docs/project_structure.md index d66f043f9..826fd1860 100644 --- a/docs/project_structure.md +++ b/docs/project_structure.md @@ -45,6 +45,6 @@ │ │ └── wsgi.py │ ├── manage.py │ ├── static // 项目静态资源目录 -│ ├── static // 项目多语言目录 +│ ├── locale // 项目多语言目录 │ └── templates // 项目模板目录 ``` From 04c344e2a0a4ce29443f4c35a8229073bf025ba7 Mon Sep 17 00:00:00 2001 From: liuzheng Date: Mon, 29 Jan 2018 11:50:41 +0800 Subject: [PATCH 2/3] Update project_structure.md --- docs/project_structure.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/project_structure.md b/docs/project_structure.md index 826fd1860..3cc9b8f94 100644 --- a/docs/project_structure.md +++ b/docs/project_structure.md @@ -45,6 +45,6 @@ │ │ └── wsgi.py │ ├── manage.py │ ├── static // 项目静态资源目录 -│ ├── locale // 项目多语言目录 +│   ├── i18n                     // 项目多语言目录 │ └── templates // 项目模板目录 ``` From e821d2995d2569671ee95ed84c231526873789eb Mon Sep 17 00:00:00 2001 From: liuzheng Date: Mon, 29 Jan 2018 11:53:50 +0800 Subject: [PATCH 3/3] refactor: rename folder i18n --- apps/{locale => i18n}/zh/LC_MESSAGES/django.mo | Bin apps/{locale => i18n}/zh/LC_MESSAGES/django.po | 0 apps/jumpserver/settings.py | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename apps/{locale => i18n}/zh/LC_MESSAGES/django.mo (100%) rename apps/{locale => i18n}/zh/LC_MESSAGES/django.po (100%) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo similarity index 100% rename from apps/locale/zh/LC_MESSAGES/django.mo rename to apps/i18n/zh/LC_MESSAGES/django.mo diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po similarity index 100% rename from apps/locale/zh/LC_MESSAGES/django.po rename to apps/i18n/zh/LC_MESSAGES/django.po diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index 4926c4538..77dd8e114 100644 --- 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/