Monotone-Parent: 187fad3b4acd4bab3a2b6c286a0f9dc3789c5b83

Monotone-Revision: f37d0868145e5cd1f879ccf7033ca5d1900df42b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-06-23T14:23:18
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/Dutch.lproj/Localizable.strings

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

SoObjects/Appointments/English.lproj/Localizable.strings

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

SoObjects/Appointments/French.lproj/Localizable.strings

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

SoObjects/Appointments/GNUmakefile

@@ -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	\

SoObjects/Appointments/German.lproj/Localizable.strings

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

SoObjects/Appointments/Italian.lproj/Localizable.strings

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

SoObjects/Appointments/SOGoAppointmentFolders.m

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

SoObjects/Appointments/Spanish.lproj/Localizable.strings

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

SoObjects/Contacts/Dutch.lproj/Localizable.strings

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

SoObjects/Contacts/English.lproj/Localizable.strings

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

SoObjects/Contacts/French.lproj/Localizable.strings

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

SoObjects/Contacts/GNUmakefile

@@ -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/
 

SoObjects/Contacts/German.lproj/Localizable.strings

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

SoObjects/Contacts/Italian.lproj/Localizable.strings

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

SoObjects/Contacts/SOGoContactFolders.m

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

SoObjects/Contacts/Spanish.lproj/Localizable.strings

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

SoObjects/SOGo/SOGoObject.m

@@ -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;

SoObjects/SOGo/SOGoParentFolder.m

@@ -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)