merge of 'bc27fcec7009f89be6225808b581d3967066dfac'

and 'e41ab0579999c2bec5931b07e24575fdd3352c01'

Monotone-Parent: bc27fcec7009f89be6225808b581d3967066dfac
Monotone-Parent: e41ab0579999c2bec5931b07e24575fdd3352c01
Monotone-Revision: 132b2ba750acac2321a05f595c90612251cc2660

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-10T20:58:11
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-11-10 20:58:11 +00:00
11 changed files with 36 additions and 45 deletions
-14
View File
@@ -1,14 +0,0 @@
# $Id: README 297 2004-09-07 19:51:33Z znek $
UI
==
The UI directory contains HTML view methods for the SOPE SoObjects.
Localization
============
Each bundle has its own set of localization files, contained in a language
project directory (i.e. English.lproj). Because of this fact it might be
possible that you have to localize a certain label more than once.
-7
View File
@@ -1,7 +0,0 @@
Defaults
========
Name Value Synopsis
------------------------------------------------------------------------------
SOGoUIxDebugEnabled BOOL Trigger display of debug UI. Default is NO.
+5 -4
View File
@@ -206,13 +206,14 @@
recipient = [[SOGoUserManager sharedUserManager]
getFullEmailForUID: recipientUID];
#warning SOPE is just plain stupid here - if you change the case of keys, it will break the encoding of fields
headerMap = [NGMutableHashMap hashMapWithCapacity: 5];
[headerMap setObject: @"multipart/alternative" forKey: @"content-type"];
[headerMap setObject: fullMail forKey: @"From"];
[headerMap setObject: recipient forKey: @"To"];
[headerMap setObject: fullMail forKey: @"from"];
[headerMap setObject: recipient forKey: @"to"];
date = [[NSCalendarDate date] rfc822DateString];
[headerMap setObject: date forKey: @"Date"];
[headerMap setObject: [self subject] forKey: @"Subject"];
[headerMap setObject: date forKey: @"date"];
[headerMap setObject: [self subject] forKey: @"subject"];
message = [NGMimeMessage messageWithHeader: headerMap];
body = [[NGMimeMultipartBody alloc] initWithPart: message];
+5 -4
View File
@@ -185,13 +185,14 @@
recipient = [[SOGoUserManager sharedUserManager]
getFullEmailForUID: recipientUID];
#warning SOPE is just plain stupid here - if you change the case of keys, it will break the encoding of fields
headerMap = [NGMutableHashMap hashMapWithCapacity: 5];
[headerMap setObject: @"multipart/alternative" forKey: @"content-type"];
[headerMap setObject: fullMail forKey: @"From"];
[headerMap setObject: recipient forKey: @"To"];
[headerMap setObject: fullMail forKey: @"from"];
[headerMap setObject: recipient forKey: @"to"];
date = [[NSCalendarDate date] rfc822DateString];
[headerMap setObject: date forKey: @"Date"];
[headerMap setObject: [self subject] forKey: @"Subject"];
[headerMap setObject: date forKey: @"date"];
[headerMap setObject: [self subject] forKey: @"subject"];
message = [NGMimeMessage messageWithHeader: headerMap];
body = [[NGMimeMultipartBody alloc] initWithPart: message];
+3 -3
View File
@@ -18,12 +18,12 @@
<p class="browser"><a href="http://www.getfirefox.com/"><var:string label:value="Download"/> Firefox</a> <img const:alt="*" rsrc:src="browser_firefox.gif" /></p>
<var:if condition="isIE7Compatible">
<p><var:string label:value="alternativeBrowsers"/></p>
<p class="browser"><a href="http://www.microsoft.com/ie/download/"><var:string label:value="Download"/> Internet Explorer 7</a> <img const:alt="*" rsrc:src="browser_ie.gif" valign="middle" /></p>
<p class="browser"><a href="http://www.apple.com/safari/download/"><var:string label:value="Download"/> Safari 3</a> <img const:alt="*" rsrc:src="browser_safari.gif" valign="middle" /></p>
<p class="browser"><a href="http://www.microsoft.com/ie/download/"><var:string label:value="Download"/> Internet Explorer 8</a> <img const:alt="*" rsrc:src="browser_ie.gif" valign="middle" /></p>
<p class="browser"><a href="http://www.apple.com/safari/download/"><var:string label:value="Download"/> Safari 4</a> <img const:alt="*" rsrc:src="browser_safari.gif" valign="middle" /></p>
</var:if>
<var:if condition="isMac">
<p><var:string label:value="alternativeBrowserSafari"/></p>
<p class="browser"><a href="http://www.apple.com/safari/download/"><var:string label:value="Download"/> Safari 3</a> <img const:alt="*" rsrc:src="browser_safari.gif" valign="middle" /></p>
<p class="browser"><a href="http://www.apple.com/safari/download/"><var:string label:value="Download"/> Safari 4</a> <img const:alt="*" rsrc:src="browser_safari.gif" valign="middle" /></p>
</var:if>
</td>
</tr>