X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fgettext.php;h=48fec079c744dfa607851734ee558ff083e359ff;hp=ba0c4624025fd07ceac8b6bb28ce234ad3fb91a8;hb=2ba138034e8cf69a80201035e0abdb51af93083d;hpb=48581a4daae6c70acdb6a9f694d7b96f6093329c

diff --git a/functions/gettext.php b/functions/gettext.php
index ba0c4624..48fec079 100644
--- a/functions/gettext.php
+++ b/functions/gettext.php
@@ -1,19 +1,20 @@
 <?PHP
 
-   /* Alternate to the system's built-in gettext.
-    * relies on .po files (can't read .mo easily).
-    * Uses the session for caching (speed increase)
-    * Possible use in other PHP scripts?  The only SM-specific thing is
-    *   $sm_language, I think
-    *
-    * Very special thanks to Konstantin Riabitsev for letting me use a
-    * server that didn't already have gettext on it!
-    */
-     
-   if (defined('gettext_php'))
-      return;
-   define('gettext_php', true);
-   
+   /**
+    **  gettext.php
+    **
+    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
+    **
+    **  Alternate to the system's built-in gettext.
+    **  relies on .po files (can't read .mo easily).
+    **  Uses the session for caching (speed increase)
+    **  Possible use in other PHP scripts?  The only SM-specific thing is
+    **    $sm_language, I think
+    **
+    ** $Id$
+    **/
+
    global $gettext_php_domain, $gettext_php_dir, $gettext_php_loaded,
       $gettext_php_translateStrings, $gettext_php_loaded_language,
       $gettext_php_short_circuit;
@@ -38,6 +39,10 @@
       $gettext_php_loaded_language = '';
       session_register('gettext_php_loaded_language');
    }
+   if (! isset($gettext_php_short_circuit)) {
+      $gettext_php_short_circuit = false;
+      session_register('gettext_php_short_circuit');
+   }
 
    function gettext_php_load_strings() {
       global $squirrelmail_language, $gettext_php_translateStrings,
@@ -59,7 +64,7 @@
          $gettext_php_domain . '.po';
       
       $file = @fopen($filename, 'r');
-      if ($file === false) {
+      if ($file == false) {
          // Uh-ho -- we can't load the file.  Just fake it.  :-)
 	 // This is also for English, which doesn't use translations
          $gettext_php_loaded = true;