diff --git a/ChangeLog b/ChangeLog index 0ffd4b5e9..31117c604 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-07-05 Francis Lachapelle + * UI/WebServerResources/UIxContactEditor.js + (validateContactEditor): added validation of birthdate. + * UI/WebServerResources/SchedulerUI.js (onCalendarModify): fixed proper identification of web calendars and adjusted height of popup window. diff --git a/SoObjects/Appointments/French.lproj/Localizable.strings b/SoObjects/Appointments/French.lproj/Localizable.strings index 3ec2974db..921816d3d 100644 --- a/SoObjects/Appointments/French.lproj/Localizable.strings +++ b/SoObjects/Appointments/French.lproj/Localizable.strings @@ -35,8 +35,7 @@ vtodo_class2 = "(Tâche confidentielle)"; /* Invitation */ "Event Invitation: \"%{Summary}\"" = "Invitation à la réunion : \"%{Summary}\""; "(sent by %{SentBy}) " = "(envoyé par %{SentBy}) "; -"%{Organizer} %{SentByText}has invited you to %{Summary}." - = "%{Organizer} %{SentByText}vous a invité à la réunion « %{Summary} »."; +"%{Organizer} %{SentByText}has invited you to %{Summary}." = "%{Organizer} %{SentByText}vous a invité à la réunion « %{Summary} »."; /* Deletion */ "Event Cancelled: \"%{Summary}\"" = "Réunion annulée : « %{Summary} »"; diff --git a/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings b/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings index be0a0abdf..a92fd2183 100644 --- a/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings @@ -35,6 +35,7 @@ "delete" = "apagar"; "edit" = "editar"; "invalidemailwarn" = "O email informado é inválido"; +"invaliddatewarn" = "The specified date is invalid."; "new" = "novo"; "Preferred Phone" = "Telefone Preferencial"; diff --git a/UI/Contacts/Czech.lproj/Localizable.strings b/UI/Contacts/Czech.lproj/Localizable.strings index 03c549891..777cef8a7 100644 --- a/UI/Contacts/Czech.lproj/Localizable.strings +++ b/UI/Contacts/Czech.lproj/Localizable.strings @@ -35,6 +35,7 @@ "delete" = "smazat"; "edit" = "upravit"; "invalidemailwarn" = "Specifikovaný e-mail je neplatný"; +"invaliddatewarn" = "The specified date is invalid."; "new" = "nový"; "Preferred Phone" = "Upřednostňovaný telefon"; diff --git a/UI/Contacts/Dutch.lproj/Localizable.strings b/UI/Contacts/Dutch.lproj/Localizable.strings index 4831cf781..443ba52e1 100644 --- a/UI/Contacts/Dutch.lproj/Localizable.strings +++ b/UI/Contacts/Dutch.lproj/Localizable.strings @@ -35,6 +35,7 @@ "delete" = "Verwijderen"; "edit" = "Bewerken"; "invalidemailwarn" = "E-mailadres is ongeldig. Wilt u toch doorgaan?"; +"invaliddatewarn" = "The specified date is invalid."; "new" = "Nieuw"; "Preferred Phone" = "Voorkeurstelefoon"; diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings index 6846b9dc1..21f365e0d 100644 --- a/UI/Contacts/English.lproj/Localizable.strings +++ b/UI/Contacts/English.lproj/Localizable.strings @@ -35,6 +35,7 @@ "delete" = "delete"; "edit" = "edit"; "invalidemailwarn" = "The specified email is invalid"; +"invaliddatewarn" = "The specified date is invalid."; "new" = "new"; "Preferred Phone" = "Preferred Phone"; diff --git a/UI/Contacts/French.lproj/Localizable.strings b/UI/Contacts/French.lproj/Localizable.strings index 9431b6d50..19ad5bc4f 100644 --- a/UI/Contacts/French.lproj/Localizable.strings +++ b/UI/Contacts/French.lproj/Localizable.strings @@ -35,6 +35,7 @@ "delete" = "Effacer"; "edit" = "Éditer"; "invalidemailwarn" = "Le champ de l'adresse électronique est invalide"; +"invaliddatewarn" = "The specified date is invalid."; "new" = "Nouveau"; "Preferred Phone" = "Numéro préféré"; diff --git a/UI/Contacts/Hungarian.lproj/Localizable.strings b/UI/Contacts/Hungarian.lproj/Localizable.strings index 4f3c989be..9f50e784e 100644 --- a/UI/Contacts/Hungarian.lproj/Localizable.strings +++ b/UI/Contacts/Hungarian.lproj/Localizable.strings @@ -35,6 +35,7 @@ "delete" = "Töröl"; "edit" = "Szerkeszt"; "invalidemailwarn" = "A megadótt emailcím érvénytelen"; +"invaliddatewarn" = "The specified date is invalid."; "new" = "új"; "Preferred Phone" = "Preferált telefon"; diff --git a/UI/Contacts/Italian.lproj/Localizable.strings b/UI/Contacts/Italian.lproj/Localizable.strings index 9000ddb6c..9af75b49c 100644 --- a/UI/Contacts/Italian.lproj/Localizable.strings +++ b/UI/Contacts/Italian.lproj/Localizable.strings @@ -35,6 +35,7 @@ "delete" = "cancella"; "edit" = "modifica"; "invalidemailwarn" = "L'indirizzo email specificato non è valido"; +"invaliddatewarn" = "The specified date is invalid."; "new" = "nuovo"; "Preferred Phone" = "Telefono lavoro"; diff --git a/UI/Contacts/Spanish.lproj/Localizable.strings b/UI/Contacts/Spanish.lproj/Localizable.strings index 3b154cb08..63f440265 100644 --- a/UI/Contacts/Spanish.lproj/Localizable.strings +++ b/UI/Contacts/Spanish.lproj/Localizable.strings @@ -35,6 +35,7 @@ "delete" = "borrar"; "edit" = "modificar"; "invalidemailwarn" = "La dirección email indicada no es válida."; +"invaliddatewarn" = "The specified date is invalid."; "new" = "nuevo"; "Preferred Phone" = "Teléfono preferido"; diff --git a/UI/Contacts/Swedish.lproj/Localizable.strings b/UI/Contacts/Swedish.lproj/Localizable.strings index 9ddb75d0c..2e229fd7d 100644 --- a/UI/Contacts/Swedish.lproj/Localizable.strings +++ b/UI/Contacts/Swedish.lproj/Localizable.strings @@ -35,6 +35,7 @@ "delete" = "radera"; "edit" = "ändra"; "invalidemailwarn" = "Meddelandet är inkomplett"; +"invaliddatewarn" = "The specified date is invalid."; "new" = "ny"; "Preferred Phone" = "Föredragen telefon"; diff --git a/UI/MailPartViewers/German.lproj/Localizable.strings b/UI/MailPartViewers/German.lproj/Localizable.strings index 0857124ef..3e9314df0 100644 --- a/UI/MailPartViewers/German.lproj/Localizable.strings +++ b/UI/MailPartViewers/German.lproj/Localizable.strings @@ -43,4 +43,3 @@ reply_info = "Dies ist eine Anwort auf eine Einladung von Ihnen."; "Date" = "Datum"; "To" = "An"; "Issuer" = "Aussteller"; - diff --git a/UI/MailerUI/Ukrainian.lproj/Localizable.strings b/UI/MailerUI/Ukrainian.lproj/Localizable.strings index 96264d1ee..bbe92db97 100644 --- a/UI/MailerUI/Ukrainian.lproj/Localizable.strings +++ b/UI/MailerUI/Ukrainian.lproj/Localizable.strings @@ -45,7 +45,7 @@ "Home" = "Початок"; "Calendar" = "Календар"; -"Addressbook" = "Адресна"; +"Addressbook" = "Адресна книга"; "Mail" = "Пошта"; "Right Administration" = "Права доступу"; diff --git a/UI/MainUI/Czech.lproj/Localizable.strings b/UI/MainUI/Czech.lproj/Localizable.strings index 118381349..92256a6ed 100644 --- a/UI/MainUI/Czech.lproj/Localizable.strings +++ b/UI/MainUI/Czech.lproj/Localizable.strings @@ -67,4 +67,4 @@ This is free software: you are free to change and redistribute it. There is NO W "New password:" = "Nové heslo:"; "Confirmation:" = "Potvrzení:"; "Cancel" = "Odvolat"; -"Please wait..." = "Prosím čekejte..."; +"Please wait..." = "Prosím čekejte..."; \ No newline at end of file diff --git a/UI/MainUI/German.lproj/Localizable.strings b/UI/MainUI/German.lproj/Localizable.strings index e29870c46..c550e7810 100644 --- a/UI/MainUI/German.lproj/Localizable.strings +++ b/UI/MainUI/German.lproj/Localizable.strings @@ -67,4 +67,4 @@ This is free software: you are free to change and redistribute it. There is NO W "New password:" = "Neues Passwort:"; "Confirmation:" = "Bestätigung:"; "Cancel" = "Abbrechen"; -"Please wait..." = "Bitte warten..."; +"Please wait..." = "Bitte warten..."; \ No newline at end of file diff --git a/UI/WebServerResources/UIxContactEditor.js b/UI/WebServerResources/UIxContactEditor.js index f2467ff6c..68f941671 100644 --- a/UI/WebServerResources/UIxContactEditor.js +++ b/UI/WebServerResources/UIxContactEditor.js @@ -27,6 +27,7 @@ var uixEmailUsr = var uixEmailDomain = "([a-zA-Z0-9][a-zA-Z0-9._-]*\\.)*[a-zA-Z0-9][a-zA-Z0-9._-]*\\.[a-zA-Z]{2,5}"; var uixEmailRegex = new RegExp("^"+uixEmailUsr+"\@"+uixEmailDomain+"$"); +var dateRegex = /^[0-9]{4}-[0-9]{2}-[0-9]{2}$/; var displayNameChanged = false; @@ -97,6 +98,13 @@ function validateContactEditor() { rc = false; } + e = $('birthday'); + if (e.value.length > 0 + && !dateRegex.test(e.value)) { + alert(_("invaliddatewarn")); + rc = false; + } + return rc; }