Fix for feature #3079

Monotone-Parent: 1de4349e78aa0e2e7b5b5f1107576ae89d90f64e
Monotone-Revision: 56b6e4ca9c570a4e36d00e32127d539e82da7293

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-11-05T17:26:02
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/GNUmakefile

@@ -57,7 +57,8 @@ SOGo_HEADER_FILES = \
 	NSDictionary+BSJSONAdditions.h	\
 	NSScanner+BSJSONAdditions.h	\
 	\
-	WORequest+SOGo.h
+	WORequest+SOGo.h		\
+	WOContext+SOGo.h
 
 #	SOGoCustomGroupFolder.m		\
 # 	SOGoGroupsFolder.m		\
@@ -101,7 +102,8 @@ SOGo_OBJC_FILES = \
 	NSDictionary+BSJSONAdditions.m	\
 	NSScanner+BSJSONAdditions.m	\
 	\
-	WORequest+SOGo.m
+	WORequest+SOGo.m		\
+	WOContext+SOGo.m
 
 SOGo_RESOURCE_FILES = \
 	DAVReportMap.plist

SoObjects/SOGo/WOContext+SOGo.h

@@ -0,0 +1,34 @@
+/* WOContext+SOGo.h - this file is part of SOGo
+ *
+ * Copyright (C) 2008 Inverse inc.
+ *
+ * Author: Francis Lachapelle <flachapelle@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef WOCONTEXT_SOGo_H
+#define WOCONTEXT_SOGo_H
+
+#import <NGObjWeb/WOContext.h>
+
+@interface WOContext (SOGoSOPEUtilities)
+
+- (NSArray *)resourceLookupLanguages;
+
+@end
+
+#endif /* WOcontext_SOGo_H */

SoObjects/SOGo/WOContext+SOGo.m

@@ -0,0 +1,53 @@
+/* WOContext+SOGo.m - this file is part of SOGo
+ *
+ * Copyright (C) 2008 Inverse inc.
+ *
+ * Author: Francis Lachapelle <flachapelle@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOSession.h>
+
+#import <SoObjects/SOGo/SOGoUser.h>
+
+#import "WOContext+SOGo.h"
+
+@implementation WOContext (SOGoSOPEUtilities)
+
+- (NSArray *) resourceLookupLanguages
+{
+  NSMutableArray *languages;
+  
+  languages = [NSMutableArray array];
+
+  if (activeUser && [activeUser language])
+    [languages addObject: [activeUser language]];
+  
+  if ([self hasSession])
+    [languages addObjectsFromArray: [[self session] languages]];
+  else
+    [languages addObjectsFromArray: [[self request] browserLanguages]];
+
+  return languages;
+}
+
+@end

SoObjects/SOGo/WORequest+SOGo.m

@@ -20,6 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 
 #import <NGObjWeb/SoObjectRequestHandler.h>