packages: php-phpmailer/paths.patch, php-phpmailer/phpmailer-update-et.patc...

[glen]

Author: glen                         Date: Wed May 26 15:06:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.1

---- Files affected:
packages/php-phpmailer:
   paths.patch (1.1 -> 1.2) , phpmailer-update-et.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/php-phpmailer/paths.patch
diff -u packages/php-phpmailer/paths.patch:1.1 packages/php-phpmailer/paths.patch:1.2
--- packages/php-phpmailer/paths.patch:1.1	Tue Jan 12 15:08:36 2010
+++ packages/php-phpmailer/paths.patch	Wed May 26 17:06:39 2010
@@ -1,5 +1,5 @@
---- phpMailer_v2.3/class.phpmailer.php~	2010-01-12 16:05:45.000000000 +0200
-+++ phpMailer_v2.3/class.phpmailer.php	2010-01-12 16:05:46.997539898 +0200
+--- PHPMailer_v5.1/class.phpmailer.php~	2010-05-26 17:37:24.000000000 +0300
++++ PHPMailer_v5.1/class.phpmailer.php	2010-05-26 17:37:48.416133079 +0300
 @@ -134,7 +134,7 @@
     * is in a different directory than the PHP include path.
     * @var string
@@ -9,12 +9,12 @@
  
    /**
     * Holds PHPMailer version.
-@@ -663,7 +663,7 @@
-    * @access public
-    * @return bool
-    */
--  function SetLanguage($lang_type = 'en', $lang_path = 'language/') {
-+  function SetLanguage($lang_type = 'en', $lang_path = '/usr/share/php/phpmailer/language/') {
-     if( !(@include $lang_path.'phpmailer.lang-'.$lang_type.'.php') ) {
-       $PHPMAILER_LANG = array();
-       $PHPMAILER_LANG["provide_address"]      = 'You must provide at least one ' .
+@@ -847,7 +847,7 @@
+   * @param string $lang_path Path to the language file directory
+   * @access public
+   */
+-  function SetLanguage($langcode = 'en', $lang_path = 'language/') {
++  function SetLanguage($langcode = 'en', $lang_path = '/usr/share/php/phpmailer/language/') {
+     //Define full set of translatable strings
+     $PHPMAILER_LANG = array(
+       'provide_address' => 'You must provide at least one recipient email address.',

================================================================
Index: packages/php-phpmailer/phpmailer-update-et.patch
diff -u packages/php-phpmailer/phpmailer-update-et.patch:1.1 packages/php-phpmailer/phpmailer-update-et.patch:1.2
--- packages/php-phpmailer/phpmailer-update-et.patch:1.1	Tue Jan 12 15:48:08 2010
+++ packages/php-phpmailer/phpmailer-update-et.patch	Wed May 26 17:06:39 2010
@@ -1,13 +1,36 @@
---- phpmailer/language/phpmailer.lang-et.php~	2010-01-12 16:08:02.000000000 +0200
-+++ phpmailer/language/phpmailer.lang-et.php	2010-01-12 16:25:39.874296467 +0200
-@@ -18,7 +18,5 @@
- $PHPMAILER_LANG["connect_host"]         = 'SMTP Viga: Ei õnnestunud luua ühendust SMTP serveriga.';
- $PHPMAILER_LANG["file_access"]          = 'Pole piisavalt õiguseid järgneva faili avamiseks: ';
- $PHPMAILER_LANG["file_open"]            = 'Faili Viga: Faili avamine ebaõnnestus: ';
--$PHPMAILER_LANG["encoding"]             = 'Tundmatu Unknown kodeering: ';
--$PHPMAILER_LANG["signing"]              = 'Signing Error: ';
--
+--- 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 <glen at delfi.ee>
+ */
+ 
+ $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["encoding"]             = 'Tundmatu kodeering: ';
 +$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: ';
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-phpmailer/paths.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-phpmailer/phpmailer-update-et.patch?r1=1.1&r2=1.2&f=u