diff --git a/Localization/app.json b/Localization/app.json index 920a8abe..9c438b56 100644 --- a/Localization/app.json +++ b/Localization/app.json @@ -109,10 +109,10 @@ "inclusion": "%s is not a supported value" }, "special": { - "username_invalid": "Username must only contain alphanumeric characters and underscores.", - "username_too_long": "Username is too long (can't be longer than 30 characters).", - "email_invalid": "This is not a valid e-mail address.", - "password_too_shrot": "Password is too short (must be at least 8 characters)." + "username_invalid": "Username must only contain alphanumeric characters and underscores", + "username_too_long": "Username is too long (can't be longer than 30 characters)", + "email_invalid": "This is not a valid e-mail address", + "password_too_short": "Password is too short (must be at least 8 characters)" } } }, diff --git a/Mastodon/Extension/MastodonSDK/Mastodon+Entity+Error+Detail.swift b/Mastodon/Extension/MastodonSDK/Mastodon+Entity+Error+Detail.swift index 1e993a8c..312e4e3f 100644 --- a/Mastodon/Extension/MastodonSDK/Mastodon+Entity+Error+Detail.swift +++ b/Mastodon/Extension/MastodonSDK/Mastodon+Entity+Error+Detail.swift @@ -63,7 +63,7 @@ extension Mastodon.Entity.Error.Detail { case (.email, .ERR_INVALID): return L10n.Scene.Register.Error.Special.emailInvalid case (.password, .ERR_TOO_SHORT): - return L10n.Scene.Register.Error.Special.passwordTooShrot + return L10n.Scene.Register.Error.Special.passwordTooShort case (_, .ERR_BLOCKED): return L10n.Scene.Register.Error.Reason.blocked(item.localized) case (_, .ERR_UNREACHABLE): return L10n.Scene.Register.Error.Reason.unreachable(item.localized) case (_, .ERR_TAKEN): return L10n.Scene.Register.Error.Reason.taken(item.localized) diff --git a/Mastodon/Generated/Strings.swift b/Mastodon/Generated/Strings.swift index c14e7ce0..75a661fa 100644 --- a/Mastodon/Generated/Strings.swift +++ b/Mastodon/Generated/Strings.swift @@ -144,55 +144,55 @@ internal enum L10n { internal static let username = L10n.tr("Localizable", "Scene.Register.Error.Item.Username") } internal enum Reason { - /// %@ must be accepted. + /// %@ must be accepted internal static func accepted(_ p1: Any) -> String { return L10n.tr("Localizable", "Scene.Register.Error.Reason.Accepted", String(describing: p1)) } - /// %@ is required. + /// %@ is required internal static func blank(_ p1: Any) -> String { return L10n.tr("Localizable", "Scene.Register.Error.Reason.Blank", String(describing: p1)) } - /// %@ contains a disallowed e-mail provider. + /// %@ contains a disallowed e-mail provider internal static func blocked(_ p1: Any) -> String { return L10n.tr("Localizable", "Scene.Register.Error.Reason.Blocked", String(describing: p1)) } - /// %@ is not a supported value. + /// %@ is not a supported value internal static func inclusion(_ p1: Any) -> String { return L10n.tr("Localizable", "Scene.Register.Error.Reason.Inclusion", String(describing: p1)) } - /// %@ is invalid. + /// %@ is invalid internal static func invalid(_ p1: Any) -> String { return L10n.tr("Localizable", "Scene.Register.Error.Reason.Invalid", String(describing: p1)) } - /// %@ is a reserved keyword. + /// %@ is a reserved keyword internal static func reserved(_ p1: Any) -> String { return L10n.tr("Localizable", "Scene.Register.Error.Reason.Reserved", String(describing: p1)) } - /// %@ is already in use. + /// %@ is already in use internal static func taken(_ p1: Any) -> String { return L10n.tr("Localizable", "Scene.Register.Error.Reason.Taken", String(describing: p1)) } - /// %@ is too long. + /// %@ is too long internal static func tooLong(_ p1: Any) -> String { return L10n.tr("Localizable", "Scene.Register.Error.Reason.TooLong", String(describing: p1)) } - /// %@ is too short. + /// %@ is too short internal static func tooShort(_ p1: Any) -> String { return L10n.tr("Localizable", "Scene.Register.Error.Reason.TooShort", String(describing: p1)) } - /// %@ does not seem to exist. + /// %@ does not seem to exist internal static func unreachable(_ p1: Any) -> String { return L10n.tr("Localizable", "Scene.Register.Error.Reason.Unreachable", String(describing: p1)) } } internal enum Special { - /// This is not a valid e-mail address. + /// This is not a valid e-mail address internal static let emailInvalid = L10n.tr("Localizable", "Scene.Register.Error.Special.EmailInvalid") - /// Password is too short (must be at least 8 characters). - internal static let passwordTooShrot = L10n.tr("Localizable", "Scene.Register.Error.Special.PasswordTooShrot") - /// Username must only contain alphanumeric characters and underscores. + /// Password is too short (must be at least 8 characters) + internal static let passwordTooShort = L10n.tr("Localizable", "Scene.Register.Error.Special.PasswordTooShort") + /// Username must only contain alphanumeric characters and underscores internal static let usernameInvalid = L10n.tr("Localizable", "Scene.Register.Error.Special.UsernameInvalid") - /// Username is too long (can't be longer than 30 characters). + /// Username is too long (can't be longer than 30 characters) internal static let usernameTooLong = L10n.tr("Localizable", "Scene.Register.Error.Special.UsernameTooLong") } } diff --git a/Mastodon/Resources/en.lproj/Localizable.strings b/Mastodon/Resources/en.lproj/Localizable.strings index acdf89f9..0ab1c70e 100644 --- a/Mastodon/Resources/en.lproj/Localizable.strings +++ b/Mastodon/Resources/en.lproj/Localizable.strings @@ -43,20 +43,20 @@ tap the link to confirm your account."; "Scene.Register.Error.Item.Password" = "Password"; "Scene.Register.Error.Item.Reason" = "Reason"; "Scene.Register.Error.Item.Username" = "Username"; -"Scene.Register.Error.Reason.Accepted" = "%@ must be accepted."; -"Scene.Register.Error.Reason.Blank" = "%@ is required."; -"Scene.Register.Error.Reason.Blocked" = "%@ contains a disallowed e-mail provider."; -"Scene.Register.Error.Reason.Inclusion" = "%@ is not a supported value."; -"Scene.Register.Error.Reason.Invalid" = "%@ is invalid."; -"Scene.Register.Error.Reason.Reserved" = "%@ is a reserved keyword."; -"Scene.Register.Error.Reason.Taken" = "%@ is already in use."; -"Scene.Register.Error.Reason.TooLong" = "%@ is too long."; -"Scene.Register.Error.Reason.TooShort" = "%@ is too short."; -"Scene.Register.Error.Reason.Unreachable" = "%@ does not seem to exist."; -"Scene.Register.Error.Special.EmailInvalid" = "This is not a valid e-mail address."; -"Scene.Register.Error.Special.PasswordTooShrot" = "Password is too short (must be at least 8 characters)."; -"Scene.Register.Error.Special.UsernameInvalid" = "Username must only contain alphanumeric characters and underscores."; -"Scene.Register.Error.Special.UsernameTooLong" = "Username is too long (can't be longer than 30 characters)."; +"Scene.Register.Error.Reason.Accepted" = "%@ must be accepted"; +"Scene.Register.Error.Reason.Blank" = "%@ is required"; +"Scene.Register.Error.Reason.Blocked" = "%@ contains a disallowed e-mail provider"; +"Scene.Register.Error.Reason.Inclusion" = "%@ is not a supported value"; +"Scene.Register.Error.Reason.Invalid" = "%@ is invalid"; +"Scene.Register.Error.Reason.Reserved" = "%@ is a reserved keyword"; +"Scene.Register.Error.Reason.Taken" = "%@ is already in use"; +"Scene.Register.Error.Reason.TooLong" = "%@ is too long"; +"Scene.Register.Error.Reason.TooShort" = "%@ is too short"; +"Scene.Register.Error.Reason.Unreachable" = "%@ does not seem to exist"; +"Scene.Register.Error.Special.EmailInvalid" = "This is not a valid e-mail address"; +"Scene.Register.Error.Special.PasswordTooShort" = "Password is too short (must be at least 8 characters)"; +"Scene.Register.Error.Special.UsernameInvalid" = "Username must only contain alphanumeric characters and underscores"; +"Scene.Register.Error.Special.UsernameTooLong" = "Username is too long (can't be longer than 30 characters)"; "Scene.Register.Input.DisplayName.Placeholder" = "display name"; "Scene.Register.Input.Email.Placeholder" = "email"; "Scene.Register.Input.Invite.RegistrationUserInviteRequest" = "Why do you want to join?";