carlos 10 сар өмнө
parent
commit
13ac86bef3

+ 1 - 1
app/src/main/java/com/sikey/veryfit/ui/fragment/signup/RegisterPhoneFragment.kt

@@ -62,7 +62,7 @@ class RegisterPhoneFragment : Fragment(), OnPageChangeListener {
             val pn = phoneNumET!!.text.toString()
             val pn2 = phoneNumET2!!.text.toString()
             if (pn.isEmpty() || pn2.isEmpty() || pn != pn2 || countryCode != countryCode2) {
-                ToastUtils.showShortToast("Phone number not match")
+                ToastUtils.showShortToast(R.string.phone_number_not_match)
             } else {
                 (activity as SignupActivity).countryCode = countryCode
                 (activity as SignupActivity).phoneNumText = pn

+ 1 - 1
app/src/main/java/com/sikey/veryfit/ui/fragment/signup/SignupFragment.kt

@@ -66,7 +66,7 @@ class SignupFragment : Fragment(), OnPageChangeListener {
             }
 
             if (verifyET?.text.toString().uppercase() != code) {
-                ToastUtils.showShortToast("Wrong verification code")
+                ToastUtils.showShortToast(R.string.wrong_verification_code)
                 refreshCode()
                 return@setOnClickListener
             }

+ 6 - 0
app/src/main/res/values-de/strings.xml

@@ -715,6 +715,8 @@
     <string name="dinner">Abendessen</string>
     <string name="push_title_new_contact">Neuer Kontakt</string>
     <string name="push_content_low_power">%s Gerät hat weniger als %d%% Batterie, laden Sie es bitte rechtzeitig auf, um die Verwendung zu vermeiden.</string>
+    <string name="email_format_error">Fehler im E-Mail-Format</string>
+    <string name="email_match_error">Inkonsistenz von E-Mails</string>
     <string name="confirm_email">Bitte bestätige deine Email</string>
 
     <string name="video_status_init">Anruf</string>
@@ -738,4 +740,8 @@
     <string name="delete_alarm">Erinnerung löschen</string>
     <string name="tip_overlay_permission">Anzeige über andere Apps nicht zulassen</string>
     <string name="no_overlay_permission">Bitte erlauben Sie Anzeige über andere Apps</string>
+    <string name="call_name_verify_error">Mein Name sollte 2-10 Zeichen sein</string>
+    <string name="email">E-Mail</string>
+    <string name="wrong_verification_code">Falscher Verifizierungscode</string>
+    <string name="phone_number_not_match">Telefonnummer stimmt nicht überein</string>
 </resources>

+ 6 - 0
app/src/main/res/values-es/strings.xml

@@ -716,6 +716,8 @@
     <string name="push_title_new_contact">Nuevos contactos</string>
     <string name="push_content_low_power">La batería del dispositivo de %s es inferior al %d%%. por favor, cargue a tiempo para no afectar el uso.</string>
     <string name="push_content_fence_out">El bebé %1$s sale de la zona de Seguridad en %2$s:%3$s</string>
+    <string name="email_format_error">Formato de correo electrónico incorrecto</string>
+    <string name="email_match_error">Correo electrónico inconsistente</string>
     <string name="confirm_email">Bonvolu konfirmi vian retpoŝton</string>
 
     <string name="video_status_init">Llamando</string>
@@ -739,4 +741,8 @@
     <string name="delete_alarm">Eliminar la alarma</string>
     <string name="tip_overlay_permission">No se permite mostrar en otras aplicaciones</string>
     <string name="no_overlay_permission">Por favor, permita mostrarlo en otras aplicaciones</string>
+    <string name="call_name_verify_error">Mi nombre debería tener 2 - 10 caracteres</string>
+    <string name="email">Correo electrónico</string>
+    <string name="wrong_verification_code">Error en el Código de verificación</string>
+    <string name="phone_number_not_match">El número de teléfono no coincide</string>
 </resources>

+ 6 - 1
app/src/main/res/values-fr/strings.xml

@@ -705,10 +705,11 @@
     <string name="dinner">Dîner</string>
     <string name="push_title_new_contact">Nouveau contact</string>
     <string name="push_content_low_power">La batterie de l\'appareil pour %s est inférieure à %d%%, veuillez la charger à temps pour ne pas compromettre l\'utilisation.</string>
+    <string name="email_format_error">Erreur de format de courriel</string>
+    <string name="email_match_error">Email incohérent</string>
     <string name="confirm_email">Veuillez confirmer l\'e-mail</string>
 
     <string name="video_status_init">Appel</string>
-    <string name="video_status_ending">Sonnerie</string>
     <string name="video_status_connecting">Connexion</string>
     <string name="video_status_cancel">Appel terminé</string>
     <string name="video_status_canceled">Raccrocher</string>
@@ -728,4 +729,8 @@
     <string name="delete_alarm">Supprimer une alarme</string>
     <string name="tip_overlay_permission">Ne pas autoriser l\'affichage sur d\'autres applications</string>
     <string name="no_overlay_permission">Veuillez autoriser l\'affichage sur d\'autres applications</string>
+    <string name="call_name_verify_error">Mon nom doit contenir entre 2 et 10 caractères</string>
+    <string name="email">E - mail</string>
+    <string name="wrong_verification_code">Erreur de code de vérification</string>
+    <string name="phone_number_not_match">Les numéros de téléphone ne correspondent pas</string>
 </resources>

+ 5 - 1
app/src/main/res/values-it/strings.xml

@@ -101,7 +101,7 @@
     <string name="birthday">Compleanno</string>
     <string name="grade">Grado</string>
     <string name="nick_name_verify_error">Il nome del bambino deve contenere da 2 a 10 caratteri</string>
-    <string name="call_name_verify_error">Il mio nome dovrebbe contenere da 2 a 10 caratteri</string>
+    <string name="call_name_verify_error">Il mio nome dovrebbe essere 2-10 caratteri</string>
     <string name="stature_verify_error">L\'altezza deve essere compresa tra 10 e 180 cm</string>
     <string name="weight_verify_error">Il peso deve essere compreso tra 1 e 200 kg</string>
     <string name="class_verify_error">Il nome della classe deve contenere più di 1 carattere</string>
@@ -761,6 +761,8 @@
     <string name="dinner">Cena</string>
     <string name="push_title_new_contact">Nuovo contatto</string>
     <string name="push_content_low_power">Il dispositivo di%s ha meno di%d%% batteria, si prega di caricarlo in modo tempestivo per evitare di influenzare l\'uso.</string>
+    <string name="email_format_error">Errore di formato e-mail</string>
+    <string name="email_match_error">Inconsigenza delle email</string>
     <string name="confirm_email">Per favore, conferma la tua email</string>
 
     <string name="video_status_init">Chiamata</string>
@@ -784,4 +786,6 @@
     <string name="delete_alarm">Elimina avviso</string>
     <string name="tip_overlay_permission">Non consentire la visualizzazione su altre app</string>
     <string name="no_overlay_permission">Consenti la visualizzazione su altre app</string>
+    <string name="wrong_verification_code">Codice di verifica errato</string>
+    <string name="phone_number_not_match">Numero di telefono non corrisponde</string>
 </resources>

+ 4 - 0
app/src/main/res/values-zh-rCN/strings.xml

@@ -966,6 +966,8 @@
     <string name="tip_permission_vedio">当前没有相机和麦克风权限</string>
     <string name="tip_permission_call">当前没有通话权限</string>
 
+    <string name="call_name_verify_error">我的名字应该是2-10个字符</string>
+    <string name="email">电子邮件</string>
     <string name="remove_account">注销账号</string>
     <string name="remove_account_content">确定要注销当前账号?</string>
     <string name="remove_account_succeed">注销账号成功!</string>
@@ -1014,5 +1016,7 @@
     <string name="unbind_tips">请先解绑手表。</string>
     <string name="delete_alarm">删除闹钟</string>
     <string name="permission_rationale_location">需要访问位置服务来演示“我的位置”功能,该功能在地图上显示您的当前位置。</string>
+    <string name="wrong_verification_code">验证码错误</string>
+    <string name="phone_number_not_match">电话号码不匹配</string>
 </resources>
 

+ 4 - 0
app/src/main/res/values-zh-rHK/strings.xml

@@ -920,6 +920,8 @@
     <string name="push_content_power_on">%s的手錶已開機。</string>
     <string name="push_content_power_off">%s的手錶已關機。</string>
     <string name="scan_error_title">掃碼失敗</string>
+    <string name="call_name_verify_error">我的名字應該是2-10個字元</string>
+    <string name="email">電子郵件</string>
     <string name="remove_account">註銷帳號</string>
     <string name="remove_account_content">確定要註銷當前帳號?</string>
     <string name="remove_account_succeed">註銷帳號成功!</string>
@@ -1007,6 +1009,8 @@
     <string name="confirm_email">請確認您的電子郵件</string>
     <string name="unbind_tips">請先解綁手錶。</string>
     <string name="permission_rationale_location">需要訪問位置服務來演示“我的位置”功能,該功能在地圖上顯示您的當前位置。</string>
+    <string name="wrong_verification_code">驗證碼錯誤</string>
+    <string name="phone_number_not_match">電話號碼不匹配</string>
 </resources>
 
 

+ 4 - 0
app/src/main/res/values-zh-rTW/strings.xml

@@ -918,6 +918,8 @@
     <string name="push_content_power_on">%s的手錶已開機。</string>
     <string name="push_content_power_off">%s的手錶已關機。</string>
     <string name="scan_error_title">掃碼失敗</string>
+    <string name="call_name_verify_error">我的名字應該是2-10個字元</string>
+    <string name="email">電子郵件</string>
     <string name="remove_account">註銷帳號</string>
     <string name="remove_account_content">確定要註銷當前帳號?</string>
     <string name="remove_account_succeed">註銷帳號成功!</string>
@@ -1005,5 +1007,7 @@
     <string name="confirm_email">請確認您的電子郵件</string>
     <string name="unbind_tips">請先解綁手錶。</string>
     <string name="permission_rationale_location">需要訪問位置服務來演示“我的位置”功能,該功能在地圖上顯示您的當前位置。</string>
+    <string name="wrong_verification_code">驗證碼錯誤</string>
+    <string name="phone_number_not_match">電話號碼不匹配</string>
 </resources>
 

+ 9 - 6
app/src/main/res/values/strings.xml

@@ -305,7 +305,7 @@
     <string name="watch_setting">Advanced Setting</string>
     <string name="watch_model_set">Power Mode</string>
     <string name="debug_info">Debug Info</string>
-    <string name="password_hint">6-16 digits combination of letter and number</string>
+    <string name="password_hint">616 digits combination of letter and number</string>
     <string name="read_rule_tip">I have read %s</string>
     <string name="salutation">Relationship to Child</string>
     <string name="tel_num">Mobile number</string>
@@ -328,8 +328,8 @@
     <string name="bind_error">Bind Failed</string>
     <string name="birthday">Birthday</string>
     <string name="grade">Grade</string>
-    <string name="nick_name_verify_error">Baby Name should be 2- 10 character</string>
-    <string name="call_name_verify_error" translatable="false">My Name should be 2- 10 character</string>
+    <string name="nick_name_verify_error">Baby Name should be 210 character</string>
+    <string name="call_name_verify_error">My Name should be 2–10 character</string>
     <string name="stature_verify_error">Height must between 10 to 180cm</string>
     <string name="weight_verify_error">Weight must between 1 to 200 kg</string>
     <string name="class_verify_error">Class name must be more than 1 character</string>
@@ -962,7 +962,7 @@
     <string name="title_temperature_c" translatable="false">°C</string>
     <string name="title_temperature_center" translatable="false">/</string>
 
-    <string name="email" translatable="false">Email</string>
+    <string name="email">Email</string>
     <string name="email_again">Re-enter Email</string>
     <string name="input_pn_again">Re-enter phone number</string>
     <string name="choseIdentiy">Choose your identiy</string>
@@ -1016,8 +1016,8 @@
     <string name="tip_call_network">The current network is not good</string>
     <string name="tip_call_timeover">No response from the other party</string>
     <string name="tip_call_failed">Video call request failed</string>
-    <string name="tip_call_islogin">Logging in, please call again later...</string>
-    <string name="tip_call_wait">Waiting for the other party to answer...</string>
+    <string name="tip_call_islogin">Logging in, please call again later</string>
+    <string name="tip_call_wait">Waiting for the other party to answer</string>
     <string name="tip_call_over_other">The other party has hung up</string>
     <string name="tip_cancelcall">The other party rejected your call request</string>
     <string name="tip_permission_vedio">No camera and microphone permissions.</string>
@@ -1070,4 +1070,7 @@
     <string name="delete_alarm">Delete Alarm</string>
     <string name="tip_overlay_permission">Not allow display over other apps</string>
     <string name="no_overlay_permission">Please allow display over other apps</string>
+
+    <string name="wrong_verification_code">Wrong verification code</string>
+    <string name="phone_number_not_match">Phone number not match</string>
 </resources>