diff --git a/NEWS b/NEWS index 8d2204d4c..dabdddc3b 100644 --- a/NEWS +++ b/NEWS @@ -12,10 +12,11 @@ New features Enhancements - we now automatically convert into file attachments using CIDs. This prevents Outlook issues. - - updated Finnish translation + - updated French and Finnish translations - XMLHttpRequest.js is now loaded conditionaly (< IE9) - format time in attendees invitation window according to the user's locale - improved IE11 support + - respect signature placement when forwarding a message Bug fixes - don't load 'background' attribute (#2437) @@ -27,7 +28,7 @@ Enhancements - updated CKEditor to version 4.3.0 and added tab module Bug fixes - - HTML formatting is now retained when forwarding/replying to a mail using the HTML editor. + - HTML formatting is now retained when forwarding/replying to a mail using the HTML editor - put the text part before the HTML part when composing mail to fix a display issue with Thunderbird (#2512) 2.1.1a (2013-11-22) diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index 21870220c..5074294dd 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -889,7 +889,6 @@ static NSString *userAgent = nil; NSDictionary *info, *attachment; NSString *signature, *nl; SOGoUserDefaults *ud; - BOOL asInline; [sourceMail fetchCoreInfos]; @@ -907,10 +906,9 @@ static NSString *userAgent = nil; /* attach message */ ud = [[context activeUser] userDefaults]; - asInline = [[ud mailMessageForwarding] isEqualToString: @"inline"]; - if (asInline) + if ([[ud mailMessageForwarding] isEqualToString: @"inline"]) { - [self setText: [sourceMail contentForReply]]; + [self setText: [sourceMail contentForInlineForward]]; [self _fetchAttachmentsFromMail: sourceMail]; } else @@ -921,7 +919,7 @@ static NSString *userAgent = nil; if ([signature length]) { nl = (isHTML ? @"
" : @"\n"); - [self setText: [NSString stringWithFormat: @"%@-- %@%@", nl, nl, signature]]; + [self setText: [NSString stringWithFormat: @"%@%@-- %@%@", nl, nl, nl, signature]]; } attachment = [NSDictionary dictionaryWithObjectsAndKeys: [sourceMail filenameForForward], @"filename", @@ -933,10 +931,9 @@ static NSString *userAgent = nil; [self storeInfo]; - if (!asInline) - // When the user has chosen to forward messages as attachment, immediately save the message - // to the IMAP store so the user can eventually view the attached file from the Web interface - [self save]; + // Save the message to the IMAP store so the user can eventually view the attached file(s) + // from the Web interface + [self save]; } /* accessors */ diff --git a/SoObjects/Mailer/SOGoMailArabicForward.wo/SOGoMailArabicForward.html b/SoObjects/Mailer/SOGoMailArabicForward.wo/SOGoMailArabicForward.html index 379fc9c16..e942dd79d 100644 --- a/SoObjects/Mailer/SOGoMailArabicForward.wo/SOGoMailArabicForward.html +++ b/SoObjects/Mailer/SOGoMailArabicForward.wo/SOGoMailArabicForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- الرسالة الاصلية --------<#newLine/> الموضوع: <#subject/><#newLine/> التاريخ: <#date/><#newLine/> @@ -9,5 +10,7 @@ <#hasCc>CC: <#cc/><#hasNewsGroups>مجموعات الأخبار: <#newsgroups/><#hasReferences>المراجع: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailArabicForward.wo/SOGoMailArabicForward.wod b/SoObjects/Mailer/SOGoMailArabicForward.wo/SOGoMailArabicForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailArabicForward.wo/SOGoMailArabicForward.wod +++ b/SoObjects/Mailer/SOGoMailArabicForward.wo/SOGoMailArabicForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.html b/SoObjects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.html index 595e8aefb..75b423fe1 100644 --- a/SoObjects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.html +++ b/SoObjects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.html @@ -1,10 +1,16 @@ --------- Original Message -------- -Assunto: <#subject/> -Data: <#date/> -De: <#from/> -<#hasReplyTo>Responder-Para: <#replyTo/><#hasOrganization>Organização: <#organization/>Para: <#to/> -<#hasCc>CC: <#cc/><#hasNewsGroups>Newsgroups: <#newsgroups/><#hasReferences>Referências: <#references/> - -<#messageBody/> - -<#signature/> +<#newLine/> +<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> +-------- Original Message --------<#newLine/> +Assunto: <#subject/><#newLine/> +Data: <#date/><#newLine/> +De: <#from/><#newLine/> +<#hasReplyTo>Responder-Para: <#replyTo/><#hasOrganization>Organização: <#organization/>Para: <#to/><#newLine/> +<#hasCc>CC: <#cc/><#hasNewsGroups>Newsgroups: <#newsgroups/><#hasReferences>Referências: <#references/><#newLine/> +<#newLine/> +<#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> +<#newLine/> diff --git a/SoObjects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.wod b/SoObjects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.wod index df237286f..9afd448d9 100644 --- a/SoObjects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.wod +++ b/SoObjects/Mailer/SOGoMailBrazilianPortugueseForward.wo/SOGoMailBrazilianPortugueseForward.wod @@ -72,3 +72,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.html b/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.html index f8b141ae2..ef3b83e17 100644 --- a/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.html +++ b/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Original Message --------<#newLine/> Subject: <#subject/><#newLine/> Date: <#date/><#newLine/> @@ -9,5 +10,7 @@ From: <#from/><#newLine/> <#hasCc>CC: <#cc/><#hasNewsGroups>Newsgroups: <#newsgroups/><#hasReferences>References: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.wod b/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.wod +++ b/SoObjects/Mailer/SOGoMailCatalanForward.wo/SOGoMailCatalanForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailCzechForward.wo/SOGoMailCzechForward.html b/SoObjects/Mailer/SOGoMailCzechForward.wo/SOGoMailCzechForward.html index 37d17d8b9..a551d66ce 100644 --- a/SoObjects/Mailer/SOGoMailCzechForward.wo/SOGoMailCzechForward.html +++ b/SoObjects/Mailer/SOGoMailCzechForward.wo/SOGoMailCzechForward.html @@ -1,10 +1,16 @@ --------- Původní zpráva -------- -Předmět: <#subject/> -Datum: <#date/> -Od: <#from/> -<#hasReplyTo>Odpověď na: <#replyTo/><#hasOrganization>Organizace: <#organization/>Komu: <#to/> -<#hasCc>Kopie: <#cc/><#hasNewsGroups>Diskuzní skupiny: <#newsgroups/><#hasReferences>Odkazy: <#references/> - -<#messageBody/> - -<#signature/> +<#newLine/> +<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> +-------- Původní zpráva --------<#newLine/> +Předmět: <#subject/><#newLine/> +Datum: <#date/><#newLine/> +Od: <#from/><#newLine/> +<#hasReplyTo>Odpověď na: <#replyTo/><#hasOrganization>Organizace: <#organization/>Komu: <#to/><#newLine/> +<#hasCc>Kopie: <#cc/><#hasNewsGroups>Diskuzní skupiny: <#newsgroups/><#hasReferences>Odkazy: <#references/><#newLine/> +<#newLine/> +<#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> +<#newLine/> diff --git a/SoObjects/Mailer/SOGoMailCzechForward.wo/SOGoMailCzechForward.wod b/SoObjects/Mailer/SOGoMailCzechForward.wo/SOGoMailCzechForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailCzechForward.wo/SOGoMailCzechForward.wod +++ b/SoObjects/Mailer/SOGoMailCzechForward.wo/SOGoMailCzechForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailDanishForward.wo/SOGoMailDanishForward.html b/SoObjects/Mailer/SOGoMailDanishForward.wo/SOGoMailDanishForward.html index f8b141ae2..ef3b83e17 100644 --- a/SoObjects/Mailer/SOGoMailDanishForward.wo/SOGoMailDanishForward.html +++ b/SoObjects/Mailer/SOGoMailDanishForward.wo/SOGoMailDanishForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Original Message --------<#newLine/> Subject: <#subject/><#newLine/> Date: <#date/><#newLine/> @@ -9,5 +10,7 @@ From: <#from/><#newLine/> <#hasCc>CC: <#cc/><#hasNewsGroups>Newsgroups: <#newsgroups/><#hasReferences>References: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailDanishForward.wo/SOGoMailDanishForward.wod b/SoObjects/Mailer/SOGoMailDanishForward.wo/SOGoMailDanishForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailDanishForward.wo/SOGoMailDanishForward.wod +++ b/SoObjects/Mailer/SOGoMailDanishForward.wo/SOGoMailDanishForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.html b/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.html index f8b141ae2..ef3b83e17 100644 --- a/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.html +++ b/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Original Message --------<#newLine/> Subject: <#subject/><#newLine/> Date: <#date/><#newLine/> @@ -9,5 +10,7 @@ From: <#from/><#newLine/> <#hasCc>CC: <#cc/><#hasNewsGroups>Newsgroups: <#newsgroups/><#hasReferences>References: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.wod b/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.wod +++ b/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.html b/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.html index f8b141ae2..ef3b83e17 100644 --- a/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.html +++ b/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Original Message --------<#newLine/> Subject: <#subject/><#newLine/> Date: <#date/><#newLine/> @@ -9,5 +10,7 @@ From: <#from/><#newLine/> <#hasCc>CC: <#cc/><#hasNewsGroups>Newsgroups: <#newsgroups/><#hasReferences>References: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.wod b/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.wod index 7787fa18e..96bb247ee 100644 --- a/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.wod +++ b/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.wod @@ -77,3 +77,21 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailFinnishForward.wo/SOGoMailFinnishForward.html b/SoObjects/Mailer/SOGoMailFinnishForward.wo/SOGoMailFinnishForward.html index eddf96b46..562258b27 100644 --- a/SoObjects/Mailer/SOGoMailFinnishForward.wo/SOGoMailFinnishForward.html +++ b/SoObjects/Mailer/SOGoMailFinnishForward.wo/SOGoMailFinnishForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Alkuperäinen viesti --------<#newLine/> Aihe: <#subject/><#newLine/> Pvm: <#date/><#newLine/> @@ -9,5 +10,7 @@ Keneltä: <#from/><#newLine/> <#hasCc>Kopio: <#cc/><#hasNewsGroups>Uutisryhmät: <#newsgroups/><#hasReferences>Viitteet: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailFinnishForward.wo/SOGoMailFinnishForward.wod b/SoObjects/Mailer/SOGoMailFinnishForward.wo/SOGoMailFinnishForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailFinnishForward.wo/SOGoMailFinnishForward.wod +++ b/SoObjects/Mailer/SOGoMailFinnishForward.wo/SOGoMailFinnishForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailForward.h b/SoObjects/Mailer/SOGoMailForward.h index a330a033a..54dc5f63b 100644 --- a/SoObjects/Mailer/SOGoMailForward.h +++ b/SoObjects/Mailer/SOGoMailForward.h @@ -31,9 +31,12 @@ NSString *field; NSString *currentValue; BOOL htmlComposition; + NSString *signaturePlacement; } - (void) setSourceMail: (SOGoMailObject *) newSourceMail; +- (void) setSignaturePlacement: (NSString *) newPlacement; +- (BOOL) signaturePlacementOnTop; @end diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m index ad7f12c23..2de3a64c1 100644 --- a/SoObjects/Mailer/SOGoMailForward.m +++ b/SoObjects/Mailer/SOGoMailForward.m @@ -56,6 +56,16 @@ [super dealloc]; } +- (void) setSignaturePlacement: (NSString *) newPlacement +{ + signaturePlacement = newPlacement; +} + +- (BOOL) signaturePlacementOnTop +{ + return [signaturePlacement isEqual: @"above"]; +} + - (void) setSourceMail: (SOGoMailObject *) newSourceMail { ASSIGN (sourceMail, newSourceMail); diff --git a/SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.html b/SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.html index b7e19d1ee..dfe8cc948 100644 --- a/SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.html +++ b/SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Message original --------<#newLine/> Sujet: <#subject/><#newLine/> Date: <#date/><#newLine/> @@ -9,5 +10,7 @@ De: <#from/><#newLine/> <#hasCc>Copie: <#cc/><#hasNewsGroups>Forums de discussion: <#newsgroups/><#hasReferences>Références: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.wod b/SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.wod +++ b/SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html b/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html index e85ff84e1..9c0965b44 100644 --- a/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html +++ b/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Original-Nachricht --------<#newLine/> Betreff: <#subject/><#newLine/> Datum: <#date/><#newLine/> @@ -9,5 +10,7 @@ Von: <#from/><#newLine/> <#hasCc>Kopie: <#cc/><#hasNewsGroups>Newsgroup: <#newsgroups/><#hasReferences>Referenzen: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.wod b/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.wod +++ b/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailHungarianForward.wo/SOGoMailHungarianForward.html b/SoObjects/Mailer/SOGoMailHungarianForward.wo/SOGoMailHungarianForward.html index 150f7de03..89425fbd2 100644 --- a/SoObjects/Mailer/SOGoMailHungarianForward.wo/SOGoMailHungarianForward.html +++ b/SoObjects/Mailer/SOGoMailHungarianForward.wo/SOGoMailHungarianForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Eredeti üzenet --------<#newLine/> Tárgy: <#subject/><#newLine/> Dátum: <#date/><#newLine/> @@ -9,5 +10,7 @@ Feladó: <#from/><#newLine/> <#hasCc>Másolat: <#cc/><#hasNewsGroups>Hírcsoportok: <#newsgroups/><#hasReferences>Hivatkozások: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailHungarianForward.wo/SOGoMailHungarianForward.wod b/SoObjects/Mailer/SOGoMailHungarianForward.wo/SOGoMailHungarianForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailHungarianForward.wo/SOGoMailHungarianForward.wod +++ b/SoObjects/Mailer/SOGoMailHungarianForward.wo/SOGoMailHungarianForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.html b/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.html index ab729ce4e..d9aaf9248 100644 --- a/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.html +++ b/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Upprunalegt bréf --------<#newLine/> Efni: <#subject/><#newLine/> Dags: <#date/><#newLine/> @@ -9,5 +10,7 @@ Frá: <#from/><#newLine/> <#hasCc>Afrit: <#cc/><#hasNewsGroups>Fréttahópar: <#newsgroups/><#hasReferences>Tilvísanir: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.wod b/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.wod +++ b/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.html b/SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.html index 8f7c009a3..d50ff360c 100644 --- a/SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.html +++ b/SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Messaggio originale --------<#newLine/> Oggetto: <#subject/><#newLine/> Data: <#date/><#newLine/> @@ -9,5 +10,7 @@ Da: <#from/><#newLine/> <#hasCc>CC: <#cc/><#hasNewsGroups>Newsgroups: <#newsgroups/><#hasReferences>Riferimento: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.wod b/SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.wod index add34bf51..6bd3f55a2 100644 --- a/SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.wod +++ b/SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailNorwegianBokmalForward.wo/SOGoMailNorwegianBokmalForward.html b/SoObjects/Mailer/SOGoMailNorwegianBokmalForward.wo/SOGoMailNorwegianBokmalForward.html index e630e89f0..4c293b941 100644 --- a/SoObjects/Mailer/SOGoMailNorwegianBokmalForward.wo/SOGoMailNorwegianBokmalForward.html +++ b/SoObjects/Mailer/SOGoMailNorwegianBokmalForward.wo/SOGoMailNorwegianBokmalForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Originalpost --------<#newLine/> Emne: <#subject/><#newLine/> Dato: <#date/><#newLine/> @@ -9,5 +10,7 @@ Fra: <#from/><#newLine/> <#hasCc>Kopi: <#cc/><#hasNewsGroups>Nyhetsgrupper: <#newsgroups/><#hasReferences>Referanser: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailNorwegianBokmalForward.wo/SOGoMailNorwegianBokmalForward.wod b/SoObjects/Mailer/SOGoMailNorwegianBokmalForward.wo/SOGoMailNorwegianBokmalForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailNorwegianBokmalForward.wo/SOGoMailNorwegianBokmalForward.wod +++ b/SoObjects/Mailer/SOGoMailNorwegianBokmalForward.wo/SOGoMailNorwegianBokmalForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailNorwegianNynorskForward.wo/SOGoMailNorwegianNynorskForward.html b/SoObjects/Mailer/SOGoMailNorwegianNynorskForward.wo/SOGoMailNorwegianNynorskForward.html index e630e89f0..4c293b941 100644 --- a/SoObjects/Mailer/SOGoMailNorwegianNynorskForward.wo/SOGoMailNorwegianNynorskForward.html +++ b/SoObjects/Mailer/SOGoMailNorwegianNynorskForward.wo/SOGoMailNorwegianNynorskForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Originalpost --------<#newLine/> Emne: <#subject/><#newLine/> Dato: <#date/><#newLine/> @@ -9,5 +10,7 @@ Fra: <#from/><#newLine/> <#hasCc>Kopi: <#cc/><#hasNewsGroups>Nyhetsgrupper: <#newsgroups/><#hasReferences>Referanser: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailNorwegianNynorskForward.wo/SOGoMailNorwegianNynorskForward.wod b/SoObjects/Mailer/SOGoMailNorwegianNynorskForward.wo/SOGoMailNorwegianNynorskForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailNorwegianNynorskForward.wo/SOGoMailNorwegianNynorskForward.wod +++ b/SoObjects/Mailer/SOGoMailNorwegianNynorskForward.wo/SOGoMailNorwegianNynorskForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailObject+Draft.m b/SoObjects/Mailer/SOGoMailObject+Draft.m index 4d536b015..8b0b041fc 100644 --- a/SoObjects/Mailer/SOGoMailObject+Draft.m +++ b/SoObjects/Mailer/SOGoMailObject+Draft.m @@ -256,16 +256,17 @@ // - (NSString *) contentForInlineForward { - SOGoUserDefaults *ud; + SOGoUserDefaults *userDefaults; NSString *pageName; SOGoMailForward *page; - ud = [[context activeUser] userDefaults]; + userDefaults = [[context activeUser] userDefaults]; pageName = [NSString stringWithFormat: @"SOGoMail%@Forward", - [ud language]]; + [userDefaults language]]; page = [[WOApplication application] pageWithName: pageName inContext: context]; [page setSourceMail: self]; + [page setSignaturePlacement: [userDefaults mailSignaturePlacement]]; return [[page generateResponse] contentAsString]; } diff --git a/SoObjects/Mailer/SOGoMailPolishForward.wo/SOGoMailPolishForward.html b/SoObjects/Mailer/SOGoMailPolishForward.wo/SOGoMailPolishForward.html index 0b2851965..7beabc8df 100644 --- a/SoObjects/Mailer/SOGoMailPolishForward.wo/SOGoMailPolishForward.html +++ b/SoObjects/Mailer/SOGoMailPolishForward.wo/SOGoMailPolishForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Oryginalna wiadomość --------<#newLine/> Temat: <#subject/><#newLine/> Data: <#date/><#newLine/> @@ -9,5 +10,7 @@ Od: <#from/><#newLine/> <#hasCc>DW: <#cc/><#hasNewsGroups>Grupy dyskusyjne: <#newsgroups/><#hasReferences>Odniesienia: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailPolishForward.wo/SOGoMailPolishForward.wod b/SoObjects/Mailer/SOGoMailPolishForward.wo/SOGoMailPolishForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailPolishForward.wo/SOGoMailPolishForward.wod +++ b/SoObjects/Mailer/SOGoMailPolishForward.wo/SOGoMailPolishForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailReply.h b/SoObjects/Mailer/SOGoMailReply.h index e519138bb..f83d1e872 100644 --- a/SoObjects/Mailer/SOGoMailReply.h +++ b/SoObjects/Mailer/SOGoMailReply.h @@ -29,15 +29,12 @@ { BOOL outlookMode; NSString *replyPlacement; - NSString *signaturePlacement; } - (void) setOutlookMode: (BOOL) newOutlookMode; - (BOOL) outlookMode; - (void) setReplyPlacement: (NSString *) newPlacement; - (BOOL) replyPlacementOnTop; -- (void) setSignaturePlacement: (NSString *) newPlacement; -- (BOOL) signaturePlacementOnTop; - (NSString *) messageBody; @end diff --git a/SoObjects/Mailer/SOGoMailReply.m b/SoObjects/Mailer/SOGoMailReply.m index 8755306ee..a47e65d54 100644 --- a/SoObjects/Mailer/SOGoMailReply.m +++ b/SoObjects/Mailer/SOGoMailReply.m @@ -60,16 +60,6 @@ return [replyPlacement isEqual: @"above"]; } -- (void) setSignaturePlacement: (NSString *) newPlacement -{ - signaturePlacement = newPlacement; -} - -- (BOOL) signaturePlacementOnTop -{ - return [signaturePlacement isEqual: @"above"]; -} - - (NSString *) messageBody { NSString *s, *msgid; diff --git a/SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.html b/SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.html index f8b141ae2..ef3b83e17 100644 --- a/SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.html +++ b/SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Original Message --------<#newLine/> Subject: <#subject/><#newLine/> Date: <#date/><#newLine/> @@ -9,5 +10,7 @@ From: <#from/><#newLine/> <#hasCc>CC: <#cc/><#hasNewsGroups>Newsgroups: <#newsgroups/><#hasReferences>References: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.wod b/SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.wod +++ b/SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailSlovakForward.wo/SOGoMailSlovakForward.html b/SoObjects/Mailer/SOGoMailSlovakForward.wo/SOGoMailSlovakForward.html index 6ae765bb6..1019ae763 100644 --- a/SoObjects/Mailer/SOGoMailSlovakForward.wo/SOGoMailSlovakForward.html +++ b/SoObjects/Mailer/SOGoMailSlovakForward.wo/SOGoMailSlovakForward.html @@ -1,10 +1,16 @@ --------- Pôvodná správa -------- -Predmet: <#subject/> -Dátum: <#date/> -Od: <#from/> -<#hasReplyTo>Odpoveď na: <#replyTo/><#hasOrganization>Organizácia: <#organization/>Komu: <#to/> -<#hasCc>Kópia: <#cc/><#hasNewsGroups>Diskusné skupiny: <#newsgroups/><#hasReferences>Odkazy: <#references/> - -<#messageBody/> - -<#signature/> +<#newLine/> +<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> +-------- Pôvodná správa --------<#newLine/> +Predmet: <#subject/><#newLine/> +Dátum: <#date/><#newLine/> +Od: <#from/><#newLine/> +<#hasReplyTo>Odpoveď na: <#replyTo/><#hasOrganization>Organizácia: <#organization/>Komu: <#to/><#newLine/> +<#hasCc>Kópia: <#cc/><#hasNewsGroups>Diskusné skupiny: <#newsgroups/><#hasReferences>Odkazy: <#references/><#newLine/> +<#newLine/> +<#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> +<#newLine/> diff --git a/SoObjects/Mailer/SOGoMailSlovakForward.wo/SOGoMailSlovakForward.wod b/SoObjects/Mailer/SOGoMailSlovakForward.wo/SOGoMailSlovakForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailSlovakForward.wo/SOGoMailSlovakForward.wod +++ b/SoObjects/Mailer/SOGoMailSlovakForward.wo/SOGoMailSlovakForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailSpanishArgentinaForward.wo/SOGoMailSpanishArgentinaForward.html b/SoObjects/Mailer/SOGoMailSpanishArgentinaForward.wo/SOGoMailSpanishArgentinaForward.html index f706f241e..53988660d 100644 --- a/SoObjects/Mailer/SOGoMailSpanishArgentinaForward.wo/SOGoMailSpanishArgentinaForward.html +++ b/SoObjects/Mailer/SOGoMailSpanishArgentinaForward.wo/SOGoMailSpanishArgentinaForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Mensaje Original --------<#newLine/> Asunto: <#subject/><#newLine/> Fecha: <#date/><#newLine/> @@ -9,5 +10,7 @@ De: <#from/><#newLine/> <#hasCc>Cc: <#cc/><#hasNewsGroups>Grupo Noticias: <#newsgroups/><#hasReferences>Referencias: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailSpanishArgentinaForward.wo/SOGoMailSpanishArgentinaForward.wod b/SoObjects/Mailer/SOGoMailSpanishArgentinaForward.wo/SOGoMailSpanishArgentinaForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailSpanishArgentinaForward.wo/SOGoMailSpanishArgentinaForward.wod +++ b/SoObjects/Mailer/SOGoMailSpanishArgentinaForward.wo/SOGoMailSpanishArgentinaForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailSpanishSpainForward.wo/SOGoMailSpanishSpainForward.html b/SoObjects/Mailer/SOGoMailSpanishSpainForward.wo/SOGoMailSpanishSpainForward.html index f706f241e..53988660d 100644 --- a/SoObjects/Mailer/SOGoMailSpanishSpainForward.wo/SOGoMailSpanishSpainForward.html +++ b/SoObjects/Mailer/SOGoMailSpanishSpainForward.wo/SOGoMailSpanishSpainForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Mensaje Original --------<#newLine/> Asunto: <#subject/><#newLine/> Fecha: <#date/><#newLine/> @@ -9,5 +10,7 @@ De: <#from/><#newLine/> <#hasCc>Cc: <#cc/><#hasNewsGroups>Grupo Noticias: <#newsgroups/><#hasReferences>Referencias: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailSpanishSpainForward.wo/SOGoMailSpanishSpainForward.wod b/SoObjects/Mailer/SOGoMailSpanishSpainForward.wo/SOGoMailSpanishSpainForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailSpanishSpainForward.wo/SOGoMailSpanishSpainForward.wod +++ b/SoObjects/Mailer/SOGoMailSpanishSpainForward.wo/SOGoMailSpanishSpainForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailSwedishForward.wo/SOGoMailSwedishForward.html b/SoObjects/Mailer/SOGoMailSwedishForward.wo/SOGoMailSwedishForward.html index 6956b9c2b..715e700c3 100644 --- a/SoObjects/Mailer/SOGoMailSwedishForward.wo/SOGoMailSwedishForward.html +++ b/SoObjects/Mailer/SOGoMailSwedishForward.wo/SOGoMailSwedishForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Originalmeddelande --------<#newLine/> Ämne: <#subject/><#newLine/> Datum: <#date/><#newLine/> @@ -9,5 +10,7 @@ Från: <#from/><#newLine/> <#hasCc>Kopia: <#cc/><#hasNewsGroups>Nyhetsgrupper: <#newsgroups/><#hasReferences>Referenser: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailSwedishForward.wo/SOGoMailSwedishForward.wod b/SoObjects/Mailer/SOGoMailSwedishForward.wo/SOGoMailSwedishForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailSwedishForward.wo/SOGoMailSwedishForward.wod +++ b/SoObjects/Mailer/SOGoMailSwedishForward.wo/SOGoMailSwedishForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailUkrainianForward.wo/SOGoMailUkrainianForward.html b/SoObjects/Mailer/SOGoMailUkrainianForward.wo/SOGoMailUkrainianForward.html index efeb00aed..ed584d61c 100644 --- a/SoObjects/Mailer/SOGoMailUkrainianForward.wo/SOGoMailUkrainianForward.html +++ b/SoObjects/Mailer/SOGoMailUkrainianForward.wo/SOGoMailUkrainianForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Початкове повідомлення --------<#newLine/> Тема: <#subject/><#newLine/> Дата: <#date/><#newLine/> @@ -9,5 +10,7 @@ <#hasCc>Копія: <#cc/><#hasNewsGroups>Групи новин: <#newsgroups/><#hasReferences>Посилання: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailUkrainianForward.wo/SOGoMailUkrainianForward.wod b/SoObjects/Mailer/SOGoMailUkrainianForward.wo/SOGoMailUkrainianForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailUkrainianForward.wo/SOGoMailUkrainianForward.wod +++ b/SoObjects/Mailer/SOGoMailUkrainianForward.wo/SOGoMailUkrainianForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.html b/SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.html index 0e90a3f5a..1fbdb471a 100644 --- a/SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.html +++ b/SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.html @@ -1,6 +1,7 @@ <#newLine/> <#newLine/> -<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> -------- Original Message --------<#newLine/> Testun: <#subject/><#newLine/> Dyddiad: <#date/><#newLine/> @@ -9,5 +10,7 @@ Oddi wrth: <#from/><#newLine/> <#hasCc>CC: <#cc/><#hasNewsGroups>Grwpiau newyddion: <#newsgroups/><#hasReferences>Cyfeirnodau: <#references/><#newLine/> <#newLine/> <#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> <#newLine/> -<#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.wod b/SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.wod index 7787fa18e..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.wod +++ b/SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.wod @@ -77,3 +77,12 @@ signature: WOString { value = signature; escapeHTML = NO; } + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m index 215088a55..3d33384c0 100644 --- a/UI/Common/UIxPageFrame.m +++ b/UI/Common/UIxPageFrame.m @@ -113,8 +113,7 @@ - (NSString *) doctype { - return (@"\n" - @""); } diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings index 9f13115ea..02d512726 100644 --- a/UI/MailerUI/English.lproj/Localizable.strings +++ b/UI/MailerUI/English.lproj/Localizable.strings @@ -102,6 +102,7 @@ "Attach Web Page..." = "Attach Web Page..."; "file" = "file"; "files" = "files"; +"Save all" = "Save all"; "to" = "To"; "cc" = "Cc"; diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings index fc3e0ed15..5201806cd 100644 --- a/UI/MailerUI/French.lproj/Localizable.strings +++ b/UI/MailerUI/French.lproj/Localizable.strings @@ -102,6 +102,7 @@ "Attach Web Page..." = "Joindre une page Web..."; "file" = "fichier"; "files" = "fichiers"; +"Save all" = "Tout sauvegarder"; "to" = "Pour"; "cc" = "Copie à"; diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index 77382c61b..2ba20816f 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -379,7 +379,7 @@ function onDocumentKeydown(event) { } } if (keyCode == Event.KEY_DELETE || - keyCode == Event.KEY_BACKSPACE && isMac()) { + keyCode == Event.KEY_BACKSPACE) { deleteSelectedMessages(); Event.stop(event); } @@ -1988,10 +1988,7 @@ function initMailer(event) { initMailboxTree(); initMessageCheckTimer(); - if (Prototype.Browser.Gecko) - Event.observe(document, "keypress", onDocumentKeydown); // for FF2 - else - Event.observe(document, "keydown", onDocumentKeydown); + Event.observe(document, "keydown", onDocumentKeydown); /* Perform an expunge when leaving the webmail */ // if (isSafari()) {