Update locale dir name to zh

a0ef3cfc · ibuler · 1b9c9c48 · a0ef3cfc · a0ef3cfc · a0ef3cfc
Commit a0ef3cfc authored Sep 05, 2016 by ibuler
8 changed files
--- a/apps/jumpserver/settings.py
+++ b/apps/jumpserver/settings.py
@@ -75,12 +75,12 @@ INSTALLED_APPS = [
 MIDDLEWARE = [
    'django.middleware.security.SecurityMiddleware',
    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
    'django.middleware.common.CommonMiddleware',
    'django.middleware.csrf.CsrfViewMiddleware',
    'django.contrib.auth.middleware.AuthenticationMiddleware',
    'django.contrib.messages.middleware.MessageMiddleware',
    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
 ]

 ROOT_URLCONF = 'jumpserver.urls'
@@ -92,6 +92,7 @@ TEMPLATES = [
        'APP_DIRS': True,
        'OPTIONS': {
            'context_processors': [
+                'django.template.context_processors.i18n',
                'django.template.context_processors.debug',
                'django.template.context_processors.request',
                'django.contrib.auth.context_processors.auth',
@@ -215,7 +216,7 @@ LOGGING = {
 # Internationalization
 # https://docs.djangoproject.com/en/1.10/topics/i18n/

-LANGUAGE_CODE = 'en_US'
+LANGUAGE_CODE = 'en-us'

 TIME_ZONE = 'Asia/Shanghai'


--- a/apps/locale/zh/LC_MESSAGES/django.mo
+++ b/apps/locale/zh/LC_MESSAGES/django.mo
--- a/apps/users/locale/zh_CN/LC_MESSAGES/django.po
+++ b/apps/users/locale/zh_CN/LC_MESSAGES/django.po
--- a/apps/locale/zh_CN/LC_MESSAGES/django.mo
+++ b/apps/locale/zh_CN/LC_MESSAGES/django.mo
--- a/apps/locale/zh_CN/LC_MESSAGES/django.po
+++ b/apps/locale/zh_CN/LC_MESSAGES/django.po
--- a/apps/users/locale/zh_CN/LC_MESSAGES/django.mo
+++ b/apps/users/locale/zh_CN/LC_MESSAGES/django.mo
--- a/apps/users/templates/users/login.html
+++ b/apps/users/templates/users/login.html
@@ -11,14 +11,6 @@
    {% include '_head_css_js.html' %}
    <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
    <script src="{% static "js/jumpserver.js" %}"></script>
-    <style>
-        .captcha {
-            float: right;
-        }
-        #id_captcha_1 {
-
-        }
-    </style>
 </head>

 <body class="gray-bg">

--- a/apps/users/views.py
+++ b/apps/users/views.py
@@ -117,11 +117,13 @@ class UserAddView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView):
        user = form.save(commit=False)
        user.created_by = self.request.user.username or 'System'
        user.save()
-
        user_add_success_next(user)
-
        return super(UserAddView, self).form_valid(form)

+    def form_invalid(self, form):
+        print(form.errors)
+        return super(UserAddView, self).form_invalid(form)
+
    def get_success_message(self, cleaned_data):
        return self.success_message % (
            reverse_lazy('users:user-detail', kwargs={'pk': self.object.pk}),