Monotone-Parent: 3bc573b09449f0efea891e5e11a232520f51205c

Monotone-Revision: 3188fd0271db42fb785221461e9a3655109f23a8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-20T19:15:26
Monotone-Branch: ca.inverse.sogo

UI/Scheduler/UIxComponentEditor.m

@@ -478,6 +478,21 @@
   return calendarList;
 }
 
+- (NSString *) calendarDisplayName
+{
+  NSString *fDisplayName;
+  SOGoAppointmentFolder *folder;
+  SOGoAppointmentFolders *parentFolder;
+
+  fDisplayName = [item displayName];
+  folder = [[self clientObject] container];
+  parentFolder = [folder container];
+  if ([fDisplayName isEqualToString: [parentFolder defaultFolderName]])
+    fDisplayName = [self labelForKey: fDisplayName];
+
+  return fDisplayName;
+}
+
 - (NSString *) calendarsFoldersList
 {
   NSArray *calendars;

UI/Templates/SchedulerUI/UIxComponentEditor.wox

@@ -47,7 +47,7 @@
             /><var:string label:value="Calendar:" />
           <var:popup const:id="calendarList"
 	    list="calendarList" item="item"
-            string="item.displayName"
+            string="calendarDisplayName"
 	    selection="componentCalendar"
 	    /></span></span>
       <span class="checkBoxList"><var:string label:value="Priority:" />