amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-23 13:59:32 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 187fad3b4acd4bab3a2b6c286a0f9dc3789c5b83

Browse Source 
Monotone-Revision: f37d0868145e5cd1f879ccf7033ca5d1900df42b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-06-23T14:23:18
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-06-23 14:23:18 +00:00
parent d22e932839
commit 5a382d84ea
26 changed files with 234 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -1,3 +1,14 @@
2008-06-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoObject.m ([SOGoObject -labelForKey:key]):
enhanced method to request the user language, his/her browser
languages and the system language as fallback.
* UI/Contacts/UIxContactsListViewContainer.m
([-currentContactFolderName]): no longer interprets the name of
the personal folder, since the default name is now localized at
creation time.
2008-06-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Scheduler/UIxCalendarProperties.m ([UIxCalendarProperties -calendarSyncTag])

1
SoObjects/Appointments/Dutch.lproj/Localizable.strings Normal file
View File

@@ -0,0 +1 @@
"Personal Calendar" = "Persoonlijke agenda";

1
SoObjects/Appointments/English.lproj/Localizable.strings Normal file
View File

@@ -0,0 +1 @@
"Personal Calendar" = "Personal Calendar";

1
SoObjects/Appointments/French.lproj/Localizable.strings Normal file
View File

@@ -0,0 +1 @@
"Personal Calendar" = "Agenda personnel";

4
SoObjects/Appointments/GNUmakefile
View File

@@ -34,6 +34,10 @@ Appointments_RESOURCE_FILES += \
Version \
product.plist \
Appointments_LANGUAGES = Dutch English French German Italian Spanish
Appointments_LOCALIZED_RESOURCE_FILES = Localizable.strings
Appointments_COMPONENTS += \
SOGoAptMailDutchInvitation.wo \
SOGoAptMailDutchICalReply.wo \

1
SoObjects/Appointments/German.lproj/Localizable.strings Normal file
View File

@@ -0,0 +1 @@
"Personal Calendar" = "Persönlicher Kalender";

1
SoObjects/Appointments/Italian.lproj/Localizable.strings Normal file
View File

@@ -0,0 +1 @@
"Personal Calendar" = "Calendario personale";

2
SoObjects/Appointments/SOGoAppointmentFolders.m
View File

@@ -41,7 +41,7 @@
- (NSString *) defaultFolderName
{
return @"Personal calendar";
return [self labelForKey: @"Personal Calendar"];
}
// /* CalDAV support */

1
SoObjects/Appointments/Spanish.lproj/Localizable.strings Normal file
View File

@@ -0,0 +1 @@
"Personal Calendar" = "Calendario personal";

1
SoObjects/Contacts/Dutch.lproj/Localizable.strings Normal file
View File

@@ -0,0 +1 @@
"Personal Address Book" = "Persoonlijk adresboek";

1
SoObjects/Contacts/English.lproj/Localizable.strings Normal file
View File

@@ -0,0 +1 @@
"Personal Address Book" = "Personal Address Book";

1
SoObjects/Contacts/French.lproj/Localizable.strings Normal file
View File

@@ -0,0 +1 @@
"Personal Address Book" = "Carnet d'adresses personnel";

4
SoObjects/Contacts/GNUmakefile
View File

@@ -21,6 +21,10 @@ Contacts_RESOURCE_FILES += \
Version \
product.plist \
Contacts_LANGUAGES = Dutch English French German Italian Spanish
Contacts_LOCALIZED_RESOURCE_FILES = Localizable.strings
ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/

1
SoObjects/Contacts/German.lproj/Localizable.strings Normal file
View File

@@ -0,0 +1 @@
"Personal Address Book" = "Persönliches Addressbuch";

1
SoObjects/Contacts/Italian.lproj/Localizable.strings Normal file
View File

@@ -0,0 +1 @@
"Personal Address Book" = "Rubrica personale";

2
SoObjects/Contacts/SOGoContactFolders.m
View File

@@ -71,7 +71,7 @@
- (NSString *) defaultFolderName
{
return @"Personal Address Book";
return [self labelForKey: @"Personal Address Book"];
}
@end

1
SoObjects/Contacts/Spanish.lproj/Localizable.strings Normal file
View File

@@ -0,0 +1 @@
"Personal Address Book" = "Libreta personal de direcciones";

52
SoObjects/SOGo/SOGoObject.m
View File

@@ -1179,31 +1179,57 @@ static NSDictionary *reportMap = nil;
return nil;
}
- (NSArray *) _languagesForLabels
{
NSMutableArray *languages;
NSArray *browserLanguages;
NSString *language;
NSUserDefaults *ud;
languages = [NSMutableArray array];
language = [[context activeUser] language];
[languages addObject: language];
browserLanguages = [[context request] browserLanguages];
[languages addObjectsFromArray: browserLanguages];
ud = [NSUserDefaults standardUserDefaults];
language = [ud stringForKey: @"SOGoDefaultLanguage"];
if (language)
[languages addObject: language];
[languages addObject: @"English"];
return languages;
}
- (NSString *) labelForKey: (NSString *) key
{
NSString *userLanguage, *label;
NSString *language, *label;
NSArray *paths;
NSEnumerator *languages;
NSBundle *bundle;
NSDictionary *strings;
label = nil;
bundle = [NSBundle bundleForClass: [self class]];
if (!bundle)
bundle = [NSBundle mainBundle];
languages = [[self _languagesForLabels] objectEnumerator];
userLanguage = [[context activeUser] language];
paths = [bundle pathsForResourcesOfType: @"strings"
inDirectory: [NSString stringWithFormat: @"%@.lproj",
userLanguage]
forLocalization: userLanguage];
if ([paths count] > 0)
while (!label && (language = [languages nextObject]))
{
strings = [NSDictionary
dictionaryFromStringsFile: [paths objectAtIndex: 0]];
label = [strings objectForKey: key];
if (!label)
label = key;
paths = [bundle pathsForResourcesOfType: @"strings"
inDirectory: [NSString stringWithFormat: @"%@.lproj",
language]
forLocalization: language];
if ([paths count] > 0)
{
strings = [NSDictionary
dictionaryFromStringsFile: [paths objectAtIndex: 0]];
label = [strings objectForKey: key];
}
}
else
if (!label)
label = key;
return label;

1
SoObjects/SOGo/SOGoParentFolder.m
View File

@@ -328,6 +328,7 @@ static SoSecurityManager *sm = nil;
{
id obj;
NSLog (@"default name: '%@'", [self defaultFolderName]);
/* first check attributes directly bound to the application */
obj = [super lookupName: name inContext: lookupContext acquire: NO];
if (!obj)

3
UI/Contacts/Dutch.lproj/Localizable.strings
View File

@@ -40,9 +40,6 @@
"new" = "Nieuw";
"Preferred Phone" = "Voorkeurstelefoon";
/* Folders */
"Personal Address Book" = "Persoonlijk adresboek";
"htmlMailFormat_UNKNOWN" = "Onbekend";
"htmlMailFormat_FALSE" = "Platte tekst";
"htmlMailFormat_TRUE" = "HTML";

3
UI/Contacts/English.lproj/Localizable.strings
View File

@@ -33,9 +33,6 @@
"new" = "new";
"Preferred Phone" = "Preferred Phone";
/* Folders */
"Personal Address Book" = "Personal Address Book";
/* Tooltips */
"Create a new address book card" = "Create a new address book card";

3
UI/Contacts/French.lproj/Localizable.strings
View File

@@ -40,9 +40,6 @@
"new" = "Nouveau";
"Preferred Phone" = "Numéro préféré";
/* Folders */
"Personal Address Book" = "Carnet d'adresses personnel";
/* Tooltips */
"Create a new address book card" = "Créer une nouvelle fiche";

3
UI/Contacts/German.lproj/Localizable.strings
View File

@@ -40,9 +40,6 @@
"new" = "Neu";
"Preferred Phone" = "Bevorzugt";
/* Folders */
"Personal Address Book" = "Persönliches Addressbuch";
"htmlMailFormat_UNKNOWN" = "Unbekannt";
"htmlMailFormat_FALSE" = "Reintext";
"htmlMailFormat_TRUE" = "HTML";

323
UI/Contacts/Italian.lproj/Localizable.strings
View File

@@ -1,163 +1,160 @@
/* this file is in UTF-8 format! */
"Contact" = "Contatto";
"Address" = "Indirizzo";
"Other" = "Altro";
"Name" = "Nome";
"Internet" = "Email";
"Phones" = "Numeri di telefono";
"Home" = "Personale";
"Work" = "Lavoro";
"Address Books" = "Rubrica";
"Addressbook" = "Rubrica";
"Addresses" = "Indirizzi";
"Update" = "Aggiorna";
"Cancel" = "Anulla";
"Common" = "Comuni";
"Contact editor" = "Editor dei contatti";
"Contact viewer" = "Visulizzatore dei contatti";
"Email" = "Email";
"Screen Name" = "Nome Instant Messeger";
"Extended" = "Nome completo";
"Fax" = "Fax";
"Firstname" = "Nome";
"Home" = "Casa";
"HomePhone" = "Telefono casa";
"Lastname" = "Cognome";
"Location" = "Località";
"MobilePhone" = "Cellulare";
"Name" = "Nome";
"OfficePhone" = "Telefono ufficio";
"Organization" = "Società";
"Work Phone" = "Telefono di lavoro";
"Phone" = "Telefono";
"Phones" = "Telefoni";
"Postal" = "CAP";
"Save" = "Salva";
"URL" = "Pagina Web";
"Unit" = "Unità";
"delete" = "cancella";
"edit" = "modifica";
"invalidemailwarn" = "L'indirizzo email specificato non è valido";
"new" = "new";
"Preferred Phone" = "Telefono lavoro";
/* Folders */
"Personal Address Book" = "Rubrica personale";
/* Tooltips */
"Create a new address book card" = "Crea un nuovo contatto";
"Create a new list" = "Crea una nuova lista";
"Edit the selected card" = "Modifica il contatto selezionato";
"Send a mail message" = "Invia un'email";
"Delete selected card or address book" = "Cancella il contatto selezionato";
"htmlMailFormat_UNKNOWN" = "Sconosciuto";
"htmlMailFormat_FALSE" = "Testo normale";
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Nome o indirizzo Email";
"Personal Addressbook" = "Rubrica personale";
"Search in Addressbook" = "Cerca nella rubrica";
"New Card" = "Nuovo contatto";
"New List" = "Nuova lista";
"Modify" = "Modifica";
"Sharing..." = "Condividi...";
"Write" = "Scrivi";
"Delete" = "Cancella";
"Instant Message" = "Messaggio istantaneo";
"Add..." = "Aggiungi...";
"Remove" = "Rimuovi";
"Preferred" = "Predefinito";
"Card for %@" = "Biglietto da visita di %@";
"Display:" = "Nome visualizzato:";
"Display Name:" = "Nome visualizzato:";
"Email:" = "Email:";
"Additional Email:" = "Email aggiuntiva:";
"Phone Number:" = "Numero di telefono:";
"Prefers to receive messages formatted as:"
= "Formato preferito per i messaggi di posta:";
"Screen Name:" = "Nome Instant Messenger:";
"Firstname:" = "Nome:";
"Lastname:" = "Cognome:";
"First:" = "Nome:";
"Last:" = "Cognome";
"Nickname:" = "Soprannome:";
"Telephone" = "Telefono";
"Work:" = "Lavoro:";
"Home:" = "Casa:";
"Fax:" = "Fax:";
"Mobile:" = "Cellulare:";
"Pager:" = "Cerca Persone:";
"Title:" = "Titolo:";
"Service:" = "Service:";
"Company:" = "Società:";
"Street Address:" = "Indirizzo:";
"Address:" = "Indirizzo:";
"City:" = "Città:";
"State_Province:" = "Provincia:";
"ZIP_Postal Code:" = "CAP:";
"Country:" = "Nazione:";
"Web:" = "Pagina Web:";
"Web Page:" = "Pagina Web:";
"Department:" = "Reparto:";
"Organization:" = "Società:";
"Work" = "Lavoro";
"Other Infos" = "Altre informazioni";
"Note:" = "Note:";
"Timezone:" = "Fuso orario:";
"Birthday:" = "Data di Nascita:";
"Freebusy URL:" = "Freebusy URL:";
"Add as..." = "Aggiungi come...";
"Recipient" = "Destinatario";
"Carbon Copy" = "Copia Carbone";
"Blind Carbon Copy" = "Copia Carbone Nascosta";
"New Addressbook..." = "Nuova rubrica...";
"Subscribe to an Addressbook..." = "Sottoscrivi una rubrica...";
"Remove the selected Addressbook" = "Rimuovi la rubrica selezionata";
"Name of the Address Book" = "Nome della rubrica";
"Are you sure you want to delete the selected address book?"
= "Sei sicuro di voler cancellare la rubrica selezionata?";
"Address Book Name" = "Nome della Rubrica";
"You cannot subscribe to a folder that you own!"
= "Non puoi sottoscrivere una cartella di cui sei proprietario!";
"Unable to subscribe to that folder!"
= "Non puoi sottoscrivere la cartella!";
"Default Roles" = "Permessi predefiniti";
"User rights for:" = "Permessi per:";
"This person can add cards to this addressbook."
= "Questa persona può aggiungere contatti a questa rubrica.";
"This person can edit the cards of this addressbook."
= "Questa persona può modificare i contatti di questa rubrica.";
"This person can list the content of this addressbook."
= "Questa persona può visualizzare i contenuti di questa rubrica.";
"This person can read the cards of this addressbook."
= "Questa persona può leggere i contatti di questa rubrica.";
"This person can erase cards from this addressbook."
= "Questa persona può eliminare contatti da questa rubrica.";
"The selected contact has no email address."
= "Il contatto selezionato non dispone di indirizzo email.";
"You cannot delete the selected contact(s)"
= "Non puoi eliminare il contatto selezionato.";
"Please select a contact." = "Per favore seleziona un contatto.";
/* this file is in UTF-8 format! */
"Contact" = "Contatto";
"Address" = "Indirizzo";
"Other" = "Altro";
"Name" = "Nome";
"Internet" = "Email";
"Phones" = "Numeri di telefono";
"Home" = "Personale";
"Work" = "Lavoro";
"Address Books" = "Rubrica";
"Addressbook" = "Rubrica";
"Addresses" = "Indirizzi";
"Update" = "Aggiorna";
"Cancel" = "Anulla";
"Common" = "Comuni";
"Contact editor" = "Editor dei contatti";
"Contact viewer" = "Visulizzatore dei contatti";
"Email" = "Email";
"Screen Name" = "Nome Instant Messeger";
"Extended" = "Nome completo";
"Fax" = "Fax";
"Firstname" = "Nome";
"Home" = "Casa";
"HomePhone" = "Telefono casa";
"Lastname" = "Cognome";
"Location" = "Località";
"MobilePhone" = "Cellulare";
"Name" = "Nome";
"OfficePhone" = "Telefono ufficio";
"Organization" = "Società";
"Work Phone" = "Telefono di lavoro";
"Phone" = "Telefono";
"Phones" = "Telefoni";
"Postal" = "CAP";
"Save" = "Salva";
"URL" = "Pagina Web";
"Unit" = "Unità";
"delete" = "cancella";
"edit" = "modifica";
"invalidemailwarn" = "L'indirizzo email specificato non è valido";
"new" = "new";
"Preferred Phone" = "Telefono lavoro";
/* Tooltips */
"Create a new address book card" = "Crea un nuovo contatto";
"Create a new list" = "Crea una nuova lista";
"Edit the selected card" = "Modifica il contatto selezionato";
"Send a mail message" = "Invia un'email";
"Delete selected card or address book" = "Cancella il contatto selezionato";
"htmlMailFormat_UNKNOWN" = "Sconosciuto";
"htmlMailFormat_FALSE" = "Testo normale";
"htmlMailFormat_TRUE" = "HTML";
"Name or Email" = "Nome o indirizzo Email";
"Personal Addressbook" = "Rubrica personale";
"Search in Addressbook" = "Cerca nella rubrica";
"New Card" = "Nuovo contatto";
"New List" = "Nuova lista";
"Modify" = "Modifica";
"Sharing..." = "Condividi...";
"Write" = "Scrivi";
"Delete" = "Cancella";
"Instant Message" = "Messaggio istantaneo";
"Add..." = "Aggiungi...";
"Remove" = "Rimuovi";
"Preferred" = "Predefinito";
"Card for %@" = "Biglietto da visita di %@";
"Display:" = "Nome visualizzato:";
"Display Name:" = "Nome visualizzato:";
"Email:" = "Email:";
"Additional Email:" = "Email aggiuntiva:";
"Phone Number:" = "Numero di telefono:";
"Prefers to receive messages formatted as:"
= "Formato preferito per i messaggi di posta:";
"Screen Name:" = "Nome Instant Messenger:";
"Firstname:" = "Nome:";
"Lastname:" = "Cognome:";
"First:" = "Nome:";
"Last:" = "Cognome";
"Nickname:" = "Soprannome:";
"Telephone" = "Telefono";
"Work:" = "Lavoro:";
"Home:" = "Casa:";
"Fax:" = "Fax:";
"Mobile:" = "Cellulare:";
"Pager:" = "Cerca Persone:";
"Title:" = "Titolo:";
"Service:" = "Service:";
"Company:" = "Società:";
"Street Address:" = "Indirizzo:";
"Address:" = "Indirizzo:";
"City:" = "Città:";
"State_Province:" = "Provincia:";
"ZIP_Postal Code:" = "CAP:";
"Country:" = "Nazione:";
"Web:" = "Pagina Web:";
"Web Page:" = "Pagina Web:";
"Department:" = "Reparto:";
"Organization:" = "Società:";
"Work" = "Lavoro";
"Other Infos" = "Altre informazioni";
"Note:" = "Note:";
"Timezone:" = "Fuso orario:";
"Birthday:" = "Data di Nascita:";
"Freebusy URL:" = "Freebusy URL:";
"Add as..." = "Aggiungi come...";
"Recipient" = "Destinatario";
"Carbon Copy" = "Copia Carbone";
"Blind Carbon Copy" = "Copia Carbone Nascosta";
"New Addressbook..." = "Nuova rubrica...";
"Subscribe to an Addressbook..." = "Sottoscrivi una rubrica...";
"Remove the selected Addressbook" = "Rimuovi la rubrica selezionata";
"Name of the Address Book" = "Nome della rubrica";
"Are you sure you want to delete the selected address book?"
= "Sei sicuro di voler cancellare la rubrica selezionata?";
"Address Book Name" = "Nome della Rubrica";
"You cannot subscribe to a folder that you own!"
= "Non puoi sottoscrivere una cartella di cui sei proprietario!";
"Unable to subscribe to that folder!"
= "Non puoi sottoscrivere la cartella!";
"Default Roles" = "Permessi predefiniti";
"User rights for:" = "Permessi per:";
"This person can add cards to this addressbook."
= "Questa persona può aggiungere contatti a questa rubrica.";
"This person can edit the cards of this addressbook."
= "Questa persona può modificare i contatti di questa rubrica.";
"This person can list the content of this addressbook."
= "Questa persona può visualizzare i contenuti di questa rubrica.";
"This person can read the cards of this addressbook."
= "Questa persona può leggere i contatti di questa rubrica.";
"This person can erase cards from this addressbook."
= "Questa persona può eliminare contatti da questa rubrica.";
"The selected contact has no email address."
= "Il contatto selezionato non dispone di indirizzo email.";
"You cannot delete the selected contact(s)"
= "Non puoi eliminare il contatto selezionato.";
"Please select a contact." = "Per favore seleziona un contatto.";

3
UI/Contacts/Spanish.lproj/Localizable.strings
View File

@@ -42,9 +42,6 @@
"new" = "nuevo";
"Preferred Phone" = "Teléfono preferido";
/* Folders */
"Personal Address Book" = "Libreta personal de direcciones";
/* Tooltips */
"Create a new address book card" = "Añadir un nuevo contacto";

9
UI/Contacts/UIxContactsListViewContainer.m
View File

@@ -116,14 +116,7 @@
- (NSString *) currentContactFolderName
{
NSString *folderName, *defaultFolderName;
folderName = [currentFolder displayName];
defaultFolderName = [[currentFolder container] defaultFolderName];
if ([folderName isEqualToString: folderName])
folderName = [self labelForKey: folderName];
return folderName;
return [currentFolder displayName];
}
- (NSString *) currentContactFolderOwner