Browse Source

fix i18n case

kaori 3 years ago
parent
commit
7e949c89b4

+ 2 - 2
packages/app/public/static/locales/en_US/translation.json

@@ -605,8 +605,8 @@
     }
   },
   "login": {
-    "Sign in error": "Login error",
-    "Registration successful": "Registration successful. Please wait for administrator approval.",
+    "sign_in_error": "Login error",
+    "registration_successful": "registration_successful. Please wait for administrator approval.",
     "Setup": "Setup",
     "enabled_ldap_has_configuration_problem":"LDAP is enabled but the configuration has something wrong.",
     "set_env_var_for_logs": "(Please set the environment variables <code>DEBUG=crowi:service:PassportService</code> to get the logs)"

+ 2 - 2
packages/app/public/static/locales/ja_JP/translation.json

@@ -604,8 +604,8 @@
     }
   },
   "login": {
-    "Sign in error": "ログインエラー",
-    "Registration successful": "登録が完了しました。管理者の承認をお待ちください。",
+    "sign_in_error": "ログインエラー",
+    "registration_successful": "登録が完了しました。管理者の承認をお待ちください。",
     "Setup": "セットアップ",
     "enabled_ldap_has_configuration_problem":"LDAPは有効ですが、設定に問題があります。",
     "set_env_var_for_logs": "(ログを取得するためには、環境変数 <code>DEBUG=crowi:service:PassportService</code> を設定してください。)"

+ 2 - 2
packages/app/public/static/locales/zh_CN/translation.json

@@ -609,8 +609,8 @@
     }
   },
 	"login": {
-		"Sign in error": "登录错误",
-		"Registration successful": "注册成功。请等待管理员批准",
+		"sign_in_error": "登录错误",
+		"registration_successful": "注册成功。请等待管理员批准",
 		"Setup": "安装程序",
     "enabled_ldap_has_configuration_problem":"启用了LDAP,但配置有问题。",
     "set_env_var_for_logs": "(请设置环境变量 <code>DEBUG=crowi:service:PassportService</code> 以获得日志。)"

+ 1 - 1
packages/app/src/components/CompleteUserRegistration.tsx

@@ -11,7 +11,7 @@ export const CompleteUserRegistration: FC = () => {
       <div className="row mx-0">
         <div className="col-12 mb-3 text-center">
           <p className="alert alert-success">
-            <span>{t('login.Registration successful')}</span>
+            <span>{t('login.registration_successful')}</span>
           </p>
           {/* If the transition source is "/login", use <a /> tag since the transition will not occur if next/link is used. */}
           <a href='/login'>

+ 5 - 6
packages/app/src/pages/login/error/[message].page.tsx

@@ -61,7 +61,7 @@ const LoginPage: NextPage<Props> = (props: Props) => {
 
   switch (message) {
     case 'registered':
-      errReason = t('login.Registration successful');
+      errReason = t('login.registration_successful');
       reasonMessage = 'Wait for approved by administrators.';
       break;
     case 'password-reset-order':
@@ -71,7 +71,7 @@ const LoginPage: NextPage<Props> = (props: Props) => {
       errReason = t('forgot_password.forgot_password');
       break;
     default:
-      errReason = t('login.Sign in error');
+      errReason = t('login.sign_in_error');
   }
 
   const renderAlertMessage = () => {
@@ -80,16 +80,15 @@ const LoginPage: NextPage<Props> = (props: Props) => {
     return (
       <>
         <div className="alert alert-success">
-          {/* <h2>{ t('login.Registration successful') }</h2> */}
           <h2>{errReason}</h2>
         </div>
-        <p>{reasonMessage}</p>
+          <p>{reasonMessage}</p>
       </>
     );
 
     //  {% if reason === 'registered'%}
     // <div className="alert alert-success">
-    //   <h2>{ t('login.Registration successful') }</h2>
+    //   <h2>{ t('login.registration_successful') }</h2>
     // </div>
     // {/* {% elseif reason === 'password-reset-order' %} */}
     // <div className="alert alert-warning mb-3">
@@ -100,7 +99,7 @@ const LoginPage: NextPage<Props> = (props: Props) => {
     // </a>
     //   {/* {% else %} */}
     //   <div className="alert alert-warning">
-    //     <h2>{ t('login.Sign in error') }</h2>
+    //     <h2>{ t('login.sign_in_error') }</h2>
     //   </div>
   };
 

+ 2 - 2
packages/app/src/server/views/login/error.html

@@ -35,7 +35,7 @@
       <div class="mb-4 login-form-errors text-center">
         {% if reason === 'registered'%}
         <div class="alert alert-success">
-          <h2>{{ t('login.Registration successful') }}</h2>
+          <h2>{{ t('login.registration_successful') }}</h2>
         </div>
         {% elseif reason === 'password-reset-order' %}
         <div class="alert alert-warning mb-3">
@@ -46,7 +46,7 @@
           </a>
         {% else %}
         <div class="alert alert-warning">
-            <h2>{{ t('login.Sign in error') }}</h2>
+            <h2>{{ t('login.sign_in_error') }}</h2>
         </div>
         {% endif %}
       </div>