diff --git a/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameScreen.kt
index 98c22b7c76..2eea9f0d9f 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameScreen.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameScreen.kt
@@ -437,7 +437,6 @@ private fun AddUsernameState.ValidationError.message(): String = when (this) {
AddUsernameState.ValidationError.NOT_AVAILABLE -> stringResource(R.string.AddUsernameScreen__this_username_is_not_available)
AddUsernameState.ValidationError.DISCRIMINATOR_TOO_SHORT -> stringResource(R.string.AddUsernameScreen__enter_a_minimum_of_d_digits, UsernameUtil.MIN_DISCRIMINATOR_LENGTH)
AddUsernameState.ValidationError.DISCRIMINATOR_TOO_LONG -> stringResource(R.string.AddUsernameScreen__enter_a_maximum_of_d_digits, UsernameUtil.MAX_DISCRIMINATOR_LENGTH)
- AddUsernameState.ValidationError.DISCRIMINATOR_INVALID_CHARACTERS -> stringResource(R.string.AddUsernameScreen__numbers_can_only_contain_digits)
AddUsernameState.ValidationError.DISCRIMINATOR_CANNOT_BE_00 -> stringResource(R.string.AddUsernameScreen__this_number_cant_be_00)
AddUsernameState.ValidationError.DISCRIMINATOR_CANNOT_START_WITH_ZERO -> stringResource(R.string.AddUsernameScreen__this_number_cant_start_with_0)
AddUsernameState.ValidationError.DISCRIMINATOR_NOT_AVAILABLE -> stringResource(R.string.AddUsernameScreen__this_username_is_not_available_try_another_number)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameState.kt b/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameState.kt
index 379aa0d3b0..9eea660f36 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameState.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameState.kt
@@ -50,7 +50,6 @@ data class AddUsernameState(
DISCRIMINATOR_TOO_SHORT,
DISCRIMINATOR_TOO_LONG,
- DISCRIMINATOR_INVALID_CHARACTERS,
DISCRIMINATOR_CANNOT_BE_00,
DISCRIMINATOR_CANNOT_START_WITH_ZERO,
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameViewModel.kt
index 2fdd56295c..2f6c5ebf9a 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/addusername/AddUsernameViewModel.kt
@@ -119,19 +119,22 @@ class AddUsernameViewModel(
}
/**
- * A blank discriminator hands control back to the service, matching the behavior of clearing the field in the app's
- * username editor.
+ * Non-digits are dropped as they're typed, since a discriminator can only ever be digits. A blank discriminator hands
+ * control back to the service, matching the behavior of clearing the field in the app's username editor.
*/
private fun applyDiscriminatorChanged(state: AddUsernameState, discriminator: String, stateEmitter: (AddUsernameState) -> Unit) {
- if (discriminator == state.discriminator) {
+ val digitsOnly = discriminator.filter { it in '0'..'9' }
+ val isUserSet = digitsOnly.isNotEmpty()
+
+ if (digitsOnly == state.discriminator || (discriminator.isNotEmpty() && digitsOnly.isEmpty())) {
return
}
reserveJob?.cancel()
val updated = state.copy(
- discriminator = discriminator,
- isDiscriminatorUserSet = discriminator.isNotBlank(),
+ discriminator = digitsOnly,
+ isDiscriminatorUserSet = isUserSet,
validationError = null,
reservation = null,
isReserving = false
@@ -308,13 +311,16 @@ class AddUsernameViewModel(
}
private fun checkDiscriminator(discriminator: String): AddUsernameState.ValidationError? {
- return when (UsernameUtil.checkDiscriminator(discriminator)) {
+ return when (val reason = UsernameUtil.checkDiscriminator(discriminator)) {
null -> null
UsernameUtil.InvalidReason.TOO_SHORT -> AddUsernameState.ValidationError.DISCRIMINATOR_TOO_SHORT
UsernameUtil.InvalidReason.TOO_LONG -> AddUsernameState.ValidationError.DISCRIMINATOR_TOO_LONG
UsernameUtil.InvalidReason.INVALID_NUMBER_00 -> AddUsernameState.ValidationError.DISCRIMINATOR_CANNOT_BE_00
UsernameUtil.InvalidReason.INVALID_NUMBER_PREFIX_0 -> AddUsernameState.ValidationError.DISCRIMINATOR_CANNOT_START_WITH_ZERO
- else -> AddUsernameState.ValidationError.DISCRIMINATOR_INVALID_CHARACTERS
+ else -> {
+ Log.w(TAG, "Unexpected discriminator validation failure: $reason")
+ AddUsernameState.ValidationError.DISCRIMINATOR_NOT_AVAILABLE
+ }
}
}
}
diff --git a/feature/registration/src/main/res/values-af/strings.xml b/feature/registration/src/main/res/values-af/strings.xml
index 57f0f12c32..2adbe27e38 100644
--- a/feature/registration/src/main/res/values-af/strings.xml
+++ b/feature/registration/src/main/res/values-af/strings.xml
@@ -725,8 +725,6 @@
Ongeldige gebruikernaam, voer \'n minimum van %1$d syfers in.
Ongeldige gebruikersnaam, voer \'n maksimum van %1$d syfers in.
-
- Ongeldige gebruikersnaam, nommers mag slegs syfers bevat.
Hierdie nommer kan nie 00 wees nie. Voer \'n syfer tussen 1 en 9 in
diff --git a/feature/registration/src/main/res/values-ar/strings.xml b/feature/registration/src/main/res/values-ar/strings.xml
index f9dc264d0b..ce51112aa4 100644
--- a/feature/registration/src/main/res/values-ar/strings.xml
+++ b/feature/registration/src/main/res/values-ar/strings.xml
@@ -733,8 +733,6 @@
اسم مُستخدِم غير صحيح. أدخِل %1$d رمز (رموز) كحد أدنى.
اسم مُستخدِم غير صحيح. أدخِل %1$d رمز (رموز) كحد أقصى.
-
- اسم المُستخدِم غير صالح، يجب أن تحتوي الأرقام على خانات رقمية فقط.
لا يُمكن لهذا الرقم أن يكون 00. أدخِل رقمًا بين 1 –9
diff --git a/feature/registration/src/main/res/values-az/strings.xml b/feature/registration/src/main/res/values-az/strings.xml
index c787bcdc0e..d3fba23723 100644
--- a/feature/registration/src/main/res/values-az/strings.xml
+++ b/feature/registration/src/main/res/values-az/strings.xml
@@ -725,8 +725,6 @@
Səhv istifadəçi adı, minimum %1$d rəqəm daxil edin.
Səhv istifadəçi adı, maksimum %1$d rəqəm daxil edin.
-
- Etibarsız istifadəçi adı, yalnız rəqəmlərdən ibarət ola bilər.
Bu nömrə 00 şəklində ola bilməz. 1–9 arası bir rəqəm daxil edin
diff --git a/feature/registration/src/main/res/values-be/strings.xml b/feature/registration/src/main/res/values-be/strings.xml
index 66d44c56b3..3178d88c10 100644
--- a/feature/registration/src/main/res/values-be/strings.xml
+++ b/feature/registration/src/main/res/values-be/strings.xml
@@ -729,8 +729,6 @@
Несапраўднае імя карыстальніка, трэба ўвесці мінімум %1$d лічбаў.
Несапраўднае імя карыстальніка, трэба ўвесці максімум %1$d лічбаў.
-
- Несапраўднае імя карыстальніка, лікі могуць змяшчаць толькі лічбы.
Гэты лік не можа быць 00. Увядзіце лічбу ад 1 да 9
diff --git a/feature/registration/src/main/res/values-bg/strings.xml b/feature/registration/src/main/res/values-bg/strings.xml
index 8e1d466e6b..1184801266 100644
--- a/feature/registration/src/main/res/values-bg/strings.xml
+++ b/feature/registration/src/main/res/values-bg/strings.xml
@@ -725,8 +725,6 @@
Невалидно потребителско име, въведете най-малко %1$d цифри.
Невалидно потребителско име, въведете най-много %1$d цифри.
-
- Невалидно потребителско име, числата могат да съдържат само цифри.
Този номер не може да бъде 00. Въведете цифра между 1–9
diff --git a/feature/registration/src/main/res/values-bn/strings.xml b/feature/registration/src/main/res/values-bn/strings.xml
index d67cdcc547..f1ed78ba6f 100644
--- a/feature/registration/src/main/res/values-bn/strings.xml
+++ b/feature/registration/src/main/res/values-bn/strings.xml
@@ -725,8 +725,6 @@
অকার্যকর ব্যবহারকারীর নাম, অন্তত %1$d-টি সংখ্যা লিখুন।
অকার্যকর ব্যবহারকারীর নাম, অন্তত %1$d-টি সংখ্যা লিখুন।
-
- অকার্যকর ব্যবহারকারীর নাম, সংখ্যায় শুধুমাত্র ডিজিট থাকতে পারে।
এই সংখ্যাটি 00 হতে পারবে না। 1–9-এর মধ্যে একটি সংখ্যা লিখুন
diff --git a/feature/registration/src/main/res/values-bs/strings.xml b/feature/registration/src/main/res/values-bs/strings.xml
index 79802ff390..479d29ac14 100644
--- a/feature/registration/src/main/res/values-bs/strings.xml
+++ b/feature/registration/src/main/res/values-bs/strings.xml
@@ -729,8 +729,6 @@
Nevažeće korisničko ime, unesite najmanje %1$d cifre.
Nevažeće korisničko ime, unesite najviše %1$d cifri.
-
- Nevažeće korisničko ime, brojevi mogu sadržavati samo cifre.
Ovaj broj ne može biti 00. Unesite brojku između 1-9
diff --git a/feature/registration/src/main/res/values-ca/strings.xml b/feature/registration/src/main/res/values-ca/strings.xml
index 9d4fa87f48..77eaec3897 100644
--- a/feature/registration/src/main/res/values-ca/strings.xml
+++ b/feature/registration/src/main/res/values-ca/strings.xml
@@ -725,8 +725,6 @@
Àlies no vàlid, introdueix %1$d dígits com a mínim.
Àlies no vàlid, introdueix %1$d dígits com a màxim.
-
- Àlies no vàlid, els números només poden contenir dígits.
El número no pot ser 00. Introdueix un dígit entre 1 i 9
diff --git a/feature/registration/src/main/res/values-cs/strings.xml b/feature/registration/src/main/res/values-cs/strings.xml
index 0e3cae09e6..15aea71796 100644
--- a/feature/registration/src/main/res/values-cs/strings.xml
+++ b/feature/registration/src/main/res/values-cs/strings.xml
@@ -729,8 +729,6 @@
Neplatné uživatelské jméno – zadejte alespoň %1$d číslic.
Neplatné uživatelské jméno – zadejte nejvýše %1$d číslic.
-
- Neplatné uživatelské jméno, čísla musí obsahovat pouze číslice.
Toto číslo nesmí být 00. Zadejte číslici od 1 do 9
diff --git a/feature/registration/src/main/res/values-da/strings.xml b/feature/registration/src/main/res/values-da/strings.xml
index 52627763d2..c5d7c2b941 100644
--- a/feature/registration/src/main/res/values-da/strings.xml
+++ b/feature/registration/src/main/res/values-da/strings.xml
@@ -725,8 +725,6 @@
Ugyldigt brugernavn, angiv min. %1$d cifre.
Ugyldigt brugernavn, angiv maks. %1$d cifre.
-
- Ugyldigt brugernavn, numre kan kun indeholde cifre.
Dette nummer må ikke være 00. Angiv et tal mellem 1-9
diff --git a/feature/registration/src/main/res/values-de/strings.xml b/feature/registration/src/main/res/values-de/strings.xml
index 59cde03e25..bacccc95c1 100644
--- a/feature/registration/src/main/res/values-de/strings.xml
+++ b/feature/registration/src/main/res/values-de/strings.xml
@@ -725,8 +725,6 @@
Ungültiger Nutzername, bitte gib mindestens %1$d Ziffern ein.
Ungültiger Nutzername, bitte gib maximal %1$d Ziffern ein.
-
- Ungültiger Nutzername, Nummern dürfen nur Ziffern enthalten.
Diese Nummer darf nicht 00 sein. Verwende eine andere Zahl von 1 bis 9
diff --git a/feature/registration/src/main/res/values-el/strings.xml b/feature/registration/src/main/res/values-el/strings.xml
index c9a91e46c8..2e7ef9cdc9 100644
--- a/feature/registration/src/main/res/values-el/strings.xml
+++ b/feature/registration/src/main/res/values-el/strings.xml
@@ -725,8 +725,6 @@
Μη έγκυρο όνομα χρήστη, γράψε τουλάχιστον %1$d ψηφία.
Μη έγκυρο όνομα χρήστη, γράψε έως %1$d ψηφία.
-
- Το όνομα χρήστη δεν είναι έγκυρο, οι αριθμοί μπορούν να περιέχουν μόνο ψηφία.
Αυτός ο αριθμός δεν μπορεί να είναι 00. Γράψε ένα ψηφίο μεταξύ 1–9
diff --git a/feature/registration/src/main/res/values-es/strings.xml b/feature/registration/src/main/res/values-es/strings.xml
index d8e58a9e3b..f71a997c95 100644
--- a/feature/registration/src/main/res/values-es/strings.xml
+++ b/feature/registration/src/main/res/values-es/strings.xml
@@ -725,8 +725,6 @@
Alias no válido. Ingresa un mínimo de %1$d dígitos.
Alias no válido. Ingresa un máximo de %1$d dígitos.
-
- Alias no válido. Los números solo pueden contener dígitos.
Este número no puede ser 00. Introduce un dígito del 1 al 9.
diff --git a/feature/registration/src/main/res/values-et/strings.xml b/feature/registration/src/main/res/values-et/strings.xml
index 00b5b57db8..66eda1903a 100644
--- a/feature/registration/src/main/res/values-et/strings.xml
+++ b/feature/registration/src/main/res/values-et/strings.xml
@@ -725,8 +725,6 @@
Kehtetu kasutajanimi, sisesta vähemalt %1$d tähemärki.
Kehtetu kasutajanimi, sisesta maksimaalselt %1$d tähemärki.
-
- Vale kasutajanimi, lubatud on vaid numbrid.
See number ei saa olla 00. Sisesta number vahemikus 1–9
diff --git a/feature/registration/src/main/res/values-eu/strings.xml b/feature/registration/src/main/res/values-eu/strings.xml
index b7403b6abd..7116cacf84 100644
--- a/feature/registration/src/main/res/values-eu/strings.xml
+++ b/feature/registration/src/main/res/values-eu/strings.xml
@@ -725,8 +725,6 @@
Erabiltzaile-izenak ez du balio; idatzi gutxienez %1$d digitu.
Erabiltzaile-izenak ez du balio; idatzi gehienez %1$d digitu.
-
- Erabiltzaile-izen okerra; zenbakiek digituak bakarrik izan ditzakete.
Zenbaki hau ezin da 00 izan. Idatzi 1 eta 9 arteko digitu bat
diff --git a/feature/registration/src/main/res/values-fa/strings.xml b/feature/registration/src/main/res/values-fa/strings.xml
index bdbde31d39..34173e7ddf 100644
--- a/feature/registration/src/main/res/values-fa/strings.xml
+++ b/feature/registration/src/main/res/values-fa/strings.xml
@@ -725,8 +725,6 @@
نام کاربری نامعتبر است، حداقل %1$d رقم وارد کنید.
نام کاربری نامعتبر است، حداکثر %1$d رقم وارد کنید.
-
- نام کاربری نامعتبر است، اعداد فقط میتوانند شامل ارقام باشند.
این عدد نمیتواند ۰۰ باشد. رقمی بین ۱ تا ۹ انتخاب کنید
diff --git a/feature/registration/src/main/res/values-fi/strings.xml b/feature/registration/src/main/res/values-fi/strings.xml
index ff177364b1..87030c6165 100644
--- a/feature/registration/src/main/res/values-fi/strings.xml
+++ b/feature/registration/src/main/res/values-fi/strings.xml
@@ -725,8 +725,6 @@
Virheellinen käyttäjänimi, anna vähintään %1$d numeroa.
Virheellinen käyttäjänimi, anna vähintään %1$d numeroa.
-
- Virheellinen käyttäjänimi. Merkkijono voi sisältää vain numeroita.
Numero ei voi olla 00. Anna numero väliltä 1–9
diff --git a/feature/registration/src/main/res/values-fr/strings.xml b/feature/registration/src/main/res/values-fr/strings.xml
index 59b58a009b..0808059543 100644
--- a/feature/registration/src/main/res/values-fr/strings.xml
+++ b/feature/registration/src/main/res/values-fr/strings.xml
@@ -725,8 +725,6 @@
Nom d\'utilisateur incorrect. Veuillez saisir au moins %1$d chiffres.
Nom d\'utilisateur incorrect. Veuillez saisir %1$d chiffres maximum.
-
- Nom d\'utilisateur non valide. Vous ne pouvez saisir que des chiffres.
Ce chiffre ne peut pas être 00. Il doit être compris entre 1 et 9.
diff --git a/feature/registration/src/main/res/values-ga/strings.xml b/feature/registration/src/main/res/values-ga/strings.xml
index 43a6993e24..2170ebf86a 100644
--- a/feature/registration/src/main/res/values-ga/strings.xml
+++ b/feature/registration/src/main/res/values-ga/strings.xml
@@ -731,8 +731,6 @@
Ainm úsáideora neamhbhailí, cuir isteach íoslíon digití %1$d.
Ainm úsáideora neamhbhailí, cuir isteach uaslíon digití %1$d.
-
- Ainm úsáideora neamhbhailí, ní féidir ach digití a bheith in uimhreacha.
Ní féidir 00 a úsáid mar uimhir. Cuir isteach digit idir 1 agus 9
diff --git a/feature/registration/src/main/res/values-gl/strings.xml b/feature/registration/src/main/res/values-gl/strings.xml
index 61997b8244..9b07f83445 100644
--- a/feature/registration/src/main/res/values-gl/strings.xml
+++ b/feature/registration/src/main/res/values-gl/strings.xml
@@ -725,8 +725,6 @@
Nome de usuario non válido, insire un mínimo de %1$d díxitos.
Nome de usuario non válido, insire un máximo de %1$d díxitos.
-
- Nome de usuario non válido, os números deben conter só díxitos.
Este número non pode ser 00. Insire un número entre 1 e 9
diff --git a/feature/registration/src/main/res/values-gu/strings.xml b/feature/registration/src/main/res/values-gu/strings.xml
index d03518dcf8..7b5a03d194 100644
--- a/feature/registration/src/main/res/values-gu/strings.xml
+++ b/feature/registration/src/main/res/values-gu/strings.xml
@@ -725,8 +725,6 @@
અમાન્ય યુઝરનેમ, ઓછામાં ઓછા %1$d અંકો દાખલ કરો.
અમાન્ય યુઝરનેમ, વધુમાં વધુ %1$d અંકો દાખલ કરો.
-
- અમાન્ય યુઝરનેમ, સંખ્યામાં ફક્ત અંક જ હોવા જોઈએ.
આ નંબર 00 ન હોઈ શકે. 1-9ની વચ્ચેનો અંક દાખલ કરો
diff --git a/feature/registration/src/main/res/values-hi/strings.xml b/feature/registration/src/main/res/values-hi/strings.xml
index 52bb62d985..0dc48cd0dc 100644
--- a/feature/registration/src/main/res/values-hi/strings.xml
+++ b/feature/registration/src/main/res/values-hi/strings.xml
@@ -725,8 +725,6 @@
यूज़रनेम सही नहीं है, कम से कम %1$d डिजिट होने चाहिए।
यूज़रनेम सही नहीं है, ज़्यादा से ज़्यादा %1$d डिजिट होने चाहिए।
-
- यूज़रनेम गलत है, नंबर में सिर्फ़ अंक होने चाहिए।
यह संख्या 00 नहीं हो सकती। 1-9 के बीच का कोई डिजिट डालें
diff --git a/feature/registration/src/main/res/values-hr/strings.xml b/feature/registration/src/main/res/values-hr/strings.xml
index 903b4195f1..c755a50079 100644
--- a/feature/registration/src/main/res/values-hr/strings.xml
+++ b/feature/registration/src/main/res/values-hr/strings.xml
@@ -729,8 +729,6 @@
Korisničko ime nije valjano, unesite najmanje %1$d znamenke.
Korisničko ime nije valjano, unesite najmanje %1$d znamenki.
-
- Nevažeće korisničko ime, brojčani niz ne može sadržavati nijednu drugu vrstu znakova.
Broj ne može biti 00. Unesite znamenku od 1 do 9
diff --git a/feature/registration/src/main/res/values-hu/strings.xml b/feature/registration/src/main/res/values-hu/strings.xml
index c26eda60b4..d86a84fa93 100644
--- a/feature/registration/src/main/res/values-hu/strings.xml
+++ b/feature/registration/src/main/res/values-hu/strings.xml
@@ -725,8 +725,6 @@
Érvénytelen felhasználónév, adj meg legalább %1$d számjegyet.
Érvénytelen felhasználónév, legfeljebb %1$d számjegyet adj meg.
-
- Érvénytelen felhasználónév, a számok csak számjegyeket tartalmazhatnak.
Ez a szám nem lehet 00. Írj be egy számjegyet 1 és 9 között
diff --git a/feature/registration/src/main/res/values-in/strings.xml b/feature/registration/src/main/res/values-in/strings.xml
index 4cb9dadac8..da84aafd20 100644
--- a/feature/registration/src/main/res/values-in/strings.xml
+++ b/feature/registration/src/main/res/values-in/strings.xml
@@ -723,8 +723,6 @@
Nama pengguna tidak valid, masukkan minimal %1$d digit.
Nama pengguna tidak valid, masukkan maksimal %1$d digit.
-
- Nama pengguna tidak valid. Bagian nomor hanya boleh berisi angka.
Nomor tidak boleh 00. Masukkan angka antara 1–9
diff --git a/feature/registration/src/main/res/values-it/strings.xml b/feature/registration/src/main/res/values-it/strings.xml
index e6ca2dd006..7e2665f5c8 100644
--- a/feature/registration/src/main/res/values-it/strings.xml
+++ b/feature/registration/src/main/res/values-it/strings.xml
@@ -725,8 +725,6 @@
Nome utente non valido, inserisci almeno %1$d caratteri.
Nome utente non valido, inserisci al massimo %1$d caratteri.
-
- Nome utente non valido: i numeri possono includere solo cifre.
Questo numero non può essere 00. Inserisci una cifra tra 1-9
diff --git a/feature/registration/src/main/res/values-iw/strings.xml b/feature/registration/src/main/res/values-iw/strings.xml
index 686241251a..52368565d9 100644
--- a/feature/registration/src/main/res/values-iw/strings.xml
+++ b/feature/registration/src/main/res/values-iw/strings.xml
@@ -729,8 +729,6 @@
שם משתמש לא חוקי, יש להזין לפחות %1$d ספרות.
שם משתמש לא חוקי, יש להזין עד %1$d ספרות.
-
- שם משתמש לא חוקי, מספרים יכולים להכיל ספרות בלבד.
המספר הזה לא יכול להיות 00. יש להזין ספרה בין 9–1
diff --git a/feature/registration/src/main/res/values-ja/strings.xml b/feature/registration/src/main/res/values-ja/strings.xml
index 7c8ece50dd..e71bfff5df 100644
--- a/feature/registration/src/main/res/values-ja/strings.xml
+++ b/feature/registration/src/main/res/values-ja/strings.xml
@@ -723,8 +723,6 @@
ユーザーネームが無効です。数字は%1$d以上入力してください。
ユーザーネームが無効です。入力できる数字は、最大で%1$d桁までです。
-
- ユーザーネームが無効です。数字のみ入力できます。
この数字を00にすることはできません。1–9の数字を入力してください
diff --git a/feature/registration/src/main/res/values-ka/strings.xml b/feature/registration/src/main/res/values-ka/strings.xml
index 46e617ef82..99cc5f7d56 100644
--- a/feature/registration/src/main/res/values-ka/strings.xml
+++ b/feature/registration/src/main/res/values-ka/strings.xml
@@ -725,8 +725,6 @@
მომხმარებლის სახელი არასწორია, შეიყვანე მინიმუმ %1$d ციფრი.
მომხმარებლის სახელი არასწორია, შეიყვანე მინიმუმ %1$d ციფრი.
-
- არასწორი მომხმარებლის სახელი, რიცხვები მხოლოდ ციფრებს შეიძლება შეიცავდნენ.
ეს რიცხვი ვერ იქნება 00. შეიყვანე ციფრი 1–9-მდე
diff --git a/feature/registration/src/main/res/values-kk/strings.xml b/feature/registration/src/main/res/values-kk/strings.xml
index 07dc4ca4fd..5c66b16189 100644
--- a/feature/registration/src/main/res/values-kk/strings.xml
+++ b/feature/registration/src/main/res/values-kk/strings.xml
@@ -725,8 +725,6 @@
Пайдаланушы аты дұрыс емес, кемінде %1$d сан енгізіңіз.
Пайдаланушы аты дұрыс емес, ең көбі %1$d сан енгізіңіз.
-
- Пайдаланушы аты дұрыс емес, нөмірлерде тек цифрлар болуы керек.
Бұл нөмір 00 болмауы керек. 1 және 9 аралығындағы санды енгізіңіз
diff --git a/feature/registration/src/main/res/values-km/strings.xml b/feature/registration/src/main/res/values-km/strings.xml
index 0c95e6b8b3..0ebbfa4b6e 100644
--- a/feature/registration/src/main/res/values-km/strings.xml
+++ b/feature/registration/src/main/res/values-km/strings.xml
@@ -723,8 +723,6 @@
ឈ្មោះអ្នកប្រើមិនត្រឹមត្រូវ។ សូមបញ្ចូលលេខយ៉ាងតិចបំផុត %1$d ខ្ទង់។
ឈ្មោះអ្នកប្រើមិនត្រឹមត្រូវ។ សូមបញ្ចូលលេខយ៉ាងច្រើនបំផុត %1$d ខ្ទង់។
-
- ឈ្មោះអ្នកប្រើមិនត្រឹមត្រូវ សម្រាប់លេខអាចវាយបញ្ចូលបានតែលេខប៉ុណ្ណោះ។
លេខនេះមិនអាចជា 00 ទេ។ បញ្ចូលលេខមួយខ្ទង់ចន្លោះពី 1–9
diff --git a/feature/registration/src/main/res/values-kn/strings.xml b/feature/registration/src/main/res/values-kn/strings.xml
index 7d0f7a78c9..4d9925b374 100644
--- a/feature/registration/src/main/res/values-kn/strings.xml
+++ b/feature/registration/src/main/res/values-kn/strings.xml
@@ -725,8 +725,6 @@
ಅಮಾನ್ಯ ಯೂಸರ್ನೇಮ್, ಕನಿಷ್ಠ %1$d ಅಂಕಿಗಳನ್ನು ನಮೂದಿಸಿ.
ಅಮಾನ್ಯ ಯೂಸರ್ನೇಮ್, ಗರಿಷ್ಠ %1$d ಅಂಕಿಗಳನ್ನು ನಮೂದಿಸಿ.
-
- ಅಮಾನ್ಯ ಯೂಸರ್ನೇಮ್, ಸಂಖ್ಯೆಗಳು ಅಂಕಿಗಳನ್ನು ಮಾತ್ರ ಒಳಗೊಂಡಿರಬೇಕು.
ಈ ಸಂಖ್ಯೆ 00 ಆಗಿರುವಂತಿಲ್ಲ. 1-9 ರ ನಡುವಿನ ಅಂಕಿಯನ್ನು ನಮೂದಿಸಿ
diff --git a/feature/registration/src/main/res/values-ko/strings.xml b/feature/registration/src/main/res/values-ko/strings.xml
index a57863f8a1..b1b06dcf53 100644
--- a/feature/registration/src/main/res/values-ko/strings.xml
+++ b/feature/registration/src/main/res/values-ko/strings.xml
@@ -723,8 +723,6 @@
잘못된 사용자 이름입니다. %1$d자 이상으로 입력해 주세요.
잘못된 사용자 이름입니다. %1$d자 이하로 입력해 주세요.
-
- 잘못된 사용자 이름입니다. 숫자는 숫자(0-9)로만 입력해 주세요.
00은 일련번호로 사용할 수 없습니다. 1~9 중 하나를 입력하세요.
diff --git a/feature/registration/src/main/res/values-ky/strings.xml b/feature/registration/src/main/res/values-ky/strings.xml
index 9ab022f512..ca75be44fd 100644
--- a/feature/registration/src/main/res/values-ky/strings.xml
+++ b/feature/registration/src/main/res/values-ky/strings.xml
@@ -725,8 +725,6 @@
Колдонуучунун аты жарабайт, кеминде %1$d сан киргизиңиз.
Колдонуучунун аты жарабайт, сандар %1$d ашпашы керек.
-
- Колдонуучунун аты туура эмес, сандар сандардан гана турушу керек.
Бул номер 00 болбошу керек. 1-9 чейин сан киргизиңиз
diff --git a/feature/registration/src/main/res/values-lt/strings.xml b/feature/registration/src/main/res/values-lt/strings.xml
index e70eb9f1d4..f86849865f 100644
--- a/feature/registration/src/main/res/values-lt/strings.xml
+++ b/feature/registration/src/main/res/values-lt/strings.xml
@@ -729,8 +729,6 @@
Netinkamas naudotojo vardas, įveskite bent %1$d skaitmenis.
Netinkamas naudotojo vardas, įveskite daugiausia %1$d skaitmenų.
-
- Negaliojantis naudotojo vardas, numerius gali sudaryti tik skaičiai.
Šis skaičius negali būti 00. Įvesk skaitmenį nuo 1 iki 9
diff --git a/feature/registration/src/main/res/values-lv/strings.xml b/feature/registration/src/main/res/values-lv/strings.xml
index d3099b9e3c..6ff1c97804 100644
--- a/feature/registration/src/main/res/values-lv/strings.xml
+++ b/feature/registration/src/main/res/values-lv/strings.xml
@@ -727,8 +727,6 @@
Nederīgs lietotājvārds. Ievadiet vismaz %1$d skaitļus.
Nederīgs lietotājvārds. Ievadiet ne vairāk kā %1$d skaitļus.
-
- Nederīgs lietotājvārds, skaitliskajā daļā drīkst būt tikai cipari.
Šis numurs nedrīkst būt 00. Ievadiet ciparu no 1 līdz 9.
diff --git a/feature/registration/src/main/res/values-mk/strings.xml b/feature/registration/src/main/res/values-mk/strings.xml
index 91f3f60d57..e385fce755 100644
--- a/feature/registration/src/main/res/values-mk/strings.xml
+++ b/feature/registration/src/main/res/values-mk/strings.xml
@@ -725,8 +725,6 @@
Неважечко корисничко име, внесете најмалку %1$d знаци.
Неважечко корисничко име, внесете најмногу %1$d знаци.
-
- Неважечко корисничко име, бројките можат да бидат само цифри.
Овој број не може да биде 00. Внесете цифра од 1 до 9
diff --git a/feature/registration/src/main/res/values-ml/strings.xml b/feature/registration/src/main/res/values-ml/strings.xml
index 173c844a22..b4f57b46d9 100644
--- a/feature/registration/src/main/res/values-ml/strings.xml
+++ b/feature/registration/src/main/res/values-ml/strings.xml
@@ -725,8 +725,6 @@
ഉപയോക്തൃനാമം അസാധുവാണ്, കുറഞ്ഞത് %1$d അക്കങ്ങൾ നൽകുക.
ഉപയോക്തൃനാമം അസാധുവാണ്, പരമാവധി %1$d അക്കങ്ങൾ നൽകുക.
-
- അസാധുവായ ഉപയോക്തൃനാമം, നമ്പറുകളിൽ അക്കങ്ങൾ മാത്രമേ ഉണ്ടാകാവൂ.
ഈ സംഖ്യ 00 ആകാൻ പാടില്ല. 1-നും 9-നും ഇടയിലുള്ള ഒരു അക്കം നൽകുക
diff --git a/feature/registration/src/main/res/values-mr/strings.xml b/feature/registration/src/main/res/values-mr/strings.xml
index 8834629fe1..e983f888e9 100644
--- a/feature/registration/src/main/res/values-mr/strings.xml
+++ b/feature/registration/src/main/res/values-mr/strings.xml
@@ -725,8 +725,6 @@
अवैध वापरकर्ता नाव, कमीत कमी %1$d अंक प्रविष्ट करा.
अवैध वापरकर्ता नाव, कमाल %1$d अंक प्रविष्ट करा.
-
- अवैध वापरकर्ता नाव, संख्यांमध्ये फक्त अंक असू शकतात.
हा क्रमांक 00 असू शकत नाही. 1–9 मधील अंक प्रविष्ट करा
diff --git a/feature/registration/src/main/res/values-ms/strings.xml b/feature/registration/src/main/res/values-ms/strings.xml
index 25f8adbedb..4a31826bdd 100644
--- a/feature/registration/src/main/res/values-ms/strings.xml
+++ b/feature/registration/src/main/res/values-ms/strings.xml
@@ -723,8 +723,6 @@
Nama pengguna tidak sah, masukkan sekurang-kurangnya %1$d digit.
Nama pengguna tidak sah, masukkan maksimum %1$d digit.
-
- Nama pengguna tidak sah, nombor hanya boleh mengandungi digit.
Nombor ini tidak boleh 00. Masukkan digit antara 1–9
diff --git a/feature/registration/src/main/res/values-my/strings.xml b/feature/registration/src/main/res/values-my/strings.xml
index cbdb4aa333..eb6ff8d407 100644
--- a/feature/registration/src/main/res/values-my/strings.xml
+++ b/feature/registration/src/main/res/values-my/strings.xml
@@ -723,8 +723,6 @@
သုံးစွဲသူအမည် မမှန်ကန်ပါ၊ အနည်းဆုံး ဂဏန်း %1$d လုံး ရိုက်ထည့်ပါ။
သုံးစွဲသူအမည် မမှန်ကန်ပါ၊ အများဆုံး ဂဏန်း %1$d လုံး ရိုက်ထည့်ပါ။
-
- အသုံးပြုသူအမည် မမှန်ကန်ပါ၊ နံပါတ်များတွင် ဂဏန်းများသာ ထည့်နိုင်ပါသည်။
ဤနံပါတ်သည် 00 ဖြစ်၍မရပါ။ 1–9 ကြား ကိန်းဂဏန်းတစ်ခု ရိုက်ထည့်ပါ
diff --git a/feature/registration/src/main/res/values-nb/strings.xml b/feature/registration/src/main/res/values-nb/strings.xml
index 9cd06ba798..ca40fcfd6a 100644
--- a/feature/registration/src/main/res/values-nb/strings.xml
+++ b/feature/registration/src/main/res/values-nb/strings.xml
@@ -725,8 +725,6 @@
Ugyldig brukernavn. Angi minst %1$d tegn.
Ugyldig brukernavn. Angi maks. %1$d tegn.
-
- Ugyldig brukernavn, nummer kan kun bestå av tall.
Dette tallet kan ikke være 00. Angi et tall mellom 1 og 9.
diff --git a/feature/registration/src/main/res/values-nl/strings.xml b/feature/registration/src/main/res/values-nl/strings.xml
index 51ce44da8c..de39e33790 100644
--- a/feature/registration/src/main/res/values-nl/strings.xml
+++ b/feature/registration/src/main/res/values-nl/strings.xml
@@ -725,8 +725,6 @@
Ongeldige gebruikersnaam, voer minimaal %1$d cijfers in.
Ongeldige gebruikersnaam, voer maximaal %1$d cijfers in.
-
- Ongeldige gebruikersnaam. De cijfercombinatie kan alleen uit cijfers bestaan.
Dit nummer kan niet 00 zijn. Voer een cijfer tussen 1-9 in
diff --git a/feature/registration/src/main/res/values-pa/strings.xml b/feature/registration/src/main/res/values-pa/strings.xml
index 126f31d185..1681332d02 100644
--- a/feature/registration/src/main/res/values-pa/strings.xml
+++ b/feature/registration/src/main/res/values-pa/strings.xml
@@ -725,8 +725,6 @@
ਵਰਤੋਂਕਾਰ ਨਾਂ ਅਵੈਧ ਹੈ, ਘੱਟ ਤੋਂ ਘੱਟ %1$d ਅੰਕ ਦਰਜ ਕਰੋ।
ਵਰਤੋਂਕਾਰ ਨਾਂ ਅਵੈਧ ਹੈ, ਵੱਧ ਤੋਂ ਵੱਧ %1$d ਅੰਕ ਦਰਜ ਕਰੋ।
-
- ਵਰਤੋਂਕਾਰ ਨਾਂ ਅਵੈਧ ਹੈ, ਨੰਬਰਾਂ ਵਿੱਚ ਸਿਰਫ਼ ਅੰਕ ਹੀ ਹੋ ਸਕਦੇ ਹਨ।
ਇਹ ਨੰਬਰ 00 ਨਹੀਂ ਹੋ ਸਕਦਾ। 1–9 ਵਿਚਕਾਰ ਕੋਈ ਅੰਕ ਦਰਜ ਕਰੋ
diff --git a/feature/registration/src/main/res/values-pl/strings.xml b/feature/registration/src/main/res/values-pl/strings.xml
index 922eb9b606..cc81651897 100644
--- a/feature/registration/src/main/res/values-pl/strings.xml
+++ b/feature/registration/src/main/res/values-pl/strings.xml
@@ -729,8 +729,6 @@
Nieprawidłowa nazwa użytkownika. Podaj co najmniej %1$d cyfry.
Nieprawidłowa nazwa użytkownika. Podaj maksymalnie %1$d cyfr.
-
- Nieprawidłowa nazwa użytkownika. Numery mogą zawierać tylko cyfry.
Nie możesz wybrać cyfr 00. Podaj cyfrę od 1 do 9.
diff --git a/feature/registration/src/main/res/values-pt-rBR/strings.xml b/feature/registration/src/main/res/values-pt-rBR/strings.xml
index 8be5d5334f..9b704ee6f4 100644
--- a/feature/registration/src/main/res/values-pt-rBR/strings.xml
+++ b/feature/registration/src/main/res/values-pt-rBR/strings.xml
@@ -725,8 +725,6 @@
Nome de usuário inválido, insira no mínimo %1$d dígitos.
Nome de usuário inválido, insira no mínimo %1$d dígitos.
-
- Nome de usuário inválido. Os números podem conter apenas dígitos.
Este número não pode ser 00. Insira um dígito entre 1-9
diff --git a/feature/registration/src/main/res/values-pt/strings.xml b/feature/registration/src/main/res/values-pt/strings.xml
index aa5f565034..9607e1a2a8 100644
--- a/feature/registration/src/main/res/values-pt/strings.xml
+++ b/feature/registration/src/main/res/values-pt/strings.xml
@@ -725,8 +725,6 @@
Nome de utilizador inválido, insira um mínimo de %1$d dígitos.
Nome de utilizador inválido, insira um máximo de %1$d dígitos.
-
- Nome de utilizador inválido, os números só podem conter dígitos.
Este número não pode ser 00. Introduza um algarismo entre 1 e 9
diff --git a/feature/registration/src/main/res/values-ro/strings.xml b/feature/registration/src/main/res/values-ro/strings.xml
index d559b21bf7..0fd84aef77 100644
--- a/feature/registration/src/main/res/values-ro/strings.xml
+++ b/feature/registration/src/main/res/values-ro/strings.xml
@@ -727,8 +727,6 @@
Nume de utilizator nevalid, introdu minimum %1$d cifre.
Nume de utilizator nevalid, introdu maximum %1$d cifre.
-
- Nume de utilizator invalid, numerele pot conține doar cifre.
Acest număr nu poate fi 00. Introdu o cifră între 1–9
diff --git a/feature/registration/src/main/res/values-ru/strings.xml b/feature/registration/src/main/res/values-ru/strings.xml
index 38cac42c22..f00fc2b7f4 100644
--- a/feature/registration/src/main/res/values-ru/strings.xml
+++ b/feature/registration/src/main/res/values-ru/strings.xml
@@ -729,8 +729,6 @@
Неверное имя пользователя, введите минимум %1$d цифры.
Неверное имя пользователя, введите максимум %1$d цифр.
-
- Неверное имя пользователя, числа могут содержать только цифры.
Этот номер не может быть 00. Введите цифру от 1 до 9
diff --git a/feature/registration/src/main/res/values-sk/strings.xml b/feature/registration/src/main/res/values-sk/strings.xml
index 91fe70c6cf..eb6b7d9db9 100644
--- a/feature/registration/src/main/res/values-sk/strings.xml
+++ b/feature/registration/src/main/res/values-sk/strings.xml
@@ -729,8 +729,6 @@
Neplatné používateľské meno, zadajte minimálne %1$d číslice.
Neplatné používateľské meno, zadajte maximálne %1$d číslic.
-
- Neplatné používateľské meno, čísla môžu obsahovať iba číslice.
Toto číslo nemôže byť 00. Zadajte číslicu medzi 1–9
diff --git a/feature/registration/src/main/res/values-sl/strings.xml b/feature/registration/src/main/res/values-sl/strings.xml
index 1db8dd31f8..25218b734e 100644
--- a/feature/registration/src/main/res/values-sl/strings.xml
+++ b/feature/registration/src/main/res/values-sl/strings.xml
@@ -729,8 +729,6 @@
Neveljavno uporabniško ime, vnesite najmanj %1$d števk.
Neveljavno uporabniško ime, vnesite največ %1$d števk.
-
- Neveljavno uporabniško ime, številke lahko vsebujejo samo števke.
Ta številka ne sme biti 00. Vnesite številko med 1 in 9
diff --git a/feature/registration/src/main/res/values-sq/strings.xml b/feature/registration/src/main/res/values-sq/strings.xml
index 27a6cc4ffe..9d1d2eed84 100644
--- a/feature/registration/src/main/res/values-sq/strings.xml
+++ b/feature/registration/src/main/res/values-sq/strings.xml
@@ -725,8 +725,6 @@
Emri i pavlefshëm përdoruesi, vendos minimumi %1$d shifra.
Emri i pavlefshëm përdoruesi, vendos miksimumi %1$d shifra.
-
- Emri i përdoruesit është i pavlefshëm; numrat mund të përmbajnë vetëm shifra.
Numri nuk mund të jetë 00. Vendos një shifër nga 1-9
diff --git a/feature/registration/src/main/res/values-sr/strings.xml b/feature/registration/src/main/res/values-sr/strings.xml
index bf5730a28b..a302d78184 100644
--- a/feature/registration/src/main/res/values-sr/strings.xml
+++ b/feature/registration/src/main/res/values-sr/strings.xml
@@ -725,8 +725,6 @@
Неважеће корисничко име – унесите најмање %1$d цифре.
Неважеће корисничко име – унесите највише %1$d цифара.
-
- Неважеће корисничко име, бројеви се могу састојати само од цифара.
Овај број не може бити 00. Унесите цифру од 1 до 9
diff --git a/feature/registration/src/main/res/values-sv/strings.xml b/feature/registration/src/main/res/values-sv/strings.xml
index cbdbf6666e..351a612551 100644
--- a/feature/registration/src/main/res/values-sv/strings.xml
+++ b/feature/registration/src/main/res/values-sv/strings.xml
@@ -725,8 +725,6 @@
Ogiltigt användarnamn. Ange minst %1$d siffror.
Ogiltigt användarnamn. Ange högst %1$d siffror.
-
- Ogiltigt användarnamn – siffervärdet får bara innehålla siffror.
Det här numret kan inte vara 00. Ange en siffra mellan 1–9
diff --git a/feature/registration/src/main/res/values-sw/strings.xml b/feature/registration/src/main/res/values-sw/strings.xml
index 43e100096c..6999c2725d 100644
--- a/feature/registration/src/main/res/values-sw/strings.xml
+++ b/feature/registration/src/main/res/values-sw/strings.xml
@@ -725,8 +725,6 @@
Jina la mtumiaji lisilo sahihi, weka tarakimu zisizopungua %1$d.
Jina la mtumiaji lisilo sahihi, weka tarakimu zisizozidi %1$d.
-
- Jina la Mtumiaji si sahihi, namba zinapaswa kuwa na tarakimu tu.
Nambari hii haiwezi kuwa 00. Ingiza tarakimu kati ya 1–9
diff --git a/feature/registration/src/main/res/values-ta/strings.xml b/feature/registration/src/main/res/values-ta/strings.xml
index 6d0bb21b6b..5c46bca503 100644
--- a/feature/registration/src/main/res/values-ta/strings.xml
+++ b/feature/registration/src/main/res/values-ta/strings.xml
@@ -725,8 +725,6 @@
தவறான பயனர் பெயர், குறைந்தபட்சம் %1$d இலக்கங்களை உள்ளிடவும்.
தவறான பயனர் பெயர், அதிகபட்சம் %1$d இலக்கங்களை உள்ளிடவும்.
-
- தவறான பயனர் பெயர், எண்களில் இலக்கங்கள் மட்டுமே இருக்க வேண்டும்.
இந்த எண் 00 ஆக இருக்கக் கூடாது. 1–9 க்கு இடையேயுள்ள ஒரு எண்ணை உள்ளிடவும்
diff --git a/feature/registration/src/main/res/values-te/strings.xml b/feature/registration/src/main/res/values-te/strings.xml
index 87b13a24be..d4af6bd517 100644
--- a/feature/registration/src/main/res/values-te/strings.xml
+++ b/feature/registration/src/main/res/values-te/strings.xml
@@ -725,8 +725,6 @@
యూజర్నేమ్ చెల్లుబాటు కాదు, కనీసం %1$d అంకెలను ఎంటర్ చేయండి.
యూజర్నేమ్ చెల్లుబాటు కాదు, గరిష్టంగా %1$d అంకెలను ఎంటర్ చేయండి.
-
- చెల్లని యూజర్నేమ్, సంఖ్యల్లో అంకెలు మాత్రమే ఉండాలి.
ఈ నంబర్ 00 గా ఉండకూడదు. 1–9 మధ్య అంకెను ఎంటర్ చేయండి
diff --git a/feature/registration/src/main/res/values-th/strings.xml b/feature/registration/src/main/res/values-th/strings.xml
index 5777c11edf..f5f02017c4 100644
--- a/feature/registration/src/main/res/values-th/strings.xml
+++ b/feature/registration/src/main/res/values-th/strings.xml
@@ -723,8 +723,6 @@
ชื่อผู้ใช้ไม่ถูกต้อง ต้องกรอกตัวเลขอย่างน้อย %1$d หลัก
ชื่อผู้ใช้ไม่ถูกต้อง ต้องกรอกตัวเลขไม่เกิน %1$d หลัก
-
- รูปแบบชื่อผู้ใช้ไม่ถูกต้อง ตัวเลขต้องเป็น 0-9 เท่านั้น
ไม่สามารถใช้ตัวเลข 00 ได้ โปรดกรอกตัวเลข 1–9
diff --git a/feature/registration/src/main/res/values-tl/strings.xml b/feature/registration/src/main/res/values-tl/strings.xml
index 18344ab364..87932fea46 100644
--- a/feature/registration/src/main/res/values-tl/strings.xml
+++ b/feature/registration/src/main/res/values-tl/strings.xml
@@ -725,8 +725,6 @@
Invalid username, maglagay ng minimum na %1$d digits.
Invalid username, maglagay ng maximum na %1$d digits.
-
- Hindi valid ang username, ang numbers ay maaari lamang maglaman ng digits.
Hindi pwedeng 00 ang number na ito. Maglagay ng number mula 1–9
diff --git a/feature/registration/src/main/res/values-tr/strings.xml b/feature/registration/src/main/res/values-tr/strings.xml
index bad3217b1a..f31bf33a9d 100644
--- a/feature/registration/src/main/res/values-tr/strings.xml
+++ b/feature/registration/src/main/res/values-tr/strings.xml
@@ -725,8 +725,6 @@
Geçersiz kullanıcı adı, minimum %1$d hane gir.
Geçersiz kullanıcı adı, maksimum %1$d hane gir.
-
- Geçersiz kullanıcı adı; sayılar yalnızca rakamlardan oluşabilir.
Bu sayı 00 olamaz. 1-9 arasında bir rakam gir
diff --git a/feature/registration/src/main/res/values-ug/strings.xml b/feature/registration/src/main/res/values-ug/strings.xml
index 0f2eac372d..7b6ec9816b 100644
--- a/feature/registration/src/main/res/values-ug/strings.xml
+++ b/feature/registration/src/main/res/values-ug/strings.xml
@@ -723,8 +723,6 @@
ئىشلەتكۈچى نامى ئىناۋەتسىز، ئاز دېگەندە %1$d خانە كىرگۈزۈڭ.
ئىشلەتكۈچى نامى ئىناۋەتسىز، كۆپ دېگەندە %1$d خانە كىرگۈزۈڭ.
-
- ئىناۋەتسىز ئىشلەتكۈچى نامى، رەقەملەر پەقەت سانلاردىن تەركىب تېپىشى كېرەك.
بۇ نومۇر 00 بولسا بولمايدۇ. 1-9 ئارىسىدىكى نومۇر كىرگۈزۈڭ
diff --git a/feature/registration/src/main/res/values-uk/strings.xml b/feature/registration/src/main/res/values-uk/strings.xml
index fdf9f7f4db..7482b1b56a 100644
--- a/feature/registration/src/main/res/values-uk/strings.xml
+++ b/feature/registration/src/main/res/values-uk/strings.xml
@@ -729,8 +729,6 @@
Неналежне ім\'я користувача, введіть мінімум %1$d цифри.
Неналежне ім\'я користувача, введіть максимум %1$d цифр.
-
- Недійсне ім\'я користувача: частина з цифрами має містити лише цифри.
Ви не можете обрати цифри 00. Введіть цифру від 1 до 9
diff --git a/feature/registration/src/main/res/values-ur/strings.xml b/feature/registration/src/main/res/values-ur/strings.xml
index 186be4e608..2867efe4c1 100644
--- a/feature/registration/src/main/res/values-ur/strings.xml
+++ b/feature/registration/src/main/res/values-ur/strings.xml
@@ -725,8 +725,6 @@
غلط یوزر نیم، کم از کم %1$d ہندسے درج کریں۔
غلط یوزر نیم، زیادہ سے زیادہ %1$d ہندسے درج کریں۔
-
- یوزر نیم غلط ہے، نمبرز میں صرف ہندسے شامل ہو سکتے ہیں۔
یہ نمبر 00 نہیں ہو سکتا۔ 1–9 کے درمیان کا کوئی ہندسہ درج کریں
diff --git a/feature/registration/src/main/res/values-vi/strings.xml b/feature/registration/src/main/res/values-vi/strings.xml
index 09f5b8ae78..ae8500b53c 100644
--- a/feature/registration/src/main/res/values-vi/strings.xml
+++ b/feature/registration/src/main/res/values-vi/strings.xml
@@ -723,8 +723,6 @@
Tên người dùng không hợp lệ, nhập tối thiểu %1$d số.
Tên người dùng không hợp lệ, nhập tối đa %1$d số.
-
- Tên người dùng không hợp lệ, số chỉ có thể chứa chữ số.
Số này không thể là 00. Nhập một ký tự trong khoảng 1–9
diff --git a/feature/registration/src/main/res/values-yue/strings.xml b/feature/registration/src/main/res/values-yue/strings.xml
index 7a48d32794..e1274bb3e4 100644
--- a/feature/registration/src/main/res/values-yue/strings.xml
+++ b/feature/registration/src/main/res/values-yue/strings.xml
@@ -723,8 +723,6 @@
用戶名稱無效，請輸入至少 %1$d 位數字。
用戶名稱無效，請輸入最多 %1$d 位數字。
-
- 無效嘅用戶名稱，數字部分只可以係數字字元。
呢個數字唔可以係 00。請輸入 1–9 之間嘅數字
diff --git a/feature/registration/src/main/res/values-zh-rCN/strings.xml b/feature/registration/src/main/res/values-zh-rCN/strings.xml
index 1696c19e92..b542f629ac 100644
--- a/feature/registration/src/main/res/values-zh-rCN/strings.xml
+++ b/feature/registration/src/main/res/values-zh-rCN/strings.xml
@@ -723,8 +723,6 @@
用户名无效，请至少输入 %1$d 位数。
用户名无效，请至多输入 %1$d 位数。
-
- 用户名无效，数字部分只能包含数字。
该数字不能为 00。请输入 1 – 9 之间的数字
diff --git a/feature/registration/src/main/res/values-zh-rHK/strings.xml b/feature/registration/src/main/res/values-zh-rHK/strings.xml
index 25648705a2..9d6b34b49e 100644
--- a/feature/registration/src/main/res/values-zh-rHK/strings.xml
+++ b/feature/registration/src/main/res/values-zh-rHK/strings.xml
@@ -723,8 +723,6 @@
無效的用戶名稱，輸入至少 %1$d 位數。
無效的用戶名稱，輸入最多 %1$d 位數。
-
- 無效的用戶名稱，數字部分只可包含數字字元。
此數字不能為 00。請輸入 1–9 之間的數字
diff --git a/feature/registration/src/main/res/values-zh-rTW/strings.xml b/feature/registration/src/main/res/values-zh-rTW/strings.xml
index 7e25f4979d..4f5b2c044f 100644
--- a/feature/registration/src/main/res/values-zh-rTW/strings.xml
+++ b/feature/registration/src/main/res/values-zh-rTW/strings.xml
@@ -723,8 +723,6 @@
無效的用戶名稱，輸入至少 %1$d 位數。
無效的用戶名稱，輸入最多 %1$d 位數。
-
- 無效的用戶名稱，數字部分只可包含數字字元。
此數字不能為 00。請輸入 1–9 之間的數字
diff --git a/feature/registration/src/main/res/values/strings.xml b/feature/registration/src/main/res/values/strings.xml
index 2d27ef1d83..5fe894abed 100644
--- a/feature/registration/src/main/res/values/strings.xml
+++ b/feature/registration/src/main/res/values/strings.xml
@@ -735,8 +735,6 @@
Invalid username, enter a minimum of %1$d digits.
Invalid username, enter a maximum of %1$d digits.
-
- Invalid username, numbers can only contain digits.
This number can\'t be 00. Enter a digit between 1–9
@@ -764,7 +762,7 @@
Two-factor authentication
- To continue enter the 6-digit code from your authenticator app.
+ To continue, enter the 6-digit code from your authenticator app.
Cancel
diff --git a/feature/registration/src/test/java/org/signal/registration/screens/addusername/AddUsernameViewModelTest.kt b/feature/registration/src/test/java/org/signal/registration/screens/addusername/AddUsernameViewModelTest.kt
index c3a4e048c3..ff6b7873d7 100644
--- a/feature/registration/src/test/java/org/signal/registration/screens/addusername/AddUsernameViewModelTest.kt
+++ b/feature/registration/src/test/java/org/signal/registration/screens/addusername/AddUsernameViewModelTest.kt
@@ -145,6 +145,51 @@ class AddUsernameViewModelTest {
assertThat(viewModel.state.value.reservation).isEqualTo(Username("maya.45"))
}
+ @Test
+ fun `non-digits typed into the discriminator are dropped`() = runTest(testDispatcher) {
+ coEvery { mockRepository.reserveUsername("maya") } returns RequestResult.Success(Username("maya.45"))
+ coEvery { mockRepository.reserveUsername("maya", "77") } returns RequestResult.Success(Username("maya.77"))
+
+ viewModel.onEvent(AddUsernameScreenEvents.UsernameChanged("maya"))
+ advanceUntilIdle()
+ viewModel.onEvent(AddUsernameScreenEvents.DiscriminatorChanged("7a7!"))
+ advanceUntilIdle()
+
+ assertThat(viewModel.state.value.discriminator).isEqualTo("77")
+ assertThat(viewModel.state.value.validationError).isNull()
+ assertThat(viewModel.state.value.reservation).isEqualTo(Username("maya.77"))
+ }
+
+ @Test
+ fun `typing only non-digits leaves the service-assigned discriminator alone`() = runTest(testDispatcher) {
+ coEvery { mockRepository.reserveUsername("maya") } returns RequestResult.Success(Username("maya.45"))
+
+ viewModel.onEvent(AddUsernameScreenEvents.UsernameChanged("maya"))
+ advanceUntilIdle()
+ viewModel.onEvent(AddUsernameScreenEvents.DiscriminatorChanged("abc"))
+ advanceUntilIdle()
+
+ assertThat(viewModel.state.value.discriminator).isEqualTo("45")
+ assertThat(viewModel.state.value.isDiscriminatorUserSet).isFalse()
+ assertThat(viewModel.state.value.validationError).isNull()
+ assertThat(viewModel.state.value.reservation).isEqualTo(Username("maya.45"))
+ }
+
+ @Test
+ fun `clearing a service-assigned discriminator empties the field`() = runTest(testDispatcher) {
+ coEvery { mockRepository.reserveUsername("maya") } returns RequestResult.Success(Username("maya.45"))
+
+ viewModel.onEvent(AddUsernameScreenEvents.UsernameChanged("maya"))
+ advanceUntilIdle()
+ viewModel.onEvent(AddUsernameScreenEvents.DiscriminatorChanged(""))
+ advanceUntilIdle()
+
+ assertThat(viewModel.state.value.discriminator).isEmpty()
+ assertThat(viewModel.state.value.isDiscriminatorUserSet).isFalse()
+ assertThat(viewModel.state.value.requestedDiscriminator).isNull()
+ assertThat(viewModel.state.value.validationError).isNull()
+ }
+
@Test
fun `a too-short discriminator produces a validation error`() = runTest(testDispatcher) {
coEvery { mockRepository.reserveUsername("maya") } returns RequestResult.Success(Username("maya.45"))
diff --git a/feature/registration/src/test/java/org/signal/registration/screens/totpentry/TotpEntryScreenTest.kt b/feature/registration/src/test/java/org/signal/registration/screens/totpentry/TotpEntryScreenTest.kt
index d40dc3fbbf..e7cd01dcd9 100644
--- a/feature/registration/src/test/java/org/signal/registration/screens/totpentry/TotpEntryScreenTest.kt
+++ b/feature/registration/src/test/java/org/signal/registration/screens/totpentry/TotpEntryScreenTest.kt
@@ -42,7 +42,7 @@ class TotpEntryScreenTest {
setContent(TotpEntryState())
composeTestRule.onNodeWithText("Two-factor authentication").assertIsDisplayed()
- composeTestRule.onNodeWithText("To continue enter the 6-digit code from your authenticator app.").assertIsDisplayed()
+ composeTestRule.onNodeWithText("To continue, enter the 6-digit code from your authenticator app.").assertIsDisplayed()
}
@Test