amorfo77/sogo
1
0 Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-11 14:57:12 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: f9d7e117fe9d85a0017ebef4308d4c2f72289bbe

Browse Source 
Monotone-Revision: 191eb9f935e98a4702ae07ec1459e1cccd5b5f70

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-08T17:26:03
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2007-11-08 17:26:03 +00:00
1 parent 9f99c25961
commit 4460716f9a
16 files changed
+42 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ChangeLog
+7
View File
@@ -1,5 +1,12 @@
2007-11-08 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Scheduler/UIxCalendarSelector.m ([UIxCalendarSelector
-calendars]): same as below.
* UI/Contacts/UIxContactsListViewContainer.m
([UIxContactsListViewContainer -currentContactFolderName]):
translate the display name if its the default one.
* SoObjects/Appointments/SOGoAppointmentFolder.m
([SOGoAppointmentFolder -create]): overriden method that invokes
its ancestor and then activate itself within the user settings.
SoObjects/Appointments/English.lproj/Localizable.strings
-1
View File
@@ -1 +0,0 @@
"Personal Calendar" = "Personal Calendar";
SoObjects/Appointments/French.lproj/Localizable.strings
-1
View File
@@ -1 +0,0 @@
"Personal Calendar" = "Agenda personnel";
SoObjects/Appointments/GNUmakefile
-4
View File
@@ -6,10 +6,6 @@ WOBUNDLE_NAME = Appointments
Appointments_PRINCIPAL_CLASS = SOGoAppointmentsProduct
Appointments_LANGUAGES = English French German
Appointments_LOCALIZED_RESOURCE_FILES=Localizable.strings
Appointments_OBJC_FILES = \
Product.m \
NSArray+Appointments.m \
SoObjects/Appointments/German.lproj/Localizable.strings
-1
View File
@@ -1 +0,0 @@
"Personal Calendar" = "Personal Calendar";
SoObjects/Contacts/English.lproj/Localizable.strings
-1
View File
@@ -1 +0,0 @@
"Personal Address Book" = "Personal Address Book";
SoObjects/Contacts/French.lproj/Localizable.strings
-1
View File
@@ -1 +0,0 @@
"Personal Address Book" = "Carnet d'adresses personnel";
SoObjects/Contacts/German.lproj/Localizable.strings
-1
View File
@@ -1 +0,0 @@
"Personal Calendar" = "Personal Calendar";
UI/Contacts/English.lproj/Localizable.strings
+3
View File
@@ -32,6 +32,9 @@
"invalidemailwarn" = "invalidemailwarn";
"new" = "new";
/* Folders */
"Personal Address Book" = "Personal Address Book";
/* Tooltips */
"Create a new address book card" = "Create a new address book card";
UI/Contacts/French.lproj/Localizable.strings
+3
View File
@@ -39,6 +39,9 @@
"invalidemailwarn" = "Champ de l'email invalide, continuer quand même ?";
"new" = "Nouveau";
/* Folders */
"Personal Address Book" = "Carnet d'adresses personnel";
/* Tooltips */
"Create a new address book card" = "Créer une nouvelle fiche";
UI/Contacts/German.lproj/Localizable.strings
+3
View File
@@ -39,6 +39,9 @@
"invalidemailwarn" = "Champ de l'email invalide, continuer quand même ?";
"new" = "Neu";
/* Folders */
"Personal Address Book" = "Personal Address Book";
"htmlMailFormat_UNKNOWN" = "Unbekannt";
"htmlMailFormat_FALSE" = "Reintext";
"htmlMailFormat_TRUE" = "HTML";
UI/Contacts/UIxContactsListViewContainer.m
+8 -1
View File
@@ -95,7 +95,14 @@
- (NSString *) currentContactFolderName
{
return [currentFolder displayName];
NSString *folderName, *defaultFolderName;
folderName = [currentFolder displayName];
defaultFolderName = [[currentFolder container] defaultFolderName];
if ([folderName isEqualToString: folderName])
folderName = [self labelForKey: folderName];
return folderName;
}
- (NSString *) currentContactFolderOwner
UI/Scheduler/English.lproj/Localizable.strings
+3
View File
@@ -87,6 +87,9 @@
"Reload Remote Calendars" = "Reload Remote Calendars";
"Properties" = "Properties";
/* Folders */
"Personal calendar" = "Personal calendar";
/* Misc */
"OpenGroupware.org" = "OpenGroupware.org";
UI/Scheduler/French.lproj/Localizable.strings
+3
View File
@@ -88,6 +88,9 @@
"Reload Remote Calendars" = "Recharger les agendas distants";
"Properties" = "Propriétés";
/* Folders */
"Personal calendar" = "Agenda personnel";
/* Misc */
"OpenGroupware.org" = "OpenGroupware.org";
UI/Scheduler/German.lproj/Localizable.strings
+3 -1
View File
@@ -62,7 +62,6 @@
"this year" = "dieses Jahr";
/* Menu */
"Calendars" = "Kalenderliste";
@@ -77,6 +76,9 @@
"Reload Remote Calendars" = "Externe Kalender neu laden";
"Properties" = "Einstellungen";
/* Folders */
"Personal calendar" = "Personal calendar";
/* Misc */
"OpenGroupware.org" = "OpenGroupware.org";
UI/Scheduler/UIxCalendarSelector.m
+9 -6
View File
@@ -103,15 +103,17 @@ colorForNumber (unsigned int number)
- (NSArray *) calendars
{
NSArray *folders;
SOGoAppointmentFolders *co;
SOGoAppointmentFolder *folder;
NSMutableDictionary *calendar;
unsigned int count, max;
NSString *folderName;
NSString *folderName, *fDisplayName;
NSNumber *isActive;
if (!calendars)
{
folders = [[self clientObject] subFolders];
co = [self clientObject];
folders = [co subFolders];
max = [folders count];
calendars = [[NSMutableArray alloc] initWithCapacity: max];
for (count = 0; count < max; count++)
@@ -119,11 +121,12 @@ colorForNumber (unsigned int number)
folder = [folders objectAtIndex: count];
calendar = [NSMutableDictionary dictionary];
folderName = [folder nameInContainer];
[calendar setObject:
[NSString stringWithFormat: @"/%@", folderName]
fDisplayName = [folder displayName];
if ([fDisplayName isEqualToString: [co defaultFolderName]])
fDisplayName = [self labelForKey: fDisplayName];
[calendar setObject: [NSString stringWithFormat: @"/%@", folderName]
forKey: @"id"];
[calendar setObject: [folder displayName]
forKey: @"displayName"];
[calendar setObject: fDisplayName forKey: @"displayName"];
[calendar setObject: folderName forKey: @"folder"];
[calendar setObject: colorForNumber (count)
forKey: @"color"];