Merge branch 'integration' into kraikrit

www/src/Locale/en_EN/default.po

@@ -8,13 +8,133 @@ msgstr ""
 "PO-Revision-Date: 2018-05-07 13:13+0700\n"
 "PO-Revision-Date: 2018-05-07 13:13+0700\n"
 "Last-Translator: \n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
-"Language: th_TH\n"
+"Language: en_EN\n"
 "MIME-Version: 1.0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.0.7\n"
 "X-Generator: Poedit 2.0.7\n"
 
 
-#: Controller/AppController.php:318
+#: Controller/ProfilesController.php/index.ctp:56
 msgid "user profile"
 msgid "user profile"
-msgstr "User Profile"
+msgstr "User profile"
\ No newline at end of file
+
+#: Controller/ProfilesController.php/index.ctp:62
+msgid "username"
+msgstr "Username"
+
+#: Controller/ProfilesController.php/index.ctp:68,69
+msgid "firstname"
+msgstr "Firstname"
+
+#: Controller/ProfilesController.php/index.ctp:75,76
+msgid "lastname"
+msgstr "lastname"
+
+#: Controller/ProfilesController.php/index.ctp:82
+msgid "birthdate"
+msgstr "Birth date"
+
+#: Controller/ProfilesController.php/index.ctp:90
+msgid "gender"
+msgstr "Gender"
+
+#: Controller/ProfilesController.php/index.ctp:103
+msgid "blood group"
+msgstr "Blood group"
+
+#: Controller/ProfilesController.php/index.ctp:122,123
+msgid "mobile"
+msgstr "Mobile"
+
+#: Controller/ProfilesController.php/index.ctp:129
+msgid "email"
+msgstr "Email"
+
+#: Controller/ProfilesController.php/index.ctp:137
+msgid "address"
+msgstr "Address"
+
+#: Controller/ProfilesController.php/index.ctp:143
+msgid "country"
+msgstr "Country"
+
+#: Controller/ProfilesController.php/index.ctp:162
+msgid "province"
+msgstr "Province"
+
+#: Controller/ProfilesController.php/index.ctp:181
+msgid "SAVE"
+msgstr "SAVE"
+
+#: Controller/ProfilesController.php/index.ctp:226
+msgid "This email is already in the system."
+msgstr "This email is already in the system."
+
+#: Controller/ProfilesController.php/index.ctp:235
+msgid "only numbers"
+msgstr "Please enter only numbers"
+
+#: Controller/ProfilesController.php/index.ctp:244
+msgid "Please enter your firstname."
+msgstr "Please enter your firstname."
+
+#: Controller/ProfilesController.php/index.ctp:249
+msgid "Please enter your lastname."
+msgstr "Please enter your lastname."
+
+#: Controller/ProfilesController.php/index.ctp:255
+msgid "Please enter your birthdate."
+msgstr "Please enter your birthdate."
+
+#: Controller/ProfilesController.php/index.ctp:261
+msgid "Please enter your mobile."
+msgstr "Please enter your mobile."
+
+#: Controller/ProfilesController.php/index.ctp:266
+msgid "Please enter a 10 digit mobile number."
+msgstr "Please enter a 10 digit mobile number."
+
+#: Controller/ProfilesController.php/index.ctp:272
+msgid "Please enter your email address."
+msgstr "Please enter your email address."
+
+#: Controller/ProfilesController.php/index.ctp:278
+msgid "Email address format wrong, Please enter the correct number."
+msgstr "Email address format wrong, Please enter the correct number."
+
+#: Controller/ProfilesController.php/index.ctp:291
+msgid "Please specify country"
+msgstr "Please select country"
+
+#: Controller/ProfilesController.php/index.ctp:296
+msgid "Please specify province"
+msgstr "Please select province"
+
+#: Controller/ProfilesController.php:119
+msgid "Update Complete."
+msgstr "Update Complete."
+
+#: Controller/ProfilesController.php:123
+msgid "Email Address already used by others."
+msgstr "Email Address already used by others."
+
+#: Controller/ProfilesController.php:125
+msgid "Not update. Please, try again."
+msgstr "Not update. Please, try again."
+
+#: Controller/UsersController.php/forgot_password.ctp:14
+msgid "Email"
+msgstr "Email"
+
+#: Controller/UsersController.php/forgot_password.ctp:34
+msgid "Please enter your email."
+msgstr "Please enter your email."
+
+#: Controller/UsersController.php/forgot_password.ctp:40
+msgid "Email address format wrong Please enter the correct."
+msgstr "Email address format wrong Please enter the correct."
+
+#: Controller/UsersController.php/forgot_password.ctp:3
+msgid "Forgot password"
+msgstr "Forgot password"
\ No newline at end of file

www/src/Template/Users/change_forgotpassword.ctp

@@ -11,7 +11,7 @@
             <div>
             <div>
                 <div class="form-group has-feedback">
                 <div class="form-group has-feedback">
                     <div class="col-md-12">
                     <div class="col-md-12">
-                        <label class="label-text-sub"><?php echo __('รหัสผ่านใหม่');?></label>
+                        <label class="label-text-sub"><?php echo __('new password');//รหัสผ่านใหม่?></label>
                         <input data-toggle="password" data-placement="before" onkeyup="check();" type="password" name="password" id="password" value=""  placeholder="********" class="form-control input-lg color-button-border border-bottom-from" style="padding:0px 0px !important;">
                         <input data-toggle="password" data-placement="before" onkeyup="check();" type="password" name="password" id="password" value=""  placeholder="********" class="form-control input-lg color-button-border border-bottom-from" style="padding:0px 0px !important;">
                     </div>
                     </div>
                 </div>
                 </div>
@@ -19,7 +19,7 @@
             <div>
             <div>
                 <div class="form-group has-feedback">
                 <div class="form-group has-feedback">
                     <div class="col-md-12">
                     <div class="col-md-12">
-                        <label class="label-text-sub"><?php echo __('ยืนยันรหัสผ่าน');?></label>
+                        <label class="label-text-sub"><?php echo __('confirm password');//ยืนยันรหัสผ่าน?></label>
                         <input data-toggle="password" data-placement="before" onkeyup="check();" type="password" name="confirm_password" id="confirm_password" value=""  placeholder="********" class="form-control input-lg color-button-border border-bottom-from" style="padding:0px 0px !important;">
                         <input data-toggle="password" data-placement="before" onkeyup="check();" type="password" name="confirm_password" id="confirm_password" value=""  placeholder="********" class="form-control input-lg color-button-border border-bottom-from" style="padding:0px 0px !important;">
                     </div>
                     </div>
                 </div>
                 </div>
@@ -29,8 +29,8 @@
             
             
             <div>
             <div>
                 <?php
                 <?php
-                    echo $this->Form->submit('ตรวจสอบ', array('div' => false, 'class' => 'btn btn-quaternary mr-xs mb-sm button-text',
-                    'name' => 'btn', 'id' => '', 'title' => 'Title'));
+                    echo $this->Form->submit('submit', array('div' => false, 'class' => 'btn btn-quaternary mr-xs mb-sm button-text',
+                    'name' => 'btn', 'id' => '', 'title' => 'Title'));//ตกลง
                 ?>
                 ?>
             </div>
             </div>
            
            
@@ -46,7 +46,7 @@
             var elem = document.getElementById('password').value;
             var elem = document.getElementById('password').value;
             // console.log(elem);
             // console.log(elem);
             if(!elem.match(/^([A-Za-z0-9])+$/i)){
             if(!elem.match(/^([A-Za-z0-9])+$/i)){
-                alert("กรุณาใส่ข้อมูลที่เป็นตัวอักษรภาษาอังกฤษและตัวเลขเท่านั้น");
+                alert("Please enter only English letters and numbers.");//กรุณาใส่ข้อมูลที่เป็นตัวอักษรภาษาอังกฤษและตัวเลขเท่านั้น
                 return false;
                 return false;
             }
             }
         })
         })
@@ -55,7 +55,7 @@
             var elem = document.getElementById('confirm_password').value;
             var elem = document.getElementById('confirm_password').value;
             // console.log(elem);
             // console.log(elem);
             if(!elem.match(/^([A-Za-z0-9])+$/i)){
             if(!elem.match(/^([A-Za-z0-9])+$/i)){
-                alert("กรุณาใส่ข้อมูลที่เป็นตัวอักษรภาษาอังกฤษและตัวเลขเท่านั้น");
+                alert("Please enter only English letters and numbers.");//กรุณาใส่ข้อมูลที่เป็นตัวอักษรภาษาอังกฤษและตัวเลขเท่านั้น
                 return false;
                 return false;
             }
             }
         })
         })
@@ -64,26 +64,26 @@
 
 
         var password = document.forms["changePressword"]["password"].value;
         var password = document.forms["changePressword"]["password"].value;
         if (password == null || password == "") {
         if (password == null || password == "") {
-            alert("กรุณากรอก รหัสผ่านใหม่");
+            alert("Please enter a new password.");//กรุณากรอก รหัสผ่านใหม่
             return false;
             return false;
         }
         }
             if(document.forms["changePressword"]["password"].value.length < 8)
             if(document.forms["changePressword"]["password"].value.length < 8)
                 {
                 {
-                       alert('กรุณาระบุรหัสผ่านใหม่อย่างน้อย 8 ตัวอักษร');
+                       alert('Please enter a new password at least 8 characters.');//กรุณาระบุรหัสผ่านใหม่อย่างน้อย 8 ตัวอักษร
                        return false;
                        return false;
                 }
                 }
         var confirm_password = document.forms["changePressword"][["confirm_password"]].value;
         var confirm_password = document.forms["changePressword"][["confirm_password"]].value;
         if (confirm_password == null || confirm_password == "") {
         if (confirm_password == null || confirm_password == "") {
-            alert("กรุณากรอก ยืนยันรหัสผ่าน");
+            alert("Please enter your password.");//กรุณากรอก ยืนยันรหัสผ่าน
             return false;
             return false;
         }
         }
             if(document.forms["changePressword"]["confirm_password"].value.length < 8)
             if(document.forms["changePressword"]["confirm_password"].value.length < 8)
                 {
                 {
-                       alert('กรุณาระบุยืนยันรหัสผ่านอย่างน้อย 8 ตัวอักษร');
+                       alert('Please enter at least 8 characters.');//กรุณาระบุยืนยันรหัสผ่านอย่างน้อย 8 ตัวอักษร
                        return false;
                        return false;
                 }
                 }
             if(document.forms["changePressword"]["password"].value != document.forms["changePressword"]["confirm_password"].value){
             if(document.forms["changePressword"]["password"].value != document.forms["changePressword"]["confirm_password"].value){
-                alert('กรุณาระบุรหัสผ่านให้ตรงกัน');
+                alert('Please provide the same password.');//กรุณาระบุรหัสผ่านให้ตรงกัน
                 //document.createAccount.confirm_password.focus();     
                 //document.createAccount.confirm_password.focus();     
                 return false;
                 return false;
             }
             }

www/src/Template/Users/forgot_password.ctp

 <div class="row">
 <div class="row">
     <div class="center">
     <div class="center">
-        <div class="title_header"><a href="javascript:history.go(-1)"><?php echo $this->Html->image('/img/core/img/back-icon@3x.png', ['style' => 'float: left;padding-left: 15px;padding-top: 5px;']); ?></a><?php echo __('ลืมรหัสผ่าน');?></div>
+        <div class="title_header"><a href="javascript:history.go(-1)"><?php echo $this->Html->image('/img/core/img/back-icon@3x.png', ['style' => 'float: left;padding-left: 15px;padding-top: 5px;']); ?></a><?php echo __('Forgot password');//ลืมรหัสผ่าน?></div>
     </div>
     </div>
     <div class="col-md-12">
     <div class="col-md-12">
 
 
@@ -11,7 +11,7 @@
             <div>
             <div>
                 <div class="form-group has-feedback">
                 <div class="form-group has-feedback">
                     <div class="col-md-12">
                     <div class="col-md-12">
-                        <label class="label-text-sub"><?php echo __('อีเมล');?><em>* </em></label>
+                        <label class="label-text-sub"><?php echo __('Email');//อีเมล?><em>* </em></label>
                         <input type="text" value="" name="email" placeholder="mail@xxx.com" class="form-control-reg border-bottom-from" id="fremail">
                         <input type="text" value="" name="email" placeholder="mail@xxx.com" class="form-control-reg border-bottom-from" id="fremail">
                     </div>
                     </div>
                 </div>
                 </div>
@@ -31,13 +31,13 @@
     function validateForm() {
     function validateForm() {
         var email = document.forms["forgotPressword"]["email"].value;
         var email = document.forms["forgotPressword"]["email"].value;
         if (email == null || email == "") {
         if (email == null || email == "") {
-            alert("กรุณากรอกอีเมลล์");
+            alert("Please enter your email.");//กรุณากรอกอีเมลล์
             return false;
             return false;
         }
         }
             // Validate Email
             // Validate Email
             var email = $("#fremail").val();
             var email = $("#fremail").val();
             if ((/(.+)@(.+){2,}\.(.+){2,}/.test(email)) || email=="" || email==null) { } else {
             if ((/(.+)@(.+){2,}\.(.+){2,}/.test(email)) || email=="" || email==null) { } else {
-                alert("รูปแบบที่อยู่อีเมลล์ผิด กรุณากรอกให้ถูกต้อง");
+                alert("Email address format wrong Please enter the correct.");//รูปแบบที่อยู่อีเมลล์ผิด กรุณากรอกให้ถูกต้อง
                 return false;
                 return false;
             }
             }
     }
     }

www/src/Template/Users/pin_codepassword.ctp

 <div>
 <div>
     <div class=" row center">
     <div class=" row center">
-        <div class="title_header"><?php echo __('ยืนยันตัวตนด้วยรหัส PIN');?></div>
+        <div class="title_header"><?php echo __('Verify PIN');//ยืนยันตัวตนด้วยรหัส PIN?></div>
     </div>
     </div>
     <div style="padding-top: 20px;"></div>
     <div style="padding-top: 20px;"></div>
 
 
@@ -15,7 +15,7 @@
             <div class="form-group has-feedback">
             <div class="form-group has-feedback">
                 <div class="col-md-12">
                 <div class="col-md-12">
                     <div class=" row center">
                     <div class=" row center">
-                    <?php echo __('รหัส PIN 4 หลัก ในอีเมลล์ที่ระบุเพื่อเข้าใช้งาน');?>
+                    <?php echo __('4 digit PIN in the email address specified for access');//รหัส PIN 4 หลัก ในอีเมลล์ที่ระบุเพื่อเข้าใช้งาน?>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
@@ -37,7 +37,7 @@
                 <div class="col-md-12">
                 <div class="col-md-12">
                     <div class=" row center">
                     <div class=" row center">
                         <?php
                         <?php
-                            echo $this->Html->link('ส่ง pin ใหม่อีกครั้ง', ['controller' => 'Users', 'action' => 'forgotsendpin/'.$token]);
+                            echo $this->Html->link('Re-send pin code', ['controller' => 'Users', 'action' => 'forgotsendpin/'.$token]);//ส่ง pin ใหม่อีกครั้ง
                         ?>
                         ?>
                     </div>
                     </div>
                 </div>
                 </div>