me bad. loose but lossy.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7997 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 67f88eda9a0ddba95c01e321b89f4cdc445b27c4..451211c8d104d77de6e2f44c561f51a30b618d42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,7 +92,7 @@ Version 1.5.1 -- CVS
     before.
   - $agresive_decoding configuration option changed to $aggressive_decoding.
     Fixed spelling.
     before.
   - $agresive_decoding configuration option changed to $aggressive_decoding.
     Fixed spelling.

-  - Added $loosy_encoding option (provides fix for #806698)
+  - Added $lossy_encoding option (provides fix for #806698)

   - Reenabled use of $default_charset option. Option works only with en_US 
     translation in order to prevent language/charset misconfiguration.
   - Fixes for nonpopulation of folder lists and errors when emptying the trash
   - Reenabled use of $default_charset option. Option works only with en_US 
     translation in order to prevent language/charset misconfiguration.
   - Fixes for nonpopulation of folder lists and errors when emptying the trash

diff --git a/config/conf.pl b/config/conf.pl
index 5fb802bc3575fed9d656fb146eb50c3da331d225..e3eda2a223b0baf2bbe6118d1a5b9bbe51425655 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -307,7 +307,7 @@ $session_name = 'SQMSESSID'             if ( !$session_name );
 $show_alternative_names = 'false'       if ( !$show_alternative_names );
 $available_languages = 'all'            if ( !$available_languages );
 $aggressive_decoding = 'false'          if ( !$aggressive_decoding );
 $show_alternative_names = 'false'       if ( !$show_alternative_names );
 $available_languages = 'all'            if ( !$available_languages );
 $aggressive_decoding = 'false'          if ( !$aggressive_decoding );

-$loosy_encoding = 'false'        if ( !$loosy_encoding );
+$lossy_encoding = 'false'        if ( !$lossy_encoding );

 $advanced_tree = 'false'                if ( !$advanced_tree );
 $oldway = 'false'                       if ( !$oldway );
 $use_icons = 'false'                    if ( !$use_icons );
 $advanced_tree = 'false'                if ( !$advanced_tree );
 $oldway = 'false'                       if ( !$oldway );
 $use_icons = 'false'                    if ( !$use_icons );


@@ -574,7 +574,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
     print "3.  Show alternative language names : $WHT$show_alternative_names$NRM\n";
     print "4.  Available languages             : $WHT$available_languages$NRM\n";
     print "5.  Enable aggressive decoding      : $WHT$aggressive_decoding$NRM\n";
     print "3.  Show alternative language names : $WHT$show_alternative_names$NRM\n";
     print "4.  Available languages             : $WHT$available_languages$NRM\n";
     print "5.  Enable aggressive decoding      : $WHT$aggressive_decoding$NRM\n";

-    print "6.  Enable loosy encoding           : $WHT$loosy_encoding$NRM\n";
+    print "6.  Enable lossy encoding           : $WHT$lossy_encoding$NRM\n";

     print "\n";
         print "R   Return to Main Menu\n";
     } elsif ( $menu == 11 ) {
     print "\n";
         print "R   Return to Main Menu\n";
     } elsif ( $menu == 11 ) {


@@ -735,7 +735,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
             elsif ( $command == 3 ) { $show_alternative_names        = commandA3(); }
             elsif ( $command == 4 ) { $available_languages         = commandA4(); }
             elsif ( $command == 5 ) { $aggressive_decoding         = commandA5(); }
             elsif ( $command == 3 ) { $show_alternative_names        = commandA3(); }
             elsif ( $command == 4 ) { $available_languages         = commandA4(); }
             elsif ( $command == 5 ) { $aggressive_decoding         = commandA5(); }

-            elsif ( $command == 6 ) { $loosy_encoding         = commandA6(); }
+            elsif ( $command == 6 ) { $lossy_encoding         = commandA6(); }

         } elsif ( $menu == 11 ) {
             if    ( $command == 1 ) { $advanced_tree  = commandB1(); }
             elsif ( $command == 2 ) { $oldway            = commandB2(); }
         } elsif ( $menu == 11 ) {
             if    ( $command == 1 ) { $advanced_tree  = commandB1(); }
             elsif ( $command == 2 ) { $oldway            = commandB2(); }


@@ -2866,27 +2866,27 @@ sub commandA5 {
     return $aggressive_decoding;
 }
 
     return $aggressive_decoding;
 }
 

-# Loosy encoding
+# Lossy encoding

 sub commandA6 {
 sub commandA6 {

-    print "Enable this option if you want to allow loosy charset encoding in message\n";
+    print "Enable this option if you want to allow lossy charset encoding in message\n";

     print "composition pages. This option allows charset conversions when output\n";
     print "charset does not support all symbols used in original charset. Symbols\n";
     print "unsupported by output charset will be replaced with question marks.\n";
     print "\n";
 
     print "composition pages. This option allows charset conversions when output\n";
     print "charset does not support all symbols used in original charset. Symbols\n";
     print "unsupported by output charset will be replaced with question marks.\n";
     print "\n";
 

-    if ( lc($loosy_encoding) eq 'true' ) {
+    if ( lc($lossy_encoding) eq 'true' ) {

         $default_value = "y";
     } else {
         $default_value = "n";
     }
         $default_value = "y";
     } else {
         $default_value = "n";
     }

-    print "Enable loosy encoding? (y/n) [$WHT$default_value$NRM]: $WHT";
-    $loosy_encoding = <STDIN>;
-    if ( ( $loosy_encoding =~ /^y\n/i ) || ( ( $loosy_encoding =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
-        $loosy_encoding = 'true';
+    print "Enable lossy encoding? (y/n) [$WHT$default_value$NRM]: $WHT";
+    $lossy_encoding = <STDIN>;
+    if ( ( $lossy_encoding =~ /^y\n/i ) || ( ( $lossy_encoding =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
+        $lossy_encoding = 'true';

     } else {
     } else {

-        $loosy_encoding = 'false';
+        $lossy_encoding = 'false';

     }
     }

-    return $loosy_encoding;
+    return $lossy_encoding;

 }
 
 
 }
 
 


@@ -3064,7 +3064,7 @@ sub save_data {
         # boolean
         print CF "\$aggressive_decoding   = $aggressive_decoding;\n";
         # boolean
         # boolean
         print CF "\$aggressive_decoding   = $aggressive_decoding;\n";
         # boolean

-        print CF "\$loosy_encoding        = $loosy_encoding;\n";
+        print CF "\$lossy_encoding        = $lossy_encoding;\n";

         print CF "\n";
 
         # string
         print CF "\n";
 
         # string

diff --git a/config/config_default.php b/config/config_default.php
index cb69b50e7a8d3f2793e08c92b9f5689e0f6c42b0..3f0cd7e94f2ddc58f871b64138e3d17db7857926 100644 (file)
--- a/config/config_default.php
+++ b/config/config_default.php
@@ -847,15 +847,15 @@ $show_alternative_names   = false;
 $aggressive_decoding = false;
 
 /**
 $aggressive_decoding = false;
 
 /**

- * Loosy Encoding Control
+ * Lossy Encoding Control

  *
  * This option allows charset conversions when output charset does not support 
  * all symbols used in original charset. Symbols unsupported by output charset 
  * will be replaced with question marks.
  *
  * This option allows charset conversions when output charset does not support 
  * all symbols used in original charset. Symbols unsupported by output charset 
  * will be replaced with question marks.

- * @global bool $loosy_encoding
+ * @global bool $lossy_encoding

  * @since 1.5.1
  */
  * @since 1.5.1
  */

-$loosy_encoding = false;
+$lossy_encoding = false;

 
 /*** Tweaks ***/
 /**
 
 /*** Tweaks ***/
 /**

diff --git a/functions/i18n.php b/functions/i18n.php
index 5d5d818ec25745a71791abae5fc681b277863cd5..cf30023b4925294944758ddb2fea0a0c5f49018a 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -1150,9 +1150,9 @@ endswitch;
  * @return bool is it possible to convert to user's charset
  */
 function is_conversion_safe($input_charset) {
  * @return bool is it possible to convert to user's charset
  */
 function is_conversion_safe($input_charset) {

-  global $languages, $sm_notAlias, $default_charset, $loosy_encoding;
+  global $languages, $sm_notAlias, $default_charset, $lossy_encoding;

 
 

-    if (isset($loosy_encoding) && $loosy_encoding )
+    if (isset($lossy_encoding) && $lossy_encoding )

        return true;
 
  // convert to lower case
        return true;
 
  // convert to lower case

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index 272e0381456c0a5de5c1ce43c8e00fb23cccf3d8..c224866d2ab09233c375f11fa603fd587ac2571b 100644 (file)
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -319,7 +319,7 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                   'size' => 40 ),
                  '$aggressive_decoding'  => array( 'name' => _("Enable aggressive decoding"),
                                                  'type' => SMOPT_TYPE_BOOLEAN ),
                                                   'size' => 40 ),
                  '$aggressive_decoding'  => array( 'name' => _("Enable aggressive decoding"),
                                                  'type' => SMOPT_TYPE_BOOLEAN ),

-                 '$loosy_encoding'  => array( 'name' => _("Enable loosy encoding"),
+                 '$lossy_encoding'  => array( 'name' => _("Enable lossy encoding"),

                                                  'type' => SMOPT_TYPE_BOOLEAN ),
                  'Group10' => array( 'name' => _("Tweaks"),
                                      'type' => SMOPT_TYPE_TITLE ),
                                                  'type' => SMOPT_TYPE_BOOLEAN ),
                  'Group10' => array( 'name' => _("Tweaks"),
                                      'type' => SMOPT_TYPE_TITLE ),

diff --git a/po/squirrelmail.pot b/po/squirrelmail.pot
index a737fa6b373857a66fbbe36d32a09f1be6fdf6dc..1ef7a3768ef481bcf0989d56eeb551b111980958 100644 (file)
--- a/po/squirrelmail.pot
+++ b/po/squirrelmail.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2004-08-27 21:11+0300\n"
+"POT-Creation-Date: 2004-09-01 19:36+0300\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -2199,7 +2199,7 @@ msgstr ""
 msgid "Enable aggressive decoding"
 msgstr ""
 
 msgid "Enable aggressive decoding"
 msgstr ""
 

-msgid "Enable loosy encoding"
+msgid "Enable lossy encoding"

 msgstr ""
 
 msgid "Tweaks"
 msgstr ""
 
 msgid "Tweaks"