Merge branch 'master' into feature/addMissingStrings2

Conflicts:
	UI/AdministrationUI/English.lproj/Localizable.strings
	UI/PreferencesUI/English.lproj/Localizable.strings
	UI/Templates/PreferencesUI/UIxFilterEditor.wox

UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings

@@ -203,7 +203,7 @@
 
 /* Event+task categories */
 "category_none" = "Nenhum";
-"calendar_category_labels" = "Aniversário,Negócios,Ligações,Concorrência,Cliente,Favoritos,Acompanhamento,Presentes,Feriados,Idéias,Meeting,Problemas,Miscelânea,Pessoal,Projetos,Feriado público,Posição,Fornecedores,Viagem,Férias";
+"calendar_category_labels" = "Celebração Anual,Aniversário,Negócios,Ligações,Clientes,Concorrência,Comprador,Favoritos,Acompanhamento,Presentes,Feriados,Idéias,Reunião,Problemas,Miscelânea,Pessoal,Projetos,Feriado,Posição,Fornecedores,Viagem,Férias";
 
 /* Default module */
 "Calendar" = "Calendário";

UI/PreferencesUI/English.lproj/Localizable.strings

@@ -24,10 +24,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Enable vacation auto reply";
-"Auto reply message" ="Auto reply message";
-"Email addresses (separated by commas)" ="Email addresses (separated by commas)";
+"Auto reply message" = "Auto reply message";
+"Email addresses (separated by commas)" = "Email addresses (separated by commas)";
 "Add default email addresses" = "Add default email addresses";
-"Days between responses" ="Days between responses";
+"Days between responses" = "Days between responses";
 "Do not send responses to mailing lists" = "Do not send responses to mailing lists";
 "Disable auto reply on" = "Disable auto reply on";
 "Always send vacation message response" = "Always send vacation message response";
@@ -47,10 +47,10 @@
 
 
 /* d & t */
-"Current Time Zone" ="Current Time Zone";
-"Short Date Format" ="Short Date Format";
-"Long Date Format" ="Long Date Format";
-"Time Format" ="Time Format";
+"Current Time Zone" = "Current Time Zone";
+"Short Date Format" = "Short Date Format";
+"Long Date Format" = "Long Date Format";
+"Time Format" = "Time Format";
 
 "default" = "Default";
 "Default Module" = "Default Module";
@@ -98,15 +98,15 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on" ="Week begins on";
-"Day start time" ="Day start time";
-"Day end time" ="Day end time";
+"Week begins on" = "Week begins on";
+"Day start time" = "Day start time";
+"Day end time" = "Day end time";
 "Day start time must be prior to day end time." = "Day start time must be prior to day end time.";
 "Show time as busy outside working hours" = "Show time as busy outside working hours";
-"First week of year" ="First week of year";
+"First week of year" = "First week of year";
 "Enable reminders for Calendar items" = "Enable reminders for Calendar items";
 "Play a sound when a reminder comes due" = "Play a sound when a reminder comes due";
-"Default reminder" ="Default reminder";
+"Default reminder" = "Default reminder";
 
 "firstWeekOfYear_January1" = "Starts on january 1";
 "firstWeekOfYear_First4DayWeek" = "First 4-day week";
@@ -117,7 +117,7 @@
 "Contacts Names" = "Contacts Names";
 
 /* Default Calendar */
-"Default calendar" ="Default calendar";
+"Default calendar" = "Default calendar";
 "selectedCalendar" = "Selected calendar";
 "personalCalendar" = "Personal calendar";
 "firstCalendar" = "First enabled calendar";
@@ -200,8 +200,8 @@
 "Change" = "Change";
 
 /* Event+task classifications */
-"Default events classification" ="Default events classification";
-"Default tasks classification" ="Default tasks classification";
+"Default events classification" = "Default events classification";
+"Default tasks classification" = "Default tasks classification";
 "PUBLIC_item" = "Public";
 "CONFIDENTIAL_item" = "Confidential";
 "PRIVATE_item" = "Private";
@@ -222,9 +222,11 @@
 "Mail" = "Mail";
 "Last" = "Last used";
 "Default Module " = "Default Module";
-"SOGo Version" ="SOGo Version";
+"SOGo Version" = "SOGo Version";
 
-"Language" ="Language";
+/* Confirmation asked when changing the language */
+"Save preferences and reload page now?" = "Save preferences and reload page now?";
+"Language" = "Language";
 "choose" = "Choose ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -253,7 +255,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View" ="Refresh View";
+"Refresh View" = "Refresh View";
 "refreshview_manually" = "Manually";
 "refreshview_every_minute" = "Every minute";
 "refreshview_every_2_minutes" = "Every 2 minutes";
@@ -320,6 +322,9 @@
 "matches regex" = "matches regex";
 "does not match regex" = "does not match regex";
 
+/* Placeholder for the value field of a condition */
+"Value" = "Value";
+
 "Seen" = "Seen";
 "Deleted" = "Deleted";
 "Answered" = "Answered";
@@ -357,3 +362,10 @@
 "SSL" = "SSL";
 "TLS" = "TLS";
 
+/* Avatars */
+"Alternate Avatar" = "Alternate Avatar";
+"none" =  "None";
+"identicon" = "Ident Icon";
+"monsterid" = "Monster";
+"wavatar" = "Wavatar";
+"retro" = "Retro";

UI/PreferencesUI/UIxJSONPreferences.m

@@ -32,6 +32,7 @@
 #import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoUserProfile.h>
+#import <SOGo/WOResourceManager+SOGo.h>
 #import <Mailer/SOGoMailLabel.h>
 
 #import <SOGoUI/UIxComponent.h>
@@ -95,6 +96,9 @@ static SoProduct *preferencesProduct = nil;
   if (![[defaults source] objectForKey: @"SOGoRefreshViewCheck"])
     [[defaults source] setObject: [defaults refreshViewCheck]  forKey: @"SOGoRefreshViewCheck"];
 
+  if (![[defaults source] objectForKey: @"SOGoAlternateAvatar"])
+      [[defaults source] setObject: [defaults alternateAvatar]  forKey: @"SOGoAlternateAvatar"];
+
   //
   // Default Calendar preferences
   //

UI/PreferencesUI/UIxPreferences.m

@@ -169,6 +169,11 @@ static NSArray *reminderValues = nil;
   [super dealloc];
 }
 
+- (NSString *) modulePath
+{
+  return @"Preferences";
+}
+
 // - (void) setHasChanged: (BOOL) newHasChanged
 // {
 //   hasChanged = newHasChanged;
@@ -1375,6 +1380,18 @@ static NSArray *reminderValues = nil;
   return [self labelForKey: item];
 }
 
+- (NSArray *) alternateAvatar
+{
+  // See: https://en.gravatar.com/site/implement/images/
+  return [NSArray arrayWithObjects: @"none", @"identicon", @"monsterid", @"wavatar", @"retro", nil];
+}
+
+- (NSString *) itemAlternateAvatarText
+{
+  return [self labelForKey: item];
+}
+
+
 // - (NSString *) userDefaultModule
 // {
 //   NSString *userDefaultModule;
@@ -1466,15 +1483,15 @@ static NSArray *reminderValues = nil;
 //           if ([account updateFilters])
 //             // If Sieve is not enabled, the SOGoSieveManager will immediatly return a positive answer
 //             // See [SOGoSieveManager updateFiltersForAccount:withUsername:andPassword:]
-//             results = [self responseWithStatus: 200
+//             results = (id <WOActionResults>)[self responseWithStatus: 200
 //                          andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool:hasChanged], @"hasChanged", nil]];
 
 //           else
-//             results = [self responseWithStatus: 502
+//             results = (id <WOActionResults>)[self responseWithStatus: 502
 //                          andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: @"Connection error", @"textStatus", nil]];
 //         }
 //       else
-//         results = [self responseWithStatus: 503
+//         results = (id <WOActionResults>)[self responseWithStatus: 503
 //                      andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: @"Service temporarily unavailable", @"textStatus", nil]];
 //     }
 //   else
@@ -2086,6 +2103,10 @@ static NSArray *reminderValues = nil;
       // We convert our object into a mutable one
       v = [[v mutableCopy] autorelease];
 
+      if ([[v objectForKey: @"SOGoLoginModule"] isEqualToString: @"Last"])
+        [v setObject: [NSNumber numberWithBool: YES]  forKey: @"SOGoRememberLastModule"];
+      else
+        [v setObject: [NSNumber numberWithBool: NO]  forKey: @"SOGoRememberLastModule"];
 
       // We remove short/long date formats if they are default ones
       if ([[v objectForKey: @"SOGoShortDateFormat"] isEqualToString: @"default"])
@@ -2158,12 +2179,12 @@ static NSArray *reminderValues = nil;
               
               if (![account updateFilters])
                 {
-                  results = [self responseWithStatus: 502
+                  results = (id <WOActionResults>) [self responseWithStatus: 502
                            andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: @"Connection error", @"textStatus", nil]]; 
                 }
             }
           else
-            results = [self responseWithStatus: 503
+            results = (id <WOActionResults>) [self responseWithStatus: 503
                          andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: @"Service temporarily unavailable", @"textStatus", nil]];
         }
     }
@@ -2175,7 +2196,7 @@ static NSArray *reminderValues = nil;
     }
 
   if (!results)
-    results = [self responseWithStatus: 200];
+    results = (id <WOActionResults>) [self responseWithStatus: 200];
 
   return results;
 }