From c9eb9abf42ffcd1be47c59c90898ef4cebecf650 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 24 May 2013 09:29:33 +0300 Subject: [PATCH] drop outdated patches --- phpmailer-update-et.patch | 39 --------------------------------------- tests.patch | 27 --------------------------- 2 files changed, 66 deletions(-) delete mode 100644 phpmailer-update-et.patch delete mode 100644 tests.patch diff --git a/phpmailer-update-et.patch b/phpmailer-update-et.patch deleted file mode 100644 index 1f2dd64..0000000 --- a/phpmailer-update-et.patch +++ /dev/null @@ -1,39 +0,0 @@ -Bugreport-URL: https://sourceforge.net/tracker/?func=detail&aid=3007409&group_id=26031&atid=385709 -Signed-off-by: Elan Ruusamäe - ---- PHPMailer_v5.1/language/phpmailer.lang-et.php~ 2010-05-26 17:41:44.000000000 +0300 -+++ PHPMailer_v5.1/language/phpmailer.lang-et.php 2010-05-26 17:42:42.706466459 +0300 -@@ -3,24 +3,24 @@ - * PHPMailer language file: refer to English translation for definitive list - * Estonian Version - * By Indrek Päri -+* Revised By Elan Ruusamäe - */ - - $PHPMAILER_LANG['authenticate'] = 'SMTP Viga: Autoriseerimise viga.'; - $PHPMAILER_LANG['connect_host'] = 'SMTP Viga: Ei õnnestunud luua ühendust SMTP serveriga.'; - $PHPMAILER_LANG['data_not_accepted'] = 'SMTP Viga: Vigased andmed.'; --//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; --$PHPMAILER_LANG['encoding'] = 'Tundmatu Unknown kodeering: '; -+$PHPMAILER_LANG['empty_message'] = 'Tühi kirja sisu'; -+$PHPMAILER_LANG["encoding"] = 'Tundmatu kodeering: '; - $PHPMAILER_LANG['execute'] = 'Tegevus ebaõnnestus: '; - $PHPMAILER_LANG['file_access'] = 'Pole piisavalt õiguseid järgneva faili avamiseks: '; - $PHPMAILER_LANG['file_open'] = 'Faili Viga: Faili avamine ebaõnnestus: '; - $PHPMAILER_LANG['from_failed'] = 'Järgnev saatja e-posti aadress on vigane: '; - $PHPMAILER_LANG['instantiate'] = 'mail funktiooni käivitamine ebaõnnestus.'; --//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; -+$PHPMAILER_LANG['invalid_email'] = 'Saatmine peatatud, e-posti address vigane: '; - $PHPMAILER_LANG['provide_address'] = 'Te peate määrama vähemalt ühe saaja e-posti aadressi.'; - $PHPMAILER_LANG['mailer_not_supported'] = ' maileri tugi puudub.'; - $PHPMAILER_LANG['recipients_failed'] = 'SMTP Viga: Järgnevate saajate e-posti aadressid on vigased: '; --//$PHPMAILER_LANG['signing'] = 'Signing Error: '; --//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; --//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; --//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; --?> -\ No newline at end of file -+$PHPMAILER_LANG["signing"] = 'Viga allkirjastamisel: '; -+$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() ebaõnnestus.'; -+$PHPMAILER_LANG['smtp_error'] = 'SMTP serveri viga: '; -+$PHPMAILER_LANG['variable_set'] = 'Ei õnnestunud määrata või lähtestada muutujat: '; diff --git a/tests.patch b/tests.patch deleted file mode 100644 index c1a02b1..0000000 --- a/tests.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- PHPMailer_5.2.1/test/phpmailerTest.php~ 2012-04-22 14:55:00.201857103 +0300 -+++ PHPMailer_5.2.1/test/phpmailerTest.php 2012-04-22 14:54:00.232668489 +0300 -@@ -13,7 +13,6 @@ - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License - */ - --require 'PHPUnit/Framework.php'; - - $INCLUDE_DIR = "../"; - -@@ -146,7 +145,7 @@ - $ReportBody .= "---------------------" . $eol; - $ReportBody .= "Unit Test Information" . $eol; - $ReportBody .= "---------------------" . $eol; -- $ReportBody .= "phpmailer version: " . PHPMailer::VERSION . $eol; -+ $ReportBody .= "phpmailer version: " . $this->Mail->Version . $eol; - $ReportBody .= "Content Type: " . $this->Mail->ContentType . $eol; - - if(strlen($this->Mail->Host) > 0) -@@ -637,7 +636,6 @@ - $this->Mail->CreateHeader(); - $this->assertFalse($this->Mail->set('x', 'y'), 'Invalid property set succeeded'); - $this->assertTrue($this->Mail->set('Timeout', 11), 'Valid property set failed'); -- $this->Mail->getFile(__FILE__); - } - } - -- 2.43.0