From 4843c6b6d7f05e32047a27e1c6cd28a1912e615d Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 4 Jul 2014 08:55:35 -0400
Subject: [PATCH] Renamed Multi-Column to Multicolumn and refactored some code

---
 UI/Scheduler/English.lproj/Localizable.strings    |  1 -
 .../Toolbars/SOGoAppointmentFolders.toolbar       |  2 +-
 UI/Scheduler/UIxCalViewPrint.m                    | 15 +++++----------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index ecb4a9135..5ee1b3bd9 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -314,7 +314,6 @@
 
 "Repeat" = "Repeat";
 "Daily" = "Daily";
-"Multi-Columns" = "Multi-Columns";
 "Weekly" = "Weekly";
 "Monthly" = "Monthly";
 "Yearly" = "Yearly";
diff --git a/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar b/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar
index 14e5fcd5e..58bae28ab 100644
--- a/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar
+++ b/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar
@@ -22,7 +22,7 @@
       image = "day-view.png";
       tooltip = "Switch to day view"; },
     { link = "#";
-      label="Multi-Columns View";
+      label="Multicolumn Day View";
       onclick = "return onMulticolumnDayOverview();";
       image = "day-view-multicolumn.png";
       tooltip = "Switch to multi-columns day view"; },
diff --git a/UI/Scheduler/UIxCalViewPrint.m b/UI/Scheduler/UIxCalViewPrint.m
index d186ef4fa..eb432c02a 100644
--- a/UI/Scheduler/UIxCalViewPrint.m
+++ b/UI/Scheduler/UIxCalViewPrint.m
@@ -2,7 +2,6 @@
  *
  * Copyright (C) 2006-2014 Inverse inc.
  *
- *
  * 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)
@@ -38,7 +37,6 @@ static NSArray *layoutItems = nil;
     layoutItems = [NSArray arrayWithObjects: @"LIST", @"Daily", @"Multi-Columns", @"Weekly", nil];
     [layoutItems retain];
   }
-
 }
 
 - (id) init
@@ -53,12 +51,9 @@ static NSArray *layoutItems = nil;
   [item release];
 }
 
-/****************************************************************/
-/* Interfacing; populating the popup list for the print layouts */
-
 - (void) setItem: (NSString *) newItem
 {
-  ASSIGN (item, newItem);
+  ASSIGN(item, newItem);
 }
 
 - (NSString *) item
@@ -76,9 +71,12 @@ static NSArray *layoutItems = nil;
   return [self labelForKey: [NSString stringWithFormat: item]];
 }
 
+//
+// The objective here is to return the parent view layout and select the print
+// layout corresponding. Default print view: list view
+// 
 - (NSString *) parentPrintLayout
 {
-  // The objective here is to return the parent view layout and select the print layout corresponding. Default print view: list view
   SOGoUser *activeUser;
   NSString *parentView;
   
@@ -99,7 +97,4 @@ static NSArray *layoutItems = nil;
     return @"LIST";
 }
 
-/******************************************************************/
-/*  */
-
 @end