Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 15:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix #4415 - Added back section header when only PIN available.

Browse source
This commit is contained in:
Stefan Ceriu 2021-09-22 08:39:55 +03:00 committed by Stefan Ceriu
parent 1f87204123
commit 6abdcb9e93
20 changed files with 45 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
View file

@ -4,7 +4,8 @@
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
buildImplicitDependencies = "YES"
runPostActionsOnFailure = "NO">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"

3
Riot/Assets/bg.lproj/Vector.strings
View file

@ -1183,7 +1183,8 @@
"pin_protection_settings_enable_pin" = "Включи PIN код";
"pin_protection_settings_enabled_forced" = "PIN кодът е включен";
"pin_protection_settings_section_footer" = "За да нулирате PIN кода, ще трябва да влезете наново и да създадете нов.";
"pin_protection_settings_section_header_x" = "PIN и %@";
"pin_protection_settings_section_header" = "PIN";
"pin_protection_settings_section_header_with_biometrics" = "PIN и %@";
"pin_protection_mismatch_too_many_times_error_message" = "Ако не помните PIN кода си, натиснете бутона за забравен PIN код.";
"pin_protection_mismatch_error_message" = "Опитайте пак";
"pin_protection_mismatch_error_title" = "PIN кодовете не съвпадат";

3
Riot/Assets/de.lproj/Vector.strings
View file

@ -1161,7 +1161,8 @@
"pin_protection_mismatch_error_title" = "Die PINs stimmen nicht überein";
"pin_protection_mismatch_error_message" = "Bitte versuche es erneut";
"pin_protection_mismatch_too_many_times_error_message" = "Wenn du dich nicht an deine PIN erinnern kannst, drücke \"PIN vergessen\".";
"pin_protection_settings_section_header_x" = "PIN und %@";
"pin_protection_settings_section_header" = "PIN";
"pin_protection_settings_section_header_with_biometrics" = "PIN und %@";
"pin_protection_settings_section_footer" = "Um deine PIN zurückzusetzen, musst du dich erneut anmelden und eine neue erstellen.";
"pin_protection_settings_enabled_forced" = "PIN aktiviert";
"pin_protection_settings_enable_pin" = "PIN aktivieren";

3
Riot/Assets/en.lproj/Vector.strings
View file

@ -1576,7 +1576,8 @@ Tap the + to start adding people.";
"pin_protection_mismatch_error_title" = "PINs don't match";
"pin_protection_mismatch_error_message" = "Please try again";
"pin_protection_mismatch_too_many_times_error_message" = "If you can't remember your PIN, tap the forgot PIN button.";
"pin_protection_settings_section_header_x" = "PIN & %@";
"pin_protection_settings_section_header" = "PIN";
"pin_protection_settings_section_header_with_biometrics" = "PIN & %@";
"pin_protection_settings_section_footer" = "To reset your PIN, you'll need to re-login and create a new one.";
"pin_protection_settings_enabled_forced" = "PIN enabled";
"pin_protection_settings_enable_pin" = "Enable PIN";

3
Riot/Assets/eo.lproj/Vector.strings
View file

@ -632,7 +632,8 @@
"pin_protection_settings_enable_pin" = "Ŝalti personan identigan numeron";
"pin_protection_settings_enabled_forced" = "Persona identiga numero ŝaltiĝis";
"pin_protection_settings_section_footer" = "Por restarigi vian personan identigan numeron, vi devos resaluti kaj krei novan.";
"pin_protection_settings_section_header_x" = "PIN kaj %@";
"pin_protection_settings_section_header" = "PIN";
"pin_protection_settings_section_header_with_biometrics" = "PIN kaj %@";
"pin_protection_mismatch_too_many_times_error_message" = "Se vi ne memoras, tuŝetu la butonon «forgesita persona identiga numero».";
"pin_protection_mismatch_error_message" = "Bonvolu reprovi";
"pin_protection_mismatch_error_title" = "Personaj identigaj numeroj ne akordas";

3
Riot/Assets/et.lproj/Vector.strings
View file

@ -1072,7 +1072,8 @@
"major_update_information" = "Meil on hea meel teatada, et oleme muutnud nime! Sinu rakendus on uuendatud ning sa oled oma kontole sisse logitud.";
"major_update_learn_more_action" = "Lisateave";
"major_update_done_action" = "Selge lugu";
"pin_protection_settings_section_header_x" = "PIN-kood ja %@";
"pin_protection_settings_section_header" = "PIN-kood";
"pin_protection_settings_section_header_with_biometrics" = "PIN-kood ja %@";
"pin_protection_settings_section_footer" = "PIN-koodi lähtestamiseks peaksid sa uuesti sisse looma ning seadistama uue PIN-koodi.";
"pin_protection_settings_enabled_forced" = "PIN-kood on kasutusel";
"pin_protection_settings_enable_pin" = "Võta PIN-kood kasutusele";

3
Riot/Assets/fr.lproj/Vector.strings
View file

@ -1268,7 +1268,8 @@
"pin_protection_settings_enable_pin" = "Activer le code PIN";
"pin_protection_settings_enabled_forced" = "Code PIN activé";
"pin_protection_settings_section_footer" = "Pour réinitialiser votre code PIN, vous devez vous ré-authentifier et en créer un nouveau.";
"pin_protection_settings_section_header_x" = "PIN & %@";
"pin_protection_settings_section_header" = "PIN";
"pin_protection_settings_section_header_with_biometrics" = "PIN & %@";
"pin_protection_mismatch_too_many_times_error_message" = "Si vous avez oublié votre code PIN, appuyez sur le bouton « PIN oublié ».";
"pin_protection_mismatch_error_message" = "Essayez à nouveau";
"pin_protection_mismatch_error_title" = "Les codes PIN ne correspondent pas";

3
Riot/Assets/hu.lproj/Vector.strings
View file

@ -1187,7 +1187,8 @@
"pin_protection_settings_section_footer" = "A PIN újbóli beállításához újra be kell lépjél és létre kell hozni egy újat.";
"pin_protection_settings_enabled_forced" = "PIN engedélyezve";
"pin_protection_settings_enable_pin" = "PIN engedélyezése";
"pin_protection_settings_section_header_x" = "PIN & %@";
"pin_protection_settings_section_header" = "PIN";
"pin_protection_settings_section_header_with_biometrics" = "PIN & %@";
"biometrics_mode_touch_id" = "Érintéses azonosítás";
"biometrics_mode_face_id" = "Arc felismerés";
"biometrics_settings_enable_x" = "%@ engedélyezése";

3
Riot/Assets/it.lproj/Vector.strings
View file

@ -1155,7 +1155,8 @@
"pin_protection_mismatch_error_title" = "I PIN non corrispondono";
"pin_protection_mismatch_error_message" = "Riprova";
"pin_protection_mismatch_too_many_times_error_message" = "Se non riesci a ricordare il PIN, premi il tasto \"PIN dimenticato\".";
"pin_protection_settings_section_header_x" = "PIN e %@";
"pin_protection_settings_section_header" = "PIN";
"pin_protection_settings_section_header_with_biometrics" = "PIN e %@";
"pin_protection_settings_section_footer" = "Per reimpostare il PIN, dovrai riaccedere e crearne uno nuovo.";
"pin_protection_settings_enabled_forced" = "PIN attivato";
"pin_protection_settings_enable_pin" = "Attiva PIN";

3
Riot/Assets/kab.lproj/Vector.strings
View file

@ -812,7 +812,8 @@
"biometrics_mode_touch_id" = "Asulay n tnalit";
"pin_protection_settings_enabled_forced" = "Yermed PIN";
"pin_protection_settings_section_header_x" = "PIN & %@";
"pin_protection_settings_section_header" = "PIN";
"pin_protection_settings_section_header_with_biometrics" = "PIN & %@";
"pin_protection_mismatch_too_many_times_error_message" = "Ma yella ur tezmireḍ ara ad tecfuḍ ɣef PIN inek·inem, sit ɣef tqeffalt n PIN yettwattun.";
"pin_protection_mismatch_error_title" = "PINs ur mṣadan ara";
"pin_protection_reset_alert_message" = "I uwennez n PIN-inek·inem, tesriḍ ad talseḍ anekcum syen rnu yiwen";

3
Riot/Assets/nb-NO.lproj/Vector.strings
View file

@ -1336,7 +1336,8 @@
// MARK: - Major update
"major_update_title" = "Riot er nå Element";
"pin_protection_settings_section_header_x" = "PIN-kode og %@";
"pin_protection_settings_section_header" = "PIN-kode";
"pin_protection_settings_section_header_with_biometrics" = "PIN-kode og %@";
"pin_protection_mismatch_too_many_times_error_message" = "Hvis du ikke kan huske PIN-koden din, trykker du på glemt PIN-knappen.";
"pin_protection_mismatch_error_title" = "PIN-koder samsvarer ikke";
"pin_protection_reset_alert_message" = "For å tilbakestille PIN-koden din, må du logge på igjen og opprette en ny";

3
Riot/Assets/nl.lproj/Vector.strings
View file

@ -981,7 +981,8 @@
"pin_protection_settings_enable_pin" = "PIN inschakelen";
"pin_protection_settings_enabled_forced" = "PIN ingeschakeld";
"pin_protection_settings_section_footer" = "Om uw PIN opnieuw in te stellen moet u straks opnieuw inloggen en een nieuwe PIN aanmaken.";
"pin_protection_settings_section_header_x" = "PIN en %@";
"pin_protection_settings_section_header" = "PIN";
"pin_protection_settings_section_header_with_biometrics" = "PIN en %@";
"pin_protection_mismatch_too_many_times_error_message" = "Als u uw PIN bent vergeten, klik op de PIN vergeten-knop.";
"pin_protection_mismatch_error_message" = "Probeer het opnieuw";
"pin_protection_mismatch_error_title" = "PIN's zijn niet hetzelfde";

3
Riot/Assets/pl.lproj/Vector.strings
View file

@ -976,7 +976,8 @@
"pin_protection_settings_enable_pin" = "Włącz PIN";
"pin_protection_settings_enabled_forced" = "Blokada PIN włączona";
"pin_protection_settings_section_footer" = "Aby zresetować PIN wyloguj się i zaloguj ponownie.";
"pin_protection_settings_section_header_x" = "PIN & %@";
"pin_protection_settings_section_header" = "PIN";
"pin_protection_settings_section_header_with_biometrics" = "PIN & %@";
"pin_protection_mismatch_too_many_times_error_message" = "Jeżeli nie pamiętasz PINu, naciśnij Zapomniałem(-am) PIN.";
"pin_protection_mismatch_error_message" = "Proszę, spróbuj ponownie";
"pin_protection_mismatch_error_title" = "PINy się nie zgadzają";

3
Riot/Assets/pt_BR.lproj/Vector.strings
View file

@ -1146,7 +1146,8 @@
"pin_protection_mismatch_error_title" = "PINs não correspondem";
"pin_protection_mismatch_error_message" = "Por favor tente de novo";
"pin_protection_mismatch_too_many_times_error_message" = "Se você não consegue se lembrar de seu PIN, toque no botão esqueci PIN.";
"pin_protection_settings_section_header_x" = "PIN & %@";
"pin_protection_settings_section_header" = "PIN";
"pin_protection_settings_section_header_with_biometrics" = "PIN & %@";
"pin_protection_settings_section_footer" = "Para resettar seu PIN, você vai precisar re-fazer login e criar um novo.";
"biometrics_mode_touch_id" = "Touch ID";
"biometrics_mode_face_id" = "Face ID";

3
Riot/Assets/ru.lproj/Vector.strings
View file

@ -1165,7 +1165,8 @@
"pin_protection_mismatch_error_title" = "PIN-коды не совпадают";
"pin_protection_mismatch_error_message" = "Пожалуйста, попробуйте еще раз";
"pin_protection_mismatch_too_many_times_error_message" = "Если вы не можете вспомнить свой PIN-код, нажмите кнопку забытого PIN-кода.";
"pin_protection_settings_section_header_x" = "PIN-код и %@";
"pin_protection_settings_section_header" = "PIN-код";
"pin_protection_settings_section_header_with_biometrics" = "PIN-код и %@";
"pin_protection_settings_section_footer" = "Чтобы сбросить свой PIN-код, вам нужно будет повторно войти в аккаунт и создать новый PIN-код.";
"pin_protection_settings_enabled_forced" = "PIN-код включён";
"pin_protection_settings_enable_pin" = "Включить PIN-код";

3
Riot/Assets/sq.lproj/Vector.strings
View file

@ -1169,7 +1169,8 @@
"pin_protection_mismatch_error_title" = "PIN-et s’përputhen";
"pin_protection_mismatch_error_message" = "Ju lutemi, riprovoni";
"pin_protection_mismatch_too_many_times_error_message" = "Nëse s’mbani mend PIN-in tuaj, prekni butonin “Harrova PIN-in”.";
"pin_protection_settings_section_header_x" = "PIN & %@";
"pin_protection_settings_section_header" = "PIN";
"pin_protection_settings_section_header_with_biometrics" = "PIN & %@";
"pin_protection_settings_section_footer" = "Që të ricaktoni PIN-in tuaj, do t’ju duhet të ribëni hyrjen dhe të krijoni një të ri.";
"pin_protection_settings_enabled_forced" = "PIN i aktivizuar";
"pin_protection_settings_enable_pin" = "Aktivizo PIN-in";

3
Riot/Assets/sv.lproj/Vector.strings
View file

@ -1120,7 +1120,8 @@
"pin_protection_mismatch_error_title" = "PIN-koderna matchar inte";
"pin_protection_mismatch_error_message" = "Vänligen försök igen";
"pin_protection_mismatch_too_many_times_error_message" = "Om du inte kommer ihåg din PIN-kod, tryck på knappen \"Glömt PIN-kod\".";
"pin_protection_settings_section_header_x" = "PIN & %@";
"pin_protection_settings_section_header" = "PIN";
"pin_protection_settings_section_header_with_biometrics" = "PIN & %@";
"pin_protection_settings_section_footer" = "För att återställa din PIN-kod så behöver du logga in igen och skapa en ny.";
"pin_protection_settings_enabled_forced" = "PIN-kod aktiverad";
"pin_protection_settings_enable_pin" = "Aktivera PIN-kod";

3
Riot/Assets/zh_Hans.lproj/Vector.strings
View file

@ -1278,7 +1278,8 @@
"pin_protection_settings_enable_pin" = "启用 PIN";
"pin_protection_settings_enabled_forced" = "PIN 已启用";
"pin_protection_settings_section_footer" = "要重置你的密码，你需要重新登录并创建一个新的。";
"pin_protection_settings_section_header_x" = "PIN & %@";
"pin_protection_settings_section_header" = "PIN";
"pin_protection_settings_section_header_with_biometrics" = "PIN & %@";
"pin_protection_mismatch_too_many_times_error_message" = "如果你没记不住你的 PIN，点击忘记密码按钮。";
"pin_protection_mismatch_error_title" = "PIN 不匹配";
"pin_protection_reset_alert_message" = "为重置你的 PIN，你将需要重新登录并创建新的";

8
Riot/Generated/Strings.swift
View file

@ -2298,9 +2298,13 @@ internal enum VectorL10n {
internal static var pinProtectionSettingsSectionFooter: String {
return VectorL10n.tr("Vector", "pin_protection_settings_section_footer")
}
/// PIN
internal static var pinProtectionSettingsSectionHeader: String {
return VectorL10n.tr("Vector", "pin_protection_settings_section_header")
}
/// PIN & %@
internal static func pinProtectionSettingsSectionHeaderX(_ p1: String) -> String {
return VectorL10n.tr("Vector", "pin_protection_settings_section_header_x", p1)
internal static func pinProtectionSettingsSectionHeaderWithBiometrics(_ p1: String) -> String {
return VectorL10n.tr("Vector", "pin_protection_settings_section_header_with_biometrics", p1)
}
/// Preview
internal static var preview: String {

4
Riot/Modules/Settings/Security/SecurityViewController.m
View file

@ -294,9 +294,11 @@ TableViewSectionsDelegate>
// Header title
if ([PinCodePreferences shared].isBiometricsAvailable)
{
NSString *pinCodeSectionHeaderTitleFormat = NSLocalizedStringFromTable(@"pin_protection_settings_section_header_x", @"Vector", nil);
NSString *pinCodeSectionHeaderTitleFormat = NSLocalizedStringFromTable(@"pin_protection_settings_section_header_with_biometrics", @"Vector", nil);
NSString *pinCodeSectionHeaderTitle = [NSString stringWithFormat:pinCodeSectionHeaderTitleFormat, [PinCodePreferences shared].localizedBiometricsName];
pinCodeSection.headerTitle = pinCodeSectionHeaderTitle;
} else {
pinCodeSection.headerTitle = NSLocalizedStringFromTable(@"pin_protection_settings_section_header", @"Vector", nil);;
}
// Rows