Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev'

多言語化　ログイン画面

See merge request !90

abweb/html/login.html

@@ -59,8 +59,8 @@
         <div class="form-group mb-2">
         <div class="form-group mb-2">
             <select class="form-control" id="languageSelect">
             <select class="form-control" id="languageSelect">
                 <option value="ja">日本語</option>
                 <option value="ja">日本語</option>
-                <option value="en">英語</option>
-                <option value="ko">韓国語</option>
+                <option value="en">english</option>
+                <option value="ko">한국어</option>
             </select>
             </select>
         </div>
         </div>
         <div class="form-group mb-2">
         <div class="form-group mb-2">

abweb/js/login/login.js

@@ -46,7 +46,7 @@ LOGIN.saveLoginInfo = function () {
     I18N.changeLanguage(lang);
     I18N.changeLanguage(lang);
 
 
     var accountPath, loginId, password;
     var accountPath, loginId, password;
-    var chkRemember = document.getElementById('chkRemember').checked;
+    var chkRemember = $('#chkRemember').attr('checked');
     accountPath = $('#txtAccPath').val();
     accountPath = $('#txtAccPath').val();
     loginId = $('#txtAccId').val();
     loginId = $('#txtAccId').val();
     password = $('#txtPassword').val();
     password = $('#txtPassword').val();
@@ -58,7 +58,7 @@ LOGIN.saveLoginInfo = function () {
     ClientData.userInfo_accountPath_session(accountPath);
     ClientData.userInfo_accountPath_session(accountPath);
     ClientData.userInfo_loginId_session(loginId);
     ClientData.userInfo_loginId_session(loginId);
     ClientData.userInfo_userName(LOGIN.userInfo_userName);
     ClientData.userInfo_userName(LOGIN.userInfo_userName);
-    if (chkRemember) {
+    if (chkRemember == 'checked') {
         ClientData.userInfo_rememberLogin(true);
         ClientData.userInfo_rememberLogin(true);
     } else {
     } else {
         ClientData.userInfo_rememberLogin(false);
         ClientData.userInfo_rememberLogin(false);
@@ -164,13 +164,16 @@ LOGIN.processLogin = function () {
     var accountPath = '';
     var accountPath = '';
     var loginId = '';
     var loginId = '';
     var password = '';
     var password = '';
-    var language = I18N.getCurrentLanguage();
+    var language = '';
 
 
     loginId = $('#txtAccId').val();
     loginId = $('#txtAccId').val();
 
 
     password = $('#txtPassword').val();
     password = $('#txtPassword').val();
 
 
     accountPath = $('#txtAccPath').val();
     accountPath = $('#txtAccPath').val();
+
+    language = $('#languageSelect').val();
+
     var requireChangePassword = 0;
     var requireChangePassword = 0;
     var skipPwdDate;
     var skipPwdDate;