Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix external calendar URLs validation #7887

Merged
merged 1 commit into from
Nov 19, 2024
Merged

Fix external calendar URLs validation #7887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/common/calendar/import/ImportExportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export const enum SyncStatus {
export function checkURLString(url: string): TranslationKey | URL {
const assertResult = assertValidURL(url)
if (!assertResult) return "invalidURL_msg"
if (!hasValidProtocol(assertResult, ["http:", "https:"])) return "invalidURLProtocol_msg"
if (!hasValidProtocol(assertResult, ["https:"])) return "invalidURLProtocol_msg"
return assertResult
}

Expand Down
2 changes: 1 addition & 1 deletion src/mail-app/translations/de.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ export default {
"invalidRegexSyntax_msg": "Ungültige Regex-Syntax",
"invalidRegistrationCode_msg": "Der Registrierungs-Code is ungültig.",
"invalidTimePeriod_msg": "Der eingegebene Zeitraum ist ungültig.",
"invalidURLProtocol_msg": "Ungültiges Protokoll. Bitte gib eine URL mit http oder https ein.",
"invalidURLProtocol_msg": "Ungültiges Protokoll. Bitte gib eine URL mit https ein.",
"invalidURL_msg": "Ungültige URL. Bitte überprüfe und ändere die URL.",
"invalidVatIdNumber_msg": "Die angegebene Umsatzsteuer-Identifikationsnummer (USt-IdNr.) ist ungültig.",
"invalidVatIdValidationFailed_msg": "Fehler bei der Prüfung der Umsatzsteuer-Identifikationsnummer. Bitte versuche es später erneut.",
Expand Down
2 changes: 1 addition & 1 deletion src/mail-app/translations/de_sie.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ export default {
"invalidRegexSyntax_msg": "Ungültige Regex-Syntax",
"invalidRegistrationCode_msg": "Der Registrierungs-Code is ungültig.",
"invalidTimePeriod_msg": "Der eingegebene Zeitraum ist ungültig.",
"invalidURLProtocol_msg": "Ungültiges Protokoll. Bitte geben Sie eine URL mit http oder https ein.",
"invalidURLProtocol_msg": "Ungültiges Protokoll. Bitte geben Sie eine URL mit https ein.",
"invalidURL_msg": "Ungültige URL. Bitte überprüfen und ändern Sie die URL.",
"invalidVatIdNumber_msg": "Die angegebene Umsatzsteuer-Identifikationsnummer (USt-IdNr.) ist ungültig.",
"invalidVatIdValidationFailed_msg": "Fehler bei der Prüfung der Umsatzsteuer-Identifikationsnummer. Bitte versuchen Sie es später erneut.",
Expand Down
2 changes: 1 addition & 1 deletion src/mail-app/translations/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ export default {
"invalidRegexSyntax_msg": "Invalid regex syntax",
"invalidRegistrationCode_msg": "This registration code is invalid.",
"invalidTimePeriod_msg": "The entered time period is invalid.",
"invalidURLProtocol_msg": "Invalid protocol. Please provide an URL that uses http or https.",
"invalidURLProtocol_msg": "Invalid protocol. Please provide an URL that uses https.",
"invalidURL_msg": "Invalid URL format. Please check and modify the URL.",
"invalidVatIdNumber_msg": "The value added tax identification number (VAT-ID) is invalid.",
"invalidVatIdValidationFailed_msg": "Failed to validate the value added tax identification number. Please try again later.",
Expand Down