From 503c338ba648e4672eb3a7816826cbc8f0917c3a Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Tue, 23 Dec 2003 12:31:13 +0000
Subject: [PATCH] pt_BR stamps weren't showing up because Tux Paint thought it
 was plain pt.

---
 docs/CHANGES.txt      |  2 ++
 docs/README.txt       | 11 ++++++-----
 docs/html/README.html | 10 +++++-----
 src/tuxpaint.c        | 16 +++++++++++++---
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 62b169680..b26913c09 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -84,6 +84,8 @@ http://www.newbreedsoftware.com/tuxpaint/
   * White/grey in tintable stamps don't get tinted now.
 
   * Stamps in homedir are now loaded before system-wide stamps.
+  
+  * "--lang=XXX" can be used on the command-line, along with "--lang XXX"
 
 
 2003.Aug.18 (0.9.12)
diff --git a/docs/README.txt b/docs/README.txt
index 9e942b5db..645f5ee73 100644
--- a/docs/README.txt
+++ b/docs/README.txt
@@ -9,7 +9,7 @@
                            bill@newbreedsoftware.com
                    http://www.newbreedsoftware.com/tuxpaint/
 
-                       June 14, 2002 - December 20, 2003
+                       June 14, 2002 - December 23, 2003
 
      ----------------------------------------------------------------------
 
@@ -57,9 +57,9 @@
 
      Portability
              Tux Paint is portable among various computer platforms: Windows,
-             Linux, etc. The interface looks the same among them all.
-             Tux Paint runs suitably well on older systems (like a Pentium
-             133), and can be built to run better on slow systems.
+             Macintosh, Linux, etc. The interface looks the same among them
+             all. Tux Paint runs suitably well on older systems (like a
+             Pentium 133), and can be built to run better on slow systems.
 
      Simplicity
              There is no direct access to the computer's underlying
@@ -110,7 +110,8 @@ Loading Tux Paint
            $ tuxpaint
 
          It is also possible to make a launcher button or icon (e.g. in GNOME
-         or KDE). See your desktop environment's documentation for details...
+         or KDE under Linux). See your desktop environment's documentation
+         for details...
 
          If any errors occur, they will be displayed on the terminal (to
          "stderr").
diff --git a/docs/html/README.html b/docs/html/README.html
index a5d7541a4..89c7b1a0b 100644
--- a/docs/html/README.html
+++ b/docs/html/README.html
@@ -23,7 +23,7 @@ New Breed Software</p>
 <p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
 <a href="http://www.newbreedsoftware.com/tuxpaint/">http://www.newbreedsoftware.com/tuxpaint/</a></p>
 
-<p>June 14, 2002 - December 20, 2003</p>
+<p>June 14, 2002 - December 23, 2003</p>
 </center>
 
 <hr size=2 noshade>
@@ -81,9 +81,9 @@ New Breed Software</p>
   <dt><b>Portability</b></dt>
   <dd>
     Tux&nbsp;Paint is portable among various computer platforms:
-    Windows, <!-- Macintosh, --> Linux, etc.  The interface looks the same among
+    Windows, Macintosh, Linux, etc.  The interface looks the same among
     them all.  Tux&nbsp;Paint runs suitably well on older systems (like a
-    Pentium 133), and can be built to run better on slow systems.
+    Pentium&nbsp;133), and can be built to run better on slow systems.
   </dd>
 
   <dt><b>Simplicity</b></dt>
@@ -154,8 +154,8 @@ New Breed Software</p>
       </blockquote>
 
       <p>It is also possible to make a launcher button or icon
-      (e.g. in GNOME or KDE).  See your desktop environment's
-      documentation for details...</p>
+      (e.g. in GNOME or KDE under Linux).
+      See your desktop environment's documentation for details...</p>
 
       <p>If any errors occur, they will be displayed on the terminal
       (to "stderr").</p>
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index da9b97173..db57b16cc 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -21,12 +21,12 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   
-  June 14, 2002 - December 22, 2003
+  June 14, 2002 - December 23, 2003
 */
 
 
 #define VER_VERSION     "0.9.13"
-#define VER_DATE        "2003.12.22"
+#define VER_DATE        "2003.12.23"
 
 
 /* #define DEBUG */
@@ -4205,6 +4205,13 @@ void setup(int argc, char * argv[])
 	      exit(1);
 	    }
 	}
+      else if (strstr(argv[i], "--lang=") == argv[i])
+	{
+	  if (langstr != NULL)
+	    free(langstr);
+
+	  langstr = strdup(argv[i] + 7);
+	}
       else if (strcmp(argv[i], "--lang") == 0 || strcmp(argv[i], "-l") == 0)
 	{
 	  if (i < argc - 1)
@@ -10914,7 +10921,8 @@ int current_language(void)
 	  /* Case-insensitive */
 	  /* (so that, e.g. "pt_BR" is recognized as "pt_br") */
       
-	  if (strncasecmp(loc, lang_prefixes[i], strlen(lang_prefixes[i])) == 0)
+	  /* if (strncasecmp(loc, lang_prefixes[i], strlen(lang_prefixes[i])) == 0) */
+	  if (strcasecmp(loc, lang_prefixes[i]) == 0)
 	    {
 	      lang = i;
 	    }
@@ -10923,8 +10931,10 @@ int current_language(void)
 
 #ifdef DEBUG
   printf("lang=%d\n\n", lang);
+  sleep(10);
 #endif
 
+
   return lang;
 }