From 7daa7004e07661290dd122a7e8238ffd5877c75d Mon Sep 17 00:00:00 2001
From: maxim <maxim@lazarus-ide.org>
Date: Fri, 20 Aug 2010 20:20:23 +0000
Subject: [PATCH] DefaultTranslator: make --lang commandline parameter override
 all other methods of getting LanguageID. Patch from Stephano, bug #17218.

git-svn-id: trunk@27158 -
---
 lcl/defaulttranslator.pas | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lcl/defaulttranslator.pas b/lcl/defaulttranslator.pas
index e6dfdd509e..df8e8ba309 100644
--- a/lcl/defaulttranslator.pas
+++ b/lcl/defaulttranslator.pas
@@ -176,21 +176,23 @@ var
 
 begin
   Result := '';
+  Lang := '';
+
+  for i := 1 to Paramcount - 1 do
+    if (ParamStrUTF8(i) = '--LANG') or (ParamStrUTF8(i) = '-l') or
+      (ParamStrUTF8(i) = '--lang') then
+      Lang := ParamStrUTF8(i + 1);
+
   //Win32 user may decide to override locale with LANG variable.
-  Lang := GetEnvironmentVariableUTF8('LANG');
   if Lang = '' then
-  begin
-    for i := 1 to Paramcount - 1 do
-      if (ParamStrUTF8(i) = '--LANG') or (ParamStrUTF8(i) = '-l') or
-        (ParamStrUTF8(i) = '--lang') then
-        Lang := ParamStrUTF8(i + 1);
-  end;
+    Lang := GetEnvironmentVariableUTF8('LANG');
+
   if Lang = '' then
     LCLGetLanguageIDs(Lang, T);
 
   Result := GetLocaleFileName(Lang, LCExt);
   if Result <> '' then
-    Exit;
+    exit;
 
   Result := ChangeFileExt(ParamStrUTF8(0), LCExt);
   if FileExistsUTF8(Result) then