From: znek Date: Fri, 27 Aug 2004 16:23:27 +0000 (+0000) Subject: improved localization support X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c4751247d561e74b5b08c9be722c7988e2ace7f;p=scalable-opengroupware.org improved localization support git-svn-id: http://svn.opengroupware.org/SOGo/trunk@286 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj index 4985ef49..9fddc12e 100644 --- a/SOGo/SOGo.xcode/project.pbxproj +++ b/SOGo/SOGo.xcode/project.pbxproj @@ -130,6 +130,41 @@ tabWidth = 8; usesTabs = 1; }; + AD0137A406DF8875000910D8 = { + children = ( + AD73BE8806CF92FC00226A2D, + AD73BE8906CF92FC00226A2D, + E87208F70692E3D30099CBBD, + E87208F80692E3D30099CBBD, + E87208F90692E3D30099CBBD, + AD0137AC06DF891E000910D8, + AD0137AB06DF891E000910D8, + E87208F30692E3D30099CBBD, + E87208F40692E3D30099CBBD, + E87208FA0692E3D30099CBBD, + E87208FB0692E3D30099CBBD, + ); + isa = PBXGroup; + name = Appointment; + refType = 4; + sourceTree = ""; + }; + AD0137AB06DF891E000910D8 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = UIxAppointmentPrintview.wox; + refType = 4; + sourceTree = ""; + }; + AD0137AC06DF891E000910D8 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = UIxAppointmentPrintview.m; + refType = 4; + sourceTree = ""; + }; AD06608A06AC2F3F006525C9 = { children = ( AD06608B06AC2F3F006525C9, @@ -882,12 +917,15 @@ }; ADCDE53106ADA8AC00BFCE2B = { fileEncoding = 5; + indentWidth = 8; isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/default.strings; refType = 4; sourceTree = ""; + tabWidth = 8; + usesTabs = 1; }; ADCDE53206ADA8C800BFCE2B = { children = ( @@ -901,12 +939,15 @@ }; ADCDE53306ADA8CF00BFCE2B = { fileEncoding = 5; + indentWidth = 8; isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = French; path = French.lproj/default.strings; refType = 4; sourceTree = ""; + tabWidth = 8; + usesTabs = 1; }; ADDF4B3006DCEAC800C4E7F8 = { children = ( @@ -3339,20 +3380,13 @@ }; E8720A2B0692E4B40099CBBD = { children = ( - AD73BE8806CF92FC00226A2D, - AD73BE8906CF92FC00226A2D, - E87208F30692E3D30099CBBD, - E87208F40692E3D30099CBBD, - E87208F80692E3D30099CBBD, - E87208F90692E3D30099CBBD, - E87208FA0692E3D30099CBBD, - E87208FB0692E3D30099CBBD, E87208FC0692E3D30099CBBD, E87208FD0692E3D30099CBBD, E87208FE0692E3D30099CBBD, E87208FF0692E3D30099CBBD, E87209040692E3D30099CBBD, E87209050692E3D30099CBBD, + AD0137A406DF8875000910D8, AD73BEE206CFA17700226A2D, ADE2C28F06B7C7EA0065D56F, ADE2C29206B7C7F70065D56F, @@ -3370,7 +3404,6 @@ E87208E40692E3D30099CBBD, E87208F50692E3D30099CBBD, E87208F60692E3D30099CBBD, - E87208F70692E3D30099CBBD, E87209060692E3D30099CBBD, E87209070692E3D30099CBBD, AD5ED1AE06B1768900E3EC4B, diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index b0af0419..74e65c2d 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,3 +1,17 @@ +2004-08-27 Marcus Mueller + + * v0.9.74 + + * English.lproj/default.plist: more labels + + * UIxAppointmentView.wox: replaced static strings with labels + + * UIxAppointmentView.h, UIxCalView.h: exposed some methods + + * product.plist: added "printview" method to SOGoAppointmentObject + + * UIxAppointmentPrintview.[m|wox]: new printview for appointments + 2004-08-27 Helge Hess * UIxAppointmentEditor.m: prepared to share code with contact editor diff --git a/SOGo/UI/Scheduler/English.lproj/default.strings b/SOGo/UI/Scheduler/English.lproj/default.strings index 3f0bfe0b..b2a4d87d 100644 --- a/SOGo/UI/Scheduler/English.lproj/default.strings +++ b/SOGo/UI/Scheduler/English.lproj/default.strings @@ -2,109 +2,121 @@ /* Day */ -"Sunday" = "Sunday"; -"Monday" = "Monday"; -"Tuesday" = "Tuesday"; -"Wednesday" = "Wednesday"; -"Thursday" = "Thursday"; -"Friday" = "Friday"; -"Saturday" = "Saturday"; - -"a2_Sunday" = "Su"; -"a2_Monday" = "Mo"; -"a2_Tuesday" = "Tu"; -"a2_Wednesday" = "We"; -"a2_Thursday" = "Th"; -"a2_Friday" = "Fr"; -"a2_Saturday" = "Sa"; - -"dayLabelFormat" = "%Y-%m-%d"; -"today" = "today"; +"Sunday" = "Sunday"; +"Monday" = "Monday"; +"Tuesday" = "Tuesday"; +"Wednesday" = "Wednesday"; +"Thursday" = "Thursday"; +"Friday" = "Friday"; +"Saturday" = "Saturday"; + +"a2_Sunday" = "Su"; +"a2_Monday" = "Mo"; +"a2_Tuesday" = "Tu"; +"a2_Wednesday" = "We"; +"a2_Thursday" = "Th"; +"a2_Friday" = "Fr"; +"a2_Saturday" = "Sa"; + +"dayLabelFormat" = "%Y-%m-%d"; +"today" = "today"; /* Week */ -"Week" = "Week"; -"this week" = "this week"; - +"Week" = "Week"; +"this week" = "this week"; /* Month */ -"this month" = "this month"; - -"January" = "January"; -"February" = "February"; -"March" = "March"; -"April" = "April"; -"May" = "May"; -"June" = "June"; -"July" = "July"; -"August" = "August"; -"September" = "September"; -"October" = "October"; -"November" = "November"; -"December" = "December"; - -"a3_January" = "Jan"; -"a3_February" = "Feb"; -"a3_March" = "Mar"; -"a3_April" = "Apr"; -"a3_May" = "May"; -"a3_June" = "Jun"; -"a3_July" = "Jul"; -"a3_August" = "Aug"; -"a3_September" = "Sep"; -"a3_October" = "Oct"; -"a3_November" = "Nov"; -"a3_December" = "Dec"; +"this month" = "this month"; + +"January" = "January"; +"February" = "February"; +"March" = "March"; +"April" = "April"; +"May" = "May"; +"June" = "June"; +"July" = "July"; +"August" = "August"; +"September" = "September"; +"October" = "October"; +"November" = "November"; +"December" = "December"; + +"a3_January" = "Jan"; +"a3_February" = "Feb"; +"a3_March" = "Mar"; +"a3_April" = "Apr"; +"a3_May" = "May"; +"a3_June" = "Jun"; +"a3_July" = "Jul"; +"a3_August" = "Aug"; +"a3_September" = "Sep"; +"a3_October" = "Oct"; +"a3_November" = "Nov"; +"a3_December" = "Dec"; /* Year */ -"this year" = "this year"; - +"this year" = "this year"; /* Menu */ -"Calendar" = "Calendar"; -"Contacts" = "Contacts"; - +"Calendar" = "Calendar"; +"Contacts" = "Contacts"; /* Misc */ -"new" = "new"; -"printview" = "printview"; -"proposal" = "proposal"; -"Save" = "Save"; -"Cancel" = "Cancel"; -"OpenGroupware.org" = "OpenGroupware.org" +"OpenGroupware.org" = "OpenGroupware.org" -/* Appointments */ +/* Button titles */ + +"new" = "new"; +"printview" = "printview"; +"edit" = "edit"; +"delete" = "delete"; +"proposal" = "proposal"; +"Save" = "Save"; +"Cancel" = "Cancel"; -"Appointment editor" = "Appointment Editor"; -"Appointment proposal" = "Appointment Proposal"; -"Appointment on" = "Appointment on"; -"Start time" = "Start time"; -"End time" = "End time"; -"Start date" = "Start date"; -"End date" = "End date"; -"Earliest start time" = "Earliest start time"; -"Latest end time" = "Latest end time"; -"browse start date" = "browse start date"; -"browse end date" = "browse end date"; -"Title" = "Title"; -"Location" = "Location"; -"Duration" = "Duration"; -"Search participants" = "Search participants"; -"Participants" = "Participants"; -"Search resources" = "Search resources"; -"Resources" = "Resources"; -"Search appointments" = "Search appointments"; -"Search" = "Search"; -"Search in Anais" = "Search in Anaïs"; +/* Appointments */ +"Appointment viewer" = "Appointment Viewer"; +"Appointment editor" = "Appointment Editor"; +"Appointment proposal" = "Appointment Proposal"; +"Appointment on" = "Appointment on"; +"Start time" = "Start time"; +"End time" = "End time"; +"Start date" = "Start date"; +"End date" = "End date"; +"Earliest start time" = "Earliest start time"; +"Latest end time" = "Latest end time"; +"browse start date" = "browse start date"; +"browse end date" = "browse end date"; +"Title" = "Title"; +"Name" = "Name"; +"Email" = "Email"; +"Location" = "Location"; +"Duration" = "Duration"; +"Participants" = "Participants"; +"Resources" = "Resources"; +"Organizer" = "Organizer"; +"Comment" = "Comment"; + +"attributes" = "Attributes"; +"participants" = "Participants"; + +/* Searching */ + +"Search" = "Search"; +"Search participants" = "Search participants"; +"Search resources" = "Search resources"; +"Search appointments" = "Search appointments"; +"Search in Anais" = "Search in Anaïs"; /* calendar modes */ -"Overview" = "Overview"; -"Chart" = "Chart"; -"List" = "List"; -"Columns" = "Columns"; +"Overview" = "Overview"; +"Chart" = "Chart"; +"List" = "List"; +"Columns" = "Columns"; diff --git a/SOGo/UI/Scheduler/GNUmakefile b/SOGo/UI/Scheduler/GNUmakefile index bfe32458..95e30fab 100644 --- a/SOGo/UI/Scheduler/GNUmakefile +++ b/SOGo/UI/Scheduler/GNUmakefile @@ -37,6 +37,7 @@ SchedulerUI_OBJC_FILES = \ UIxCalYearOverview.m \ UIxCalInlineMonthOverview.m \ UIxAppointmentView.m \ + UIxAppointmentPrintview.m \ UIxAppointmentEditor.m \ UIxCalSelectTab.m \ UIxCalDateLabel.m \ @@ -67,6 +68,7 @@ SchedulerUI_RESOURCE_FILES += \ UIxCalYearOverview.wox \ UIxCalInlineMonthOverview.wox \ UIxAppointmentView.wox \ + UIxAppointmentPrintview.wox \ UIxAppointmentEditor.wox \ UIxCalSelectTab.wox \ UIxCalDateLabel.wox \ diff --git a/SOGo/UI/Scheduler/UIxAppointmentPrintview.m b/SOGo/UI/Scheduler/UIxAppointmentPrintview.m new file mode 100644 index 00000000..5ea44f1a --- /dev/null +++ b/SOGo/UI/Scheduler/UIxAppointmentPrintview.m @@ -0,0 +1,41 @@ +/* + Copyright (C) 2000-2004 SKYRIX Software AG + + This file is part of OGo + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo 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 Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ +// $Id$ + + +#include "UIxAppointmentView.h" + + +@interface UIxAppointmentPrintview : UIxAppointmentView +{ +} + +@end + +#include "common.h" + +@implementation UIxAppointmentPrintview + +- (NSString *)title { + return [[self dateFormatter] stringForObjectValue:[self startTime]]; +} + +@end diff --git a/SOGo/UI/Scheduler/UIxAppointmentPrintview.wox b/SOGo/UI/Scheduler/UIxAppointmentPrintview.wox new file mode 100644 index 00000000..22e961ac --- /dev/null +++ b/SOGo/UI/Scheduler/UIxAppointmentPrintview.wox @@ -0,0 +1,114 @@ + + + + + + + + + + + + +
+

+
+ + + + + + + + + + +
+ : + + +
+ : + + +
+
+ + + + + + + + + + + + + + + + + + + + + +
+ : + + +
+ : + + +
+ : + + +
+ : + + +
+ : + + +
+ + + + + + + + + + + +
+ + + +
+ + + +
+
+ diff --git a/SOGo/UI/Scheduler/UIxAppointmentView.h b/SOGo/UI/Scheduler/UIxAppointmentView.h index c068b5b7..cdb962fa 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentView.h +++ b/SOGo/UI/Scheduler/UIxAppointmentView.h @@ -5,7 +5,7 @@ #include -@class SOGoDateFormatter; +@class SOGoDateFormatter, NSCalendarDate; @interface UIxAppointmentView : UIxComponent { @@ -17,6 +17,10 @@ - (id)appointment; +- (SOGoDateFormatter *)dateFormatter; +- (NSCalendarDate *)startTime; +- (NSCalendarDate *)endTime; + - (NSString *)attributesTabLink; - (NSString *)participantsTabLink; diff --git a/SOGo/UI/Scheduler/UIxAppointmentView.wox b/SOGo/UI/Scheduler/UIxAppointmentView.wox index eacc6e78..73419b81 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentView.wox +++ b/SOGo/UI/Scheduler/UIxAppointmentView.wox @@ -7,22 +7,23 @@ title="name" > - - - + + + - - +
- - - - - -
- Appointment Viewer - -
-
+ + + + + +
+ + +
+
+
@@ -36,56 +37,58 @@
- printview + target="SOGoPrintView" + > - edit + - delete +
- - - - - - - - - - - - - + + + - - - + +
- Title: - - - - -
- Location: - - +
+ + + + + + + + + - -
+ : + + +
+ : + - -
-
+
+ + + + - - - - - - - - - -
- Start time: + + : - - - + +
- End time: + + : - - - + +
- Resources: + + : - - - + +
- Organizer: + + : - - - + +
- Comment: + + : - - - + +
- - - - - - - - - - - -
- Name - - Email -
- - - - - - - -
+ var:href="participantsTabLink" + > + + + + + + + + + + + +
+ + + +
+ + + +

MsgClass:
- +
As iCal:
- +
As Mail:
- + - - + + diff --git a/SOGo/UI/Scheduler/UIxCalView.h b/SOGo/UI/Scheduler/UIxCalView.h index 603ab29a..03bbd987 100644 --- a/SOGo/UI/Scheduler/UIxCalView.h +++ b/SOGo/UI/Scheduler/UIxCalView.h @@ -75,6 +75,10 @@ - (NSDictionary *)todayQueryParameters; - (NSDictionary *)currentDayQueryParameters; +/* calendarUIDs */ + +- (NSString *)formattedCalendarUIDs; + @end #endif /* __SOGo_UIxCalView_H__ */ diff --git a/SOGo/UI/Scheduler/product.plist b/SOGo/UI/Scheduler/product.plist index 8305b198..15e52646 100644 --- a/SOGo/UI/Scheduler/product.plist +++ b/SOGo/UI/Scheduler/product.plist @@ -100,6 +100,10 @@ SOGoAppointmentObject = { methods = { + printview = { + protectedBy = "View"; + pageName = "UIxAppointmentPrintview"; + }; view = { protectedBy = "View"; pageName = "UIxAppointmentView";