From af44bf39017bb888f6c2ef74eecc441801e0428d Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 27 Oct 2010 16:23:06 +0000 Subject: [PATCH] Monotone-Parent: 4a468f80bf0ec2ffe462494051a6b19cbfe6cae0 Monotone-Revision: c98cf880ac8acb55a11ef10036185bef0a89375d Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-10-27T16:23:06 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ .../BrazilianPortuguese.lproj/Localizable.strings | 1 + UI/Contacts/Catalan.lproj/Localizable.strings | 1 + UI/Contacts/Czech.lproj/Localizable.strings | 1 + UI/Contacts/Dutch.lproj/Localizable.strings | 1 + UI/Contacts/English.lproj/Localizable.strings | 3 ++- UI/Contacts/French.lproj/Localizable.strings | 1 + UI/Contacts/German.lproj/Localizable.strings | 1 + UI/Contacts/Hungarian.lproj/Localizable.strings | 1 + UI/Contacts/Italian.lproj/Localizable.strings | 1 + UI/Contacts/Polish.lproj/Localizable.strings | 1 + UI/Contacts/Russian.lproj/Localizable.strings | 2 ++ UI/Contacts/Spanish.lproj/Localizable.strings | 1 + UI/Contacts/Swedish.lproj/Localizable.strings | 1 + UI/Contacts/UIxContactView.m | 13 +++++++++++-- UI/Contacts/Ukrainian.lproj/Localizable.strings | 1 + UI/Contacts/Welsh.lproj/Localizable.strings | 3 +++ UI/Templates/ContactsUI/UIxContactView.wox | 1 + 18 files changed, 34 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb0882231..e0caa1e65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-10-27 Wolfgang Sourdeau + * UI/Contacts/UIxContactView.m (-categories): new accessor for + displaying card categories. + * UI/WebServerResources/UIxContactEditor.js: (onComboButtonClick): take the container's scrollTop into account when displaying the combobox menu. diff --git a/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings b/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings index bde0a9c38..e40bdc4af 100644 --- a/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings @@ -85,6 +85,7 @@ "Phone Number:" = "Phone Number:"; "Prefers to receive messages formatted as:" = "Prefers to receive messages formatted as:"; "Screen Name:" = "Screen Name:"; +"Categories:" = "Categories:"; "First:" = "Primeiro Nome:"; "Last:" = "Último Nome:"; diff --git a/UI/Contacts/Catalan.lproj/Localizable.strings b/UI/Contacts/Catalan.lproj/Localizable.strings index 297362875..4c6653205 100644 --- a/UI/Contacts/Catalan.lproj/Localizable.strings +++ b/UI/Contacts/Catalan.lproj/Localizable.strings @@ -85,6 +85,7 @@ "Phone Number:" = "Número de telèfon:"; "Prefers to receive messages formatted as:" = "Prefereix rebre missatges amb format:"; "Screen Name:" = "Nom d'usuari:"; +"Categories:" = "Categories:"; "First:" = "Nom:"; "Last:" = "Cognoms:"; diff --git a/UI/Contacts/Czech.lproj/Localizable.strings b/UI/Contacts/Czech.lproj/Localizable.strings index 1e203c3b3..60de5b1b1 100644 --- a/UI/Contacts/Czech.lproj/Localizable.strings +++ b/UI/Contacts/Czech.lproj/Localizable.strings @@ -85,6 +85,7 @@ "Phone Number:" = "Telefonní číslo:"; "Prefers to receive messages formatted as:" = "Upřednostňovaný formát zpráv:"; "Screen Name:" = "Zobrazované jméno:"; +"Categories:" = "Categories:"; "First:" = "Křestní jméno:"; "Last:" = "Příjmení:"; diff --git a/UI/Contacts/Dutch.lproj/Localizable.strings b/UI/Contacts/Dutch.lproj/Localizable.strings index 210d36f62..9f055e6f8 100644 --- a/UI/Contacts/Dutch.lproj/Localizable.strings +++ b/UI/Contacts/Dutch.lproj/Localizable.strings @@ -85,6 +85,7 @@ "Phone Number:" = "Telefoon:"; "Prefers to receive messages formatted as:" = "Geeft voorkeur aan berichten geformatteerd als:"; "Screen Name:" = "Weergavenaam:"; +"Categories:" = "Categories:"; "First:" = "Voornaam:"; "Last:" = "Achternaam:"; diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings index c74e4a76d..61a9fd4e4 100644 --- a/UI/Contacts/English.lproj/Localizable.strings +++ b/UI/Contacts/English.lproj/Localizable.strings @@ -38,7 +38,7 @@ "invalidemailwarn" = "The specified email is invalid"; "invaliddatewarn" = "The specified date is invalid."; "new" = "new"; -"Preferred Phone" = "Preferred Phone"; +"Preferred Phone" = "Preferred Phone"; "Move To" = "Move To"; "Copy To" = "Copy To"; @@ -85,6 +85,7 @@ "Phone Number:" = "Phone Number:"; "Prefers to receive messages formatted as:" = "Prefers to receive messages formatted as:"; "Screen Name:" = "Screen Name:"; +"Categories:" = "Categories:"; "First:" = "First:"; "Last:" = "Last:"; diff --git a/UI/Contacts/French.lproj/Localizable.strings b/UI/Contacts/French.lproj/Localizable.strings index a4fe53415..4bd630d13 100644 --- a/UI/Contacts/French.lproj/Localizable.strings +++ b/UI/Contacts/French.lproj/Localizable.strings @@ -85,6 +85,7 @@ "Phone Number:" = "Numéro de téléphone :"; "Prefers to receive messages formatted as:" = "Préfère recevoir les messages au format :"; "Screen Name:" = "Pseudo :"; +"Categories:" = "Catégories :"; "First:" = "Prénom :"; "Last:" = "Nom :"; diff --git a/UI/Contacts/German.lproj/Localizable.strings b/UI/Contacts/German.lproj/Localizable.strings index 6ec8fe7ff..7279f9c63 100644 --- a/UI/Contacts/German.lproj/Localizable.strings +++ b/UI/Contacts/German.lproj/Localizable.strings @@ -84,6 +84,7 @@ "Phone Number:" = "Telefon:"; "Prefers to receive messages formatted as:" = "Bevorzugt folgendes Nachrichten-Format:"; "Screen Name:" = "Messenger-Name:"; +"Categories:" = "Categories:"; "First:" = "Vorname:"; "Last:" = "Name:"; diff --git a/UI/Contacts/Hungarian.lproj/Localizable.strings b/UI/Contacts/Hungarian.lproj/Localizable.strings index dd85e3890..b3c2c618c 100644 --- a/UI/Contacts/Hungarian.lproj/Localizable.strings +++ b/UI/Contacts/Hungarian.lproj/Localizable.strings @@ -85,6 +85,7 @@ "Phone Number:" = "Phone Number:"; "Prefers to receive messages formatted as:" = "Prefers to receive messages formatted as:"; "Screen Name:" = "Fedőnév:"; +"Categories:" = "Categories:"; "First:" = "Keresztnév:"; "Last:" = "Vezetéknév:"; diff --git a/UI/Contacts/Italian.lproj/Localizable.strings b/UI/Contacts/Italian.lproj/Localizable.strings index 00e052a6c..1b5724776 100644 --- a/UI/Contacts/Italian.lproj/Localizable.strings +++ b/UI/Contacts/Italian.lproj/Localizable.strings @@ -85,6 +85,7 @@ "Phone Number:" = "Numero di telefono:"; "Prefers to receive messages formatted as:" = "Formato preferito per i messaggi di posta:"; "Screen Name:" = "Nome Instant Messenger:"; +"Categories:" = "Categories:"; "First:" = "Nome:"; "Last:" = "Cognome"; diff --git a/UI/Contacts/Polish.lproj/Localizable.strings b/UI/Contacts/Polish.lproj/Localizable.strings index 88cb8ef79..33de01253 100644 --- a/UI/Contacts/Polish.lproj/Localizable.strings +++ b/UI/Contacts/Polish.lproj/Localizable.strings @@ -85,6 +85,7 @@ "Phone Number:" = "Numer telefonu:"; "Prefers to receive messages formatted as:" = "Preferuje wiadomości w formacie:"; "Screen Name:" = "Nazwa ekranowa:"; +"Categories:" = "Categories:"; "First:" = "Imię:"; "Last:" = "Nazwisko:"; diff --git a/UI/Contacts/Russian.lproj/Localizable.strings b/UI/Contacts/Russian.lproj/Localizable.strings index 4bb0cb4f6..62bb003c3 100644 --- a/UI/Contacts/Russian.lproj/Localizable.strings +++ b/UI/Contacts/Russian.lproj/Localizable.strings @@ -74,6 +74,8 @@ "Display Name: " = "Display Name: "; "Email Address: " = "Email Address: "; +"Categories:" = "Categories:"; + "Firstname: " = "Firstname: "; "Lastname: " = "Lastname: "; "Nickname: " = "Nickname: "; diff --git a/UI/Contacts/Spanish.lproj/Localizable.strings b/UI/Contacts/Spanish.lproj/Localizable.strings index cce44ead7..bdace256b 100644 --- a/UI/Contacts/Spanish.lproj/Localizable.strings +++ b/UI/Contacts/Spanish.lproj/Localizable.strings @@ -85,6 +85,7 @@ "Phone Number:" = "Phone Number:"; "Prefers to receive messages formatted as:" = "Formato de mensajes preferido:"; "Screen Name:" = "Nombre IM:"; +"Categories:" = "Categories:"; "First:" = "Nombre:"; "Last:" = "Apellidos:"; diff --git a/UI/Contacts/Swedish.lproj/Localizable.strings b/UI/Contacts/Swedish.lproj/Localizable.strings index 2dfc2bfdc..e717ccb96 100644 --- a/UI/Contacts/Swedish.lproj/Localizable.strings +++ b/UI/Contacts/Swedish.lproj/Localizable.strings @@ -85,6 +85,7 @@ "Phone Number:" = "Telefonnummer:"; "Prefers to receive messages formatted as:" = "Föredrar att få mottagna meddelanden kodade som:"; "Screen Name:" = "Skärmnamn:"; +"Categories:" = "Categories:"; "First:" = "Förnamn:"; "Last:" = "Efternamn:"; diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m index 7a8ccf733..a2191cf1b 100644 --- a/UI/Contacts/UIxContactView.m +++ b/UI/Contacts/UIxContactView.m @@ -63,8 +63,8 @@ { NSMutableString *cardString; - cardString = [NSMutableString string]; - if (value && [value length] > 0) + cardString = [NSMutableString stringWithCapacity: 80]; + if ([value length] > 0) { if (label) [cardString appendFormat: @"%@ %@
\n", @@ -207,6 +207,15 @@ return @""; } +- (NSString *) categories +{ + NSString *categories; + + categories = [[card categories] componentsJoinedByString: @", "]; + return [self _cardStringWithLabel: @"Categories:" + value: categories]; +} + - (BOOL) hasTelephones { if (!phones) diff --git a/UI/Contacts/Ukrainian.lproj/Localizable.strings b/UI/Contacts/Ukrainian.lproj/Localizable.strings index 499852e78..ce2a75ef4 100644 --- a/UI/Contacts/Ukrainian.lproj/Localizable.strings +++ b/UI/Contacts/Ukrainian.lproj/Localizable.strings @@ -82,6 +82,7 @@ "Phone Number:" = "Номер телефону:"; "Prefers to receive messages formatted as:" = "Вважає за краще отримувати пошту у форматі:"; "Screen Name:" = "Інтернет-пейджер:"; +"Categories:" = "Categories:"; "First:" = "Ім’я:"; "Last:" = "Прізвище:"; diff --git a/UI/Contacts/Welsh.lproj/Localizable.strings b/UI/Contacts/Welsh.lproj/Localizable.strings index 97103f9b8..aeefefbd3 100644 --- a/UI/Contacts/Welsh.lproj/Localizable.strings +++ b/UI/Contacts/Welsh.lproj/Localizable.strings @@ -75,6 +75,9 @@ "Email:" = "Cyfeiriad ebost: "; "Additional Email:" = "Additional Email:"; +"Screen Name:" = "Screen Name:"; +"Categories:" = "Categories:"; + "First:" = "Enw cyntaf: "; "Last:" = "Cyfenw: "; "Nickname:" = "Llysenw: "; diff --git a/UI/Templates/ContactsUI/UIxContactView.wox b/UI/Templates/ContactsUI/UIxContactView.wox index 3fe014d9c..867e80f86 100644 --- a/UI/Templates/ContactsUI/UIxContactView.wox +++ b/UI/Templates/ContactsUI/UIxContactView.wox @@ -18,6 +18,7 @@ />