From e2f469ca7099aba76f44532518914a6f03b56092 Mon Sep 17 00:00:00 2001
From: dairiki <dairiki@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 31 May 2001 17:39:02 +0000
Subject: [PATCH] Revert $LANG back to being a global rather than an
 environment variable (as per patches from Jan Nieuwenhuizen
 <janneke@gnu.org>.)

Use constants LC_ALL (&c) rather than literal "LC_ALL" as first
argument to setlocale().

Define constants LC_ALL and LC_CTYPE if needed (for PHP < 4.0.5).


git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@493 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 index.php      | 11 ++++++-----
 lib/config.php | 28 ++++++++++++++++------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/index.php b/index.php
index a0ba7b567..cb7aa703b 100644
--- a/index.php
+++ b/index.php
@@ -23,7 +23,7 @@
 
 define ('PHPWIKI_VERSION', '1.3.0pre');
 require "lib/prepend.php";
-rcs_id('$Id: index.php,v 1.16 2001-04-07 00:34:30 dairiki Exp $');
+rcs_id('$Id: index.php,v 1.17 2001-05-31 17:39:01 dairiki Exp $');
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -115,14 +115,15 @@ $DBParams = array(
 
 // Select your language/locale - default language "C": English
 // other languages available: Dutch "nl", Spanish "es", German "de",
-// and Swedish "sv".
+// Swedish "sv", and Italian, "it".
 //
 // Note that on some systems, apprently using these short forms for
 // the locale won't work.  On my home system 'LANG=de' won't result
 // in german pages.  Somehow the system must recognize the locale
-// as a valid locale before gettext() will work.  ('de_DE' works for
-// me.)
-putenv('LANG=C');
+// as a valid locale before gettext() will work, i.e., use 'de_DE',
+// 'nl_NL'.
+$LANG='C';
+//$LANG='nl_NL';
 
 // Setting the LANG environment variable (accomplished above) may or
 // may not be sufficient to cause PhpWiki to produce dates in your
diff --git a/lib/config.php b/lib/config.php
index e125ea84d..59cdf750d 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: config.php,v 1.39 2001-04-07 00:34:30 dairiki Exp $');
+rcs_id('$Id: config.php,v 1.40 2001-05-31 17:39:02 dairiki Exp $');
 /*
  * NOTE: the settings here should probably not need to be changed.
  *
@@ -7,8 +7,13 @@ rcs_id('$Id: config.php,v 1.39 2001-04-07 00:34:30 dairiki Exp $');
  * (The user-configurable settings have been moved to index.php.)
  */
 
-// essential internal stuff
+if (!defined("LC_ALL")) {
+   // Backward compatibility (for PHP < 4.0.5)
+   define("LC_ALL", "LC_ALL");
+   define("LC_CTYPE", "LC_CTYPE");
+}
 
+// essential internal stuff
 set_magic_quotes_runtime(0);
 
 // Some constants.
@@ -22,12 +27,6 @@ $FieldSeparator = "\x81";
 // constants for flags in $pagehash
 define("FLAG_PAGE_LOCKED", 1);
 
-//////////////////////////////////////////////////////////////////
-//
-// Set up localization
-//
-setlocale('LC_ALL', "");
-   
 // Search PHP's include_path to find file or directory.
 function FindFile ($file, $missing_okay = false)
 {
@@ -59,7 +58,10 @@ function FindFile ($file, $missing_okay = false)
 // Searches for "locale/$LANG/$file", then for "$file".
 function FindLocalizedFile ($file, $missing_okay = false)
 {
-   $language = getenv("LC_ALL");
+   $language = $GLOBALS['LANG'];
+   
+   if (empty($language))
+      $language = getenv("LC_ALL");
    if (empty($language))
       $language = getenv("LC_MESSAGES");
    if (empty($language))
@@ -68,7 +70,6 @@ function FindLocalizedFile ($file, $missing_okay = false)
       $language = getenv("LANG");
    if (empty($language))
       $language = "C";
-
    
    // FIXME: This wont work for DOS filenames.
    if (!ereg('^/', $file))
@@ -106,6 +107,9 @@ if (!function_exists ('gettext'))
 }
 else
 {
+   // Setup localisation
+   setlocale(LC_ALL, "$LANG");
+   putenv("LC_ALL=$LANG");
    bindtextdomain ("phpwiki", FindFile("locale"));
    textdomain ("phpwiki");
 }
@@ -130,8 +134,8 @@ else
 //
 // FIXME: Not all environments may support en_US?  We should probably
 // have a list of locales to try.
-if (setlocale('LC_CTYPE', 0) == 'C')
-   setlocale('LC_CTYPE', 'en_US.iso-8859-1');
+if (setlocale(LC_CTYPE, 0) == 'C')
+   setlocale(LC_CTYPE, 'en_US.iso-8859-1');
 
 /** string pcre_fix_posix_classes (string $regexp)
  *
-- 
2.45.2