Monotone-Parent: 1ed4bccebed155143bf812c74cb29f69ccb51f7d

Monotone-Revision: 38830b89dba3fbe47ce03c0a4617768116eda22b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-26T20:19:37
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-10-26 20:19:37 +00:00
parent 90a40362af
commit 00fe3ec6dd
25 changed files with 62 additions and 55 deletions
@@ -58,6 +58,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Nome ou Email";
"Category" = "Category";
"Personal Addressbook" = "Catálogo Pessoal";
"Search in Addressbook" = "Localizar no Catálogo";
@@ -58,6 +58,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Nom o correu";
"Category" = "Category";
"Personal Addressbook" = "Llibre personal d'adreces";
"Search in Addressbook" = "Buscar en la llibreta";
@@ -58,6 +58,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Jméno nebo e-mail";
"Category" = "Category";
"Personal Addressbook" = "Osobní kontakty";
"Search in Addressbook" = "Vyhledávat v kontaktech";
@@ -58,6 +58,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Naam of E-mail";
"Category" = "Category";
"Personal Addressbook" = "Persoonlijk adresboek";
"Search in Addressbook" = "Adresboek doorzoeken...";
@@ -58,6 +58,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Name or Email";
"Category" = "Category";
"Personal Addressbook" = "Personal Addressbook";
"Search in Addressbook" = "Search in Addressbook";
@@ -58,6 +58,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Le nom ou l'adresse";
"Category" = "La catégorie";
"Personal Addressbook" = "Adresses personnelles";
"Search in Addressbook" = "Carnet d'adresses...";
@@ -57,6 +57,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Name oder E-Mail";
"Category" = "Category";
"Personal Addressbook" = "Persönliches Adressbuch";
"Search in Addressbook" = "Im Adressbuch suchen ...";
@@ -58,6 +58,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Név vagy email";
"Category" = "Category";
"Personal Addressbook" = "Személyes címjegyzék";
"Search in Addressbook" = "Keresés a címjegyzékben";
@@ -58,6 +58,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Nome o indirizzo Email";
"Category" = "Category";
"Personal Addressbook" = "Rubrica personale";
"Search in Addressbook" = "Cerca nella rubrica";
@@ -58,6 +58,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Nazwa lub e-mail";
"Category" = "Category";
"Personal Addressbook" = "Osobista książka adresowa";
"Search in Addressbook" = "Szukaj w książce adresowej";
@@ -52,6 +52,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Name or Email";
"Category" = "Category";
"Personal Addressbook" = "Personal Addressbook";
"Search in Addressbook" = "Search in Addressbook";
@@ -58,6 +58,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Nombre o correo";
"Category" = "Category";
"Personal Addressbook" = "Libre personal de direcciones";
"Search in Addressbook" = "Buscar en libreta";
@@ -58,6 +58,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Namn eller e-post";
"Category" = "Category";
"Personal Addressbook" = "Personlig adressbok";
"Search in Addressbook" = "Sök i adressbok";
+1 -39
View File
@@ -113,45 +113,6 @@
return (selectorComponentClass != nil);
}
- (void) _fillResults: (NSMutableDictionary *) results
inFolder: (id <SOGoContactFolder>) folder
withSearchOn: (NSString *) contact
{
NSEnumerator *folderResults;
NSDictionary *currentContact;
NSString *uid;
folderResults = [[folder lookupContactsWithFilter: contact
sortBy: @"cn"
ordering: NSOrderedAscending] objectEnumerator];
currentContact = [folderResults nextObject];
while (currentContact)
{
uid = [currentContact objectForKey: @"c_uid"];
if (uid && ![results objectForKey: uid])
[results setObject: currentContact forKey: uid];
currentContact = [folderResults nextObject];
}
}
- (NSString *) _emailForResult: (NSDictionary *) result
{
NSMutableString *email;
NSString *name, *mail;
email = [NSMutableString string];
name = [result objectForKey: @"displayName"];
if (![name length])
name = [result objectForKey: @"cn"];
mail = [result objectForKey: @"mail"];
if ([name length])
[email appendFormat: @"%@ <%@>", name, mail];
else
[email appendString: mail];
return email;
}
- (id <WOActionResults>) allContactSearchAction
{
id <WOActionResults> result;
@@ -199,6 +160,7 @@
folder = [sortedFolders objectAtIndex: i];
//NSLog(@" Address book: %@ (%@)", [folder displayName], [folder class]);
contacts = [folder lookupContactsWithFilter: searchText
onCriteria: @"name_or_address"
sortBy: @"c_cn"
ordering: NSOrderedAscending];
for (j = 0; j < [contacts count]; j++)
+4 -2
View File
@@ -112,8 +112,9 @@
[contactInfos release];
contactInfos = [folder lookupContactsWithFilter: valueText
sortBy: [self sortKey]
ordering: ordering];
onCriteria: searchText
sortBy: [self sortKey]
ordering: ordering];
[contactInfos retain];
}
@@ -145,6 +146,7 @@
uniqueContacts = [NSMutableDictionary dictionary];
contacts = [folder lookupContactsWithFilter: searchText
onCriteria: @"name_or_address"
sortBy: @"c_cn"
ordering: NSOrderedAscending];
for (i = 0; i < [contacts count]; i++)
@@ -55,6 +55,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Ім’я або адреса електронної пошти";
"Category" = "Category";
"Personal Addressbook" = "Особиста адресна книга";
"Search in Addressbook" = "Шукати в адресній книзі";
@@ -52,6 +52,7 @@
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Enw neu Ebost";
"Category" = "Category";
"Personal Addressbook" = "Llyfr Cyfeiriadau Personol";
"Search in Addressbook" = "Chwilio yn Llyfr Cyfeiriadau";
@@ -9,6 +9,7 @@
<ul id="searchOptions" class="choiceMenu">
<li id="name_or_address"><var:string
label:value="Name or Email"/></li>
<li id="category"><var:string label:value="Category"/></li>
</ul>
</div>
+1 -1
View File
@@ -1125,7 +1125,7 @@ function getMenus() {
"-", onMenuDeleteContact, "-",
"moveContactMenu", "copyContactMenu",
onMenuExportContact);
menus["searchMenu"] = new Array(setSearchCriteria);
menus["searchMenu"] = new Array(setSearchCriteria, setSearchCriteria);
var contactFoldersMenu = $("contactFoldersMenu");
if (contactFoldersMenu)