diff --git a/ChangeLog b/ChangeLog index b89517622..6fed7866f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2007-11-08 Wolfgang Sourdeau + * 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. diff --git a/SoObjects/Appointments/English.lproj/Localizable.strings b/SoObjects/Appointments/English.lproj/Localizable.strings deleted file mode 100644 index 95feda9fd..000000000 --- a/SoObjects/Appointments/English.lproj/Localizable.strings +++ /dev/null @@ -1 +0,0 @@ -"Personal Calendar" = "Personal Calendar"; diff --git a/SoObjects/Appointments/French.lproj/Localizable.strings b/SoObjects/Appointments/French.lproj/Localizable.strings deleted file mode 100644 index 11b333c2a..000000000 --- a/SoObjects/Appointments/French.lproj/Localizable.strings +++ /dev/null @@ -1 +0,0 @@ -"Personal Calendar" = "Agenda personnel"; diff --git a/SoObjects/Appointments/GNUmakefile b/SoObjects/Appointments/GNUmakefile index a6c0006df..99a7b1659 100644 --- a/SoObjects/Appointments/GNUmakefile +++ b/SoObjects/Appointments/GNUmakefile @@ -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 \ diff --git a/SoObjects/Appointments/German.lproj/Localizable.strings b/SoObjects/Appointments/German.lproj/Localizable.strings deleted file mode 100644 index 95feda9fd..000000000 --- a/SoObjects/Appointments/German.lproj/Localizable.strings +++ /dev/null @@ -1 +0,0 @@ -"Personal Calendar" = "Personal Calendar"; diff --git a/SoObjects/Contacts/English.lproj/Localizable.strings b/SoObjects/Contacts/English.lproj/Localizable.strings deleted file mode 100644 index 56404b013..000000000 --- a/SoObjects/Contacts/English.lproj/Localizable.strings +++ /dev/null @@ -1 +0,0 @@ -"Personal Address Book" = "Personal Address Book"; diff --git a/SoObjects/Contacts/French.lproj/Localizable.strings b/SoObjects/Contacts/French.lproj/Localizable.strings deleted file mode 100644 index af4d87c3a..000000000 --- a/SoObjects/Contacts/French.lproj/Localizable.strings +++ /dev/null @@ -1 +0,0 @@ -"Personal Address Book" = "Carnet d'adresses personnel"; diff --git a/SoObjects/Contacts/German.lproj/Localizable.strings b/SoObjects/Contacts/German.lproj/Localizable.strings deleted file mode 100644 index 95feda9fd..000000000 --- a/SoObjects/Contacts/German.lproj/Localizable.strings +++ /dev/null @@ -1 +0,0 @@ -"Personal Calendar" = "Personal Calendar"; diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings index 08044be83..f1dbba2ea 100644 --- a/UI/Contacts/English.lproj/Localizable.strings +++ b/UI/Contacts/English.lproj/Localizable.strings @@ -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"; diff --git a/UI/Contacts/French.lproj/Localizable.strings b/UI/Contacts/French.lproj/Localizable.strings index 5bf201634..cb2df47d5 100644 --- a/UI/Contacts/French.lproj/Localizable.strings +++ b/UI/Contacts/French.lproj/Localizable.strings @@ -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"; diff --git a/UI/Contacts/German.lproj/Localizable.strings b/UI/Contacts/German.lproj/Localizable.strings index 6d27d4e40..b220e74f2 100644 --- a/UI/Contacts/German.lproj/Localizable.strings +++ b/UI/Contacts/German.lproj/Localizable.strings @@ -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"; diff --git a/UI/Contacts/UIxContactsListViewContainer.m b/UI/Contacts/UIxContactsListViewContainer.m index f472b1560..23c2a5eb5 100644 --- a/UI/Contacts/UIxContactsListViewContainer.m +++ b/UI/Contacts/UIxContactsListViewContainer.m @@ -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 diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index 0324d2af2..dbc48efc5 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -87,6 +87,9 @@ "Reload Remote Calendars" = "Reload Remote Calendars"; "Properties" = "Properties"; +/* Folders */ +"Personal calendar" = "Personal calendar"; + /* Misc */ "OpenGroupware.org" = "OpenGroupware.org"; diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index 7acc16cad..f04263bb2 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -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"; diff --git a/UI/Scheduler/German.lproj/Localizable.strings b/UI/Scheduler/German.lproj/Localizable.strings index ff8d2f003..da5f595b2 100644 --- a/UI/Scheduler/German.lproj/Localizable.strings +++ b/UI/Scheduler/German.lproj/Localizable.strings @@ -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"; diff --git a/UI/Scheduler/UIxCalendarSelector.m b/UI/Scheduler/UIxCalendarSelector.m index 7fad6b0f3..e60fb6e13 100644 --- a/UI/Scheduler/UIxCalendarSelector.m +++ b/UI/Scheduler/UIxCalendarSelector.m @@ -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"];