1
0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-31 20:11:58 +02:00

Lift restriction on user name having to be longer than 3 chars

Beurer/Sanitas driver can now handle it.
This commit is contained in:
Erik Johansson
2018-11-26 20:58:45 +01:00
parent 25ebaa0c21
commit 93ccf50cd2
25 changed files with 3 additions and 31 deletions

View File

@@ -302,12 +302,8 @@ public class UserSettingsActivity extends BaseAppCompatActivity {
{
boolean validate = true;
if (txtUserName.getText().toString().length() < 3) {
if (txtUserName.getText().toString().length() == 0) {
txtUserName.setError(getResources().getString(R.string.error_user_name_required));
} else {
txtUserName.setError(getResources().getString(R.string.error_user_name_too_short));
}
if (txtUserName.getText().toString().length() == 0) {
txtUserName.setError(getResources().getString(R.string.error_user_name_required));
validate = false;
}

View File

@@ -65,7 +65,6 @@
<string name="error_exporting">Chyba při exportu</string>
<string name="error_importing">Chyba při importu</string>
<string name="error_user_name_required">Chyba: je třeba uživatelské jméno</string>
<string name="error_user_name_too_short">Chyba: je třeba, aby uživatelské jméno bylo alespoň 3 znaky dlouhé</string>
<string name="error_height_required">Chyba: je třeba zadat výšku člověka</string>
<string name="error_initial_weight_required">Chyba: je třeba zadat počáteční hmotnost</string>
<string name="error_goal_weight_required">Chyba: je třeba zadat cílovou hmotnost</string>

View File

@@ -130,7 +130,6 @@
<string name="info_bluetooth_no_device_set">Ingen Bluetooth enhed er valgt</string>
<string name="info_new_data_duplicated">En måling med samme dato og tidspunkt findes allerede</string>
<string name="title_general">Generelt</string>
<string name="error_user_name_too_short">Fejl: navnet skal være mindst tre tegn langt</string>
<string name="label_theme">Tema</string>
<string name="label_feedback_message_enjoying">Er du tilfreds med openScale?</string>
<string name="label_feedback_message_rate_app">Vil du rate app&quot;en på Google Play eller GitHub?</string>

View File

@@ -137,8 +137,7 @@
<string name="label_feedback_message_positive">Ja klar</string>
<string name="label_feedback_message_negative">Nein danke</string>
<string name="label_feedback_message_issue">Würdest Du uns etwas Feedback geben?</string>
<string name="error_user_name_too_short">Fehler: Benutzername muss aus mind. 3 Zeichen bestehen</string>
<string name="customactivityoncrash_error_activity_error_occurred_explanation">Ein unerwarteter Fehler ist aufgetreten.
<string name="customactivityoncrash_error_activity_error_occurred_explanation">Ein unerwarteter Fehler ist aufgetreten.
\n
\n Bitte erstellen Sie ein neues Issue mit detailliertem Fehlerbericht auf
\nhttps://github.com/oliexdev/openScale/issues</string>

View File

@@ -73,7 +73,6 @@
<string name="error_exporting">Σφάλμα κατά την εξαγωγή</string>
<string name="error_importing">Σφάλμα κατά την εισαγωγή</string>
<string name="error_user_name_required">Σφάλμα: Όνομα απαραίτητο</string>
<string name="error_user_name_too_short">Σφάλμα: Το όνομα πρέπει να είναι 3 ή περισσότεροι χαρακτήρες</string>
<string name="error_height_required">Σφάλμα: Ύψος απαραίτητο</string>
<string name="error_initial_weight_required">Σφάλμα: Αρχικό βάρος απαραίτητο</string>
<string name="error_goal_weight_required">Σφάλμα: Βάρος στόχος απαραίτητο</string>

View File

@@ -155,7 +155,6 @@
<string name="label_share">Compartir</string>
<string name="error_user_name_too_short">Error: El nombre debe contener 3 o más carácteres</string>
<string name="info_bluetooth_no_device_set">"No hay dispositivo Bluetooth seleccionado "</string>
<string name="info_new_data_duplicated">Medición con al misma fecha y hora ya existe</string>

View File

@@ -147,7 +147,6 @@
<string name="label_next">Suivant</string>
<string name="title_about">À propos</string>
<string name="label_share">Partager</string>
<string name="error_user_name_too_short">Erreur : Le nom doit contenir au moins 3 caractères</string>
<string name="error_initial_weight_required">Erreur : Poids initial requis</string>
<string name="label_exportBackup">Exporter la sauvegarde</string>
<string name="label_importBackup">Importer la sauvegarde</string>

View File

@@ -69,7 +69,6 @@
<string name="error_exporting">Erro ao exportar</string>
<string name="error_importing">Erro ao importar</string>
<string name="error_user_name_required">Erro: O nome é obrigatorio</string>
<string name="error_user_name_too_short">Erro: O nome debe ter 3 ou máis caracteres</string>
<string name="error_height_required">Erro: A altura é obrigatoria</string>
<string name="error_initial_weight_required">Erro: O peso inicial é obrigatorio</string>
<string name="error_goal_weight_required">Erro: O peso obxectivo é obrigatorio</string>

View File

@@ -75,7 +75,6 @@
<string name="error_exporting">Greška u izvozu</string>
<string name="error_importing">Greška u uvozu</string>
<string name="error_user_name_required">Greška: Unesite ime</string>
<string name="error_user_name_too_short">Greška: Ime mora imati barem 3 znaka</string>
<string name="error_height_required">Greška: Unesite težinu</string>
<string name="error_initial_weight_required">Greška: Unesite početnu težinu</string>
<string name="error_goal_weight_required">Greška: Unesite ciljanu težinu</string>

View File

@@ -73,7 +73,6 @@
<string name="error_exporting">Errore durante l\'esportazione</string>
<string name="error_importing">Errore di importazione</string>
<string name="error_user_name_required">Errore: Nome obbligatorio</string>
<string name="error_user_name_too_short">Errore: Il nome deve essere almeno 3 caratteri</string>
<string name="error_height_required">Errore: Altezza necessaria</string>
<string name="error_initial_weight_required">Errore: Peso iniziale richiesto</string>
<string name="error_goal_weight_required">Errore: Obiettivo di peso richiesto</string>

View File

@@ -76,7 +76,6 @@
<string name="error_exporting">שגיאה בייצוא</string>
<string name="error_importing">שגיאה בייבוא</string>
<string name="error_user_name_required">שגיאה: נדרש שם</string>
<string name="error_user_name_too_short">שגיאה: שם חייב להיות באורך 3 תווים ומעלה</string>
<string name="error_height_required">שגיאה: נדרש גובה</string>
<string name="error_initial_weight_required">שגיאה: נדרש גובה ראשוני</string>
<string name="error_goal_weight_required">שגיאה: נדרש משקל יעד</string>

View File

@@ -109,7 +109,6 @@
<string name="label_bmr">基礎代謝率 (BMR)</string>
<string name="label_lbm">除脂肪体重</string>
<string name="label_bone">骨密度</string>
<string name="error_user_name_too_short">エラー名前は3文字以上でなければいけません</string>
<string name="info_bluetooth_no_device_set">Bluetooth端末が選択されていません</string>
<string name="info_new_data_duplicated">同じ日時のものがすでに存在している測定</string>

View File

@@ -74,7 +74,6 @@
<string name="error_exporting">Feil ved eksport</string>
<string name="error_importing">Feil ved import</string>
<string name="error_user_name_required">Feil: Brukernavn kreves</string>
<string name="error_user_name_too_short">Feil: Brukernavn må være minst tre tegn</string>
<string name="error_height_required">Feil: Høyde kreves</string>
<string name="error_initial_weight_required">Feil: Startvekt kreves</string>
<string name="error_goal_weight_required">Feil: Målvekt kreves</string>

View File

@@ -74,7 +74,6 @@
<string name="error_exporting">Fout met exporteren</string>
<string name="error_importing">Fout met importeren</string>
<string name="error_user_name_required">Fout: Naam vereist</string>
<string name="error_user_name_too_short">Fout: Naam moet 3 karakters of meer zijn</string>
<string name="error_height_required">Fout: Lichaamslengte vereist</string>
<string name="error_initial_weight_required">Fout: Startgewicht vereist</string>
<string name="error_goal_weight_required">Fout: Streefgewicht vereist</string>

View File

@@ -74,7 +74,6 @@
<string name="error_exporting">Błąd eksportu</string>
<string name="error_importing">Błąd importu</string>
<string name="error_user_name_required">Błąd: wymagana nazwa użytkownika</string>
<string name="error_user_name_too_short">Błąd: nazwa użytkownika musi mieć przynajmniej 3 znaki</string>
<string name="error_height_required">Błąd: wymagany wzrost</string>
<string name="error_initial_weight_required">Błąd: wymagana waga początkowa</string>
<string name="error_goal_weight_required">Błąd: wymagana waga docelowa</string>

View File

@@ -143,7 +143,6 @@
<string name="label_theme">Tema</string>
<string name="label_bt_device_no_support">dispositivo não suportado</string>
<string name="error_user_name_too_short">Erro: nome de usuário tem que ter 3 ou mais caracteres</string>
<string name="label_help">Ajuda</string>
<string name="label_feedback_message_enjoying">Gostou do openScale?</string>

View File

@@ -73,7 +73,6 @@
<string name="error_exporting">Eroare la export</string>
<string name="error_importing">Eroare la import</string>
<string name="error_user_name_required">Eroare: Nume necesar</string>
<string name="error_user_name_too_short">Eroare: Numele trebuie să aibă cel puțin trei caractere</string>
<string name="error_height_required">Eroare: Înălțime necesară</string>
<string name="error_initial_weight_required">Eroare: Greutatea inițială trebuie indicată</string>
<string name="error_goal_weight_required">Eroare: Greutatea dorită trebuie indicată</string>

View File

@@ -70,7 +70,6 @@
<string name="error_exporting">Ошибка при экспортировании</string>
<string name="error_importing">Ошибка при импортировании</string>
<string name="error_user_name_required">Ошибка: необходимо Имя</string>
<string name="error_user_name_too_short">Ошибка: Имя должно быть длиннее 3 символов</string>
<string name="error_height_required">Ошибка: требуется указать Рост</string>
<string name="error_initial_weight_required">Ошибка: необходимо указать начальный вес</string>
<string name="error_goal_weight_required">Ошибка: необходимо указать цель по весу</string>

View File

@@ -126,7 +126,6 @@
<string name="label_share">Zdieľať</string>
<string name="label_share_subject">openScale CSV export údajov (%s)</string>
<string name="error_user_name_too_short">Chyba: používateľské meno musí obsahovať minimálne 3 znaky</string>
<string name="info_bluetooth_no_device_set">Nevybrali ste žiadne bluetooth zariadenie</string>
<string name="info_new_data_duplicated">meranie s rovnakým dátumom a časom už existuje</string>

View File

@@ -75,7 +75,6 @@
<string name="error_exporting">Napaka pri izvozu</string>
<string name="error_importing">Napaka pri uvozu</string>
<string name="error_user_name_required">Napaka: zahtevno ime</string>
<string name="error_user_name_too_short">Napaka: Ime mora imeti vsaj 3 znake</string>
<string name="error_height_required">Napaka: Višina zahtevana</string>
<string name="error_initial_weight_required">Napaka: Začetna teža zahtevana</string>
<string name="error_goal_weight_required">Napaka: Ciljna teža zahtevana</string>

View File

@@ -130,7 +130,6 @@
<string name="info_bluetooth_no_device_set">Ingen Bluetooth-enhet vald</string>
<string name="info_new_data_duplicated">mätning med samma datum och tid existerar redan</string>
<string name="title_general">Allmänt</string>
<string name="error_user_name_too_short">Fel: namn måste vara minst 3 tecken</string>
<string name="label_theme">Tema</string>
<string name="label_feedback_message_enjoying">Uppskattar du openScale?</string>
<string name="label_feedback_message_rate_app">Vad sägs om ett betyg på Google Play eller GitHub?</string>

View File

@@ -154,7 +154,6 @@
<string name="label_add_measurement">Ölçüm ekle</string>
<string name="label_share">Paylaş</string>
<string name="error_user_name_too_short">Hata: Ad 3 karakter veya daha fazla olmalı</string>
<string name="info_bluetooth_no_device_set">Seçili Bluetooth aygıtı yok</string>
<string name="info_new_data_duplicated">Aynı tarih ve saatte ölçüm zaten var</string>

View File

@@ -72,7 +72,6 @@
<string name="error_exporting">Lỗi khi xuất</string>
<string name="error_importing">Lỗi khi nhập</string>
<string name="error_user_name_required">Lỗi: Tên là bắt buộc</string>
<string name="error_user_name_too_short">Lỗi: Tên phải ít nhất 3 kí tự</string>
<string name="error_height_required">Lỗi: Chiều cao là bắt buộc</string>
<string name="error_initial_weight_required">Lỗi: Trọng lượng ban đầu là bắt buộc</string>
<string name="error_goal_weight_required">Lỗi: Trọng lượng mục tiêu là bắt buộc</string>

View File

@@ -72,7 +72,6 @@
<string name="error_exporting">滙出出錯</string>
<string name="error_importing">滙入出錯</string>
<string name="error_user_name_required">錯誤: 必須輸入名字</string>
<string name="error_user_name_too_short">錯誤: 名字必須三個字元或以上</string>
<string name="error_height_required">錯誤: 必須輸入身高</string>
<string name="error_initial_weight_required">錯誤: 必須輸入初始體重</string>
<string name="error_goal_weight_required">錯誤: 必須輸入目標體重</string>

View File

@@ -75,7 +75,6 @@
<string name="error_exporting">Error exporting</string>
<string name="error_importing">Error importing</string>
<string name="error_user_name_required">Error: Name required</string>
<string name="error_user_name_too_short">Error: Name must be 3 characters or more</string>
<string name="error_height_required">Error: Height required</string>
<string name="error_initial_weight_required">Error: Initial weight required</string>
<string name="error_goal_weight_required">Error: Goal weight required</string>