the problem of locale

HLLRESOURSES · Jan 14, 2019 · 062cc07 · 062cc07
1 parent 2db55b1
commit 062cc07
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/console/src/main/java/com/alibaba/nacos/console/config/WebSecurityConfig.java b/console/src/main/java/com/alibaba/nacos/console/config/WebSecurityConfig.java
@@ -75,7 +75,7 @@ public void configure(WebSecurity web) {
             .antMatchers("/")
             .antMatchers("/**/*.css", "/**/*.js", "/**/*.html", "/**/*.map", "/**/*.svg", "/**/*.png", "/**/*.ico")
             .antMatchers("/**.css", "/**.js", "/**.html", "/**.map", "/**.svg", "/**.png", "/**.ico")
-            .antMatchers("/console-fe/public/*")
+            .antMatchers("/console-fe/public/**")
             .antMatchers("/v1/auth/login")
             .antMatchers("/v1/cs/health");
     }

diff --git a/console/src/main/resources/static/console-fe/src/layouts/Header.js b/console/src/main/resources/static/console-fe/src/layouts/Header.js
@@ -101,7 +101,7 @@ class Header extends React.Component {
           {pathname !== '/login' && (
             <Dropdown trigger={<div className="logout">{this.getUsername()}</div>}>
               <Menu>
-                <Menu.Item onClick={this.logout}>登出</Menu.Item>
+                <Menu.Item onClick={this.logout}>{locale.logout}</Menu.Item>
               </Menu>
             </Dropdown>
           )}

diff --git a/console/src/main/resources/static/console-fe/src/locales/en-US.js b/console/src/main/resources/static/console-fe/src/locales/en-US.js
@@ -18,9 +18,10 @@ const I18N_CONF = {
     blog: 'BLOG',
     community: 'COMMUNITY',
     languageSwitchButton: '中',
+    logout: 'logout',
   },
   Login: {
-    pleaseLogin: 'Plase login',
+    login: 'Login',
     submit: 'Submit',
     pleaseInputUsername: 'Please input username',
     pleaseInputPassword: 'Please input password',

diff --git a/console/src/main/resources/static/console-fe/src/locales/zh-CN.js b/console/src/main/resources/static/console-fe/src/locales/zh-CN.js
@@ -18,9 +18,10 @@ const I18N_CONF = {
     blog: '博客',
     community: '社区',
     languageSwitchButton: 'En',
+    logout: '登出',
   },
   Login: {
-    pleaseLogin: '请登录',
+    login: '登录',
     submit: '提交',
     pleaseInputUsername: '请输入用户名',
     pleaseInputPassword: '请输入密码',

diff --git a/console/src/main/resources/static/console-fe/src/pages/Login/Login.jsx b/console/src/main/resources/static/console-fe/src/pages/Login/Login.jsx
@@ -11,6 +11,8 @@ const FormItem = Form.Item;
 @withRouter
 @ConfigProvider.config
 class Login extends React.Component {
+  static displayName = 'Login';
+
   handleSubmit = values => {
     const { locale = {} } = this.props;
     request({
@@ -65,7 +67,7 @@ class Login extends React.Component {
           <div className="animation animation4" />
           <div className="animation animation5" />
           <Card className="login-panel" contentHeight="auto">
-            <div className="login-header">{locale.pleaseLogin}</div>
+            <div className="login-header">{locale.login}</div>
             <Form className="login-form">
               <FormItem>
                 <Input htmlType="text" name="username" placeholder={locale.pleaseInputUsername} />

diff --git a/console/src/main/resources/static/js/main.js b/console/src/main/resources/static/js/main.js