Changeset 95 for trunk/NewView/MainForm.pas

Timestamp:

Mar 10, 2007, 8:05:56 PM (18 years ago)

Author:

RBRi

Message:

-lang:en fix

File:

• trunk/NewView/MainForm.pas (modified) (2 diffs)

trunk/NewView/MainForm.pas

@@ -3822 +3822 @@
 
   // if debug is not enabled, get rid of the debug menu and separator.
-  if CmdLineParameters.isDebugEnabled then
+  if not CmdLineParameters.isDebugEnabled then
   begin
     ToolsDebugSep.Destroy;
@@ -3892 +3892 @@
   LogEvent(LogSettings, 'Loading language');
 
-  if CmdLineParameters.getLanguage <> '' then
-    LoadAutoLanguage( 'newview', CmdLineParameters.getLanguage )
+  // the user likes to have english
+  // the normal automatic will fall back to
+  // the environment setting but in the special
+  // case we have to start the default
+  if CmdLineParameters.getLanguage = 'en' then
+  begin
+    LoadLanguage('');
+  end
   else
-    LoadDefaultLanguage( 'newview' );
+  begin
+    if CmdLineParameters.getLanguage <> '' then
+    begin
+      if not LoadAutoLanguage('newview', CmdLineParameters.getLanguage) then
+      begin
+        LoadDefaultLanguage('newview');
+      end
+    end
+    else
+    begin
+      LoadDefaultLanguage('newview');
+    end;
+  end;
 
   LogEvent(LogSettings, 'Applying settings');