Changeset 220 for trunk/Components/ACLLanguageUnit.pas

Timestamp:

Jun 25, 2007, 8:48:35 PM (18 years ago)

Author:

RBRi

Message:

• ACLStringUtility

File:

• trunk/Components/ACLLanguageUnit.pas (modified) (6 diffs)

trunk/Components/ACLLanguageUnit.pas

@@ -139 +139 @@
   Multicolumnlistbox,
   ACLUtility,
-  ACLStringUtility,
-  FileUtilsUnit;
+  FileUtilsUnit,
+  StringUtilsUnit,
+  DebugUnit;
 
 var
@@ -260 +261 @@
 var
   F: TextFile;
-  S: string;
+  tmpLine: string;
   Name: string;
   Value: string;
-  p: longint;
   pItem: TPLanguageItem;
+  tmpLineParts : TStringList;
 begin
   FSaving := false;
@@ -284 +285 @@
   Reset( F );
 
+  tmpLineParts := TStringList.Create;
+
   while not Eof( F ) do
   begin
-    ReadLn( F, S );
-
-    p := 1;
-    GetNextQuotedValue( S, p, Name, DoubleQuote );
-
-    if Name <> '' then
-    begin
+    ReadLn( F, tmpLine);
+
+    tmpLineParts.clear;
+    StrExtractStringsQuoted(tmpLineParts, tmpLine);
+
+    if tmpLineParts.count > 0 then
+    begin
+      Name := tmpLineParts[0];
+
       if Name[ 1 ] <> '#' then
       begin
         // Got a name, read the value and store.
-        GetNextQuotedValue( S, p, Value, DoubleQuote );
+        value := '';
+        if tmpLineParts.count > 0 then
+        begin
+          value := tmpLineParts[1];
+        end;
 
         New( pItem );
@@ -307 +316 @@
   end;
 
+  tmpLineParts.Destroy;
   CloseFile( F );
 end;
@@ -418 +428 @@
 
 var
-  QuotedValue: string;
-begin
-  QuotedValue :=
-    StrDoubleQuote(
-      InsertDuplicateChars( Value, DoubleQuote ) );
-  WriteLn( FOutputFile,
-           Name + ' ' + QuotedValue + ' ' + Marker );
+  tmpQuotedValue : string;
+begin
+  tmpQuotedValue := StrEscapeAllCharsBy(Value, [], '"');
+  tmpQuotedValue := StrInDoubleQuotes(tmpQuotedValue);
+  WriteLn( FOutputFile, Name + ' ' + tmpQuotedValue + ' ' + Marker );
 end;
 
@@ -745 +753 @@
   MajorLanguage: string;
   MinorLanguage: string;
-begin
-//  ProfileEvent( 'LoadDefaultLanguage' );
-
+  tmpParts : TStringList;
+
+begin
   LanguageVar := GetEnv( 'LANG' );
-
-//  ProfileEvent( '  LANG=' + LanguageVar );
+  LogEvent(LogI18n, 'LANG=' + LanguageVar);
+
   if LanguageVar = '' then
+  begin
     LanguageVar := 'EN_US';
-
-  MajorLanguage := ExtractNextValue( LanguageVar, '_' );
-  MinorLanguage := ExtractNextValue( LanguageVar, '_' );
-
-//  ProfileEvent( '  MajorLanguage=' + MajorLanguage );
-//  ProfileEvent( '  MinorLanguage=' + MinorLanguage );
+  end;
+
+  tmpParts := TStringList.Create;
+  StrExtractStrings(tmpParts, LanguageVar, ['_'], #0);
+
+  MajorLanguage := '';
+  if tmpParts.count > 0 then
+  begin
+    MajorLanguage := tmpParts[0];
+  end;
 
   // note there might be some other stuff on the end of LANG
   // such as ES_ES_EURO...
 
-  if MinorLanguage <> '' then
-  begin
-//    ProfileEvent( '  Trying Major_Minor' );
-    if LoadAutoLanguage( AppName,
-                         MajorLanguage
-                         + '_'
-                         + MinorLanguage ) then
+  if tmpParts.count > 1 then
+  begin
+    MinorLanguage := tmpParts[1];
+
+    LogEvent(LogI18n, 'try loading ' + MajorLanguage + '_' + MinorLanguage);
+    if LoadAutoLanguage(AppName, MajorLanguage + '_' + MinorLanguage) then
     begin
       // found a specifc language
-//      ProfileEvent( '    Found' );
+      LogEvent(LogI18n, ' translation for ' + MajorLanguage + '_' + MinorLanguage + ' sucessfully loaded');
+      tmpParts.Destroy;
       exit;
     end;
   end;
 
-//  ProfileEvent( '  Trying Major only' );
   // try generic language?
+  LogEvent(LogI18n, 'try loading (major only) ' + MajorLanguage);
   if LoadAutoLanguage( AppName, MajorLanguage ) then
   begin
-//    ProfileEvent( '    Found' );
-  end
-  else
-  begin
-//    ProfileEvent( '    No language found, using default' );
-
-    // load defaults
-    LoadLanguage( '' );
-  end;
-
-end;
+      LogEvent(LogI18n, 'translation for ' + MajorLanguage + 'sucessfully loaded');
+      tmpParts.Destroy;
+      exit;
+  end;
+
+  LogEvent(LogI18n, 'No language found, using default ' + MajorLanguage);
+  LoadLanguage( '' );
+
+  tmpParts.Destroy;
+end;
+
 
 Initialization