From f03bc36678621d5bdee7f8fff52000386bf70a4f Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Tue, 21 Jan 2014 16:51:57 +0400 Subject: [PATCH] Small fixes --- rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php | 8 +++++++- rainloop/v/0.0.0/langs/fr.ini | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php index 09350d42f..bb6b8802f 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php @@ -551,6 +551,12 @@ class Utils public static function MimeContentType($sFileName) { $sResult = 'application/octet-stream'; + $sFileName = \trim(\strtolower($sFileName)); + + if ('winmail.dat' === $sFileName) + { + return 'application/ms-tnef'; + } $aMimeTypes = array( @@ -715,7 +721,7 @@ class Utils ); - $sExt = \strtolower(\MailSo\Base\Utils::GetFileExtension($sFileName)); + $sExt = \MailSo\Base\Utils::GetFileExtension($sFileName); if (0 < \strlen($sExt) && isset($aMimeTypes[$sExt])) { $sResult = $aMimeTypes[$sExt]; diff --git a/rainloop/v/0.0.0/langs/fr.ini b/rainloop/v/0.0.0/langs/fr.ini index 1f076a3f6..902d3e222 100644 --- a/rainloop/v/0.0.0/langs/fr.ini +++ b/rainloop/v/0.0.0/langs/fr.ini @@ -99,7 +99,7 @@ BUTTON_REPLY = "Répondre" BUTTON_REPLY_ALL = "Répondre à tous" BUTTON_FORWARD = "Transférer" BUTTON_FORWARD_AS_ATTACHMENT = "Transférer comme pièce-jointe" -BUTTON_EDIT_AS_NEW = "Edit as New" +BUTTON_EDIT_AS_NEW = "Editer comme nouveau" BUTTON_SHOW_IMAGES = "Afficher les images" BUTTON_NOTIFY_READ_RECEIPT = "L'expéditeur a demandé à être prévenu lorsque vous lirez ce message." BUTTON_IN_NEW_WINDOW = "Voir dans une nouvelle fenêtre"