Changeset 269 for CoolTranslator

Timestamp:

Aug 22, 2011, 8:35:49 AM (13 years ago)

Author:

george

Message:

• Modified: CoolTranslator now load all language specific .po files for localization.

Location:

CoolTranslator

Files:

• CoolTranslator.lpk (modified) (1 diff)
• UCoolTranslator.pas (modified) (9 diffs)

CoolTranslator/CoolTranslator.lpk

@@ -1 +1 @@
 <?xml version="1.0"?>
 <CONFIG>
-  <Package Version="3">
+  <Package Version="4">
     <PathDelim Value="\"/>
     <Name Value="CoolTranslator"/>
+    <AddToProjectUsesSection Value="True"/>
     <Author Value="Chronos (robie@centrum.cz)"/>
     <CompilerOptions>
-      <Version Value="9"/>
+      <Version Value="10"/>
       <PathDelim Value="\"/>
       <SearchPaths>

CoolTranslator/UCoolTranslator.pas

@@ -33 +33 @@
     FOnTranslate: TNotifyEvent;
     FPOFilesFolder: string;
-    FPOFile: TPOFile;
+    FPOFiles: TObjectList; // TObjectList<TPOFile>;
+    function GetLocale: string;
+    function GetLocaleShort: string;
     function FindLocaleFileName(LCExt: string): string;
     function GetLocaleFileName(const LangID, LCExt: string): string;
@@ -116 +118 @@
 
 procedure TCoolTranslator.Translate;
-begin
-  TranslateResourceStrings('ULanguages.cs.po');
+var
+  I, J: Integer;
+  Po: TPoFile;
+begin
   TranslateComponentRecursive(Application);
-  if Assigned(FPOFile) then
-    Translations.TranslateResourceStrings(FPOFile);
+
+  // Merge files to single translation file
+  try
+    Po := TPOFile.Create;
+    for I := 0 to FPOFiles.Count - 1 do
+    with TPoFile(FPoFiles[I]) do
+      for J := 0 to Items.Count - 1 do
+      with TPoFileItem(Items[J]) do
+        Po.Add(Identifier, Original, Translation, Comments, Context,
+          Flags, PreviousID);
+    Translations.TranslateResourceStrings(Po);
+  finally
+    Po.Free;
+  end;
 end;
 
@@ -126 +142 @@
 var
   FileName: string;
-begin
-  FreeAndNil(FPOFile);
-  if Assigned(FLanguage) then begin
-    FileName := FindLocaleFileName('.po');
-    if FileExistsUTF8(FileName) then FPOFile := TPOFile.Create(FileName);
+  FileList: TStringList;
+  I: Integer;
+  LocaleShort: string;
+begin
+  FPOFiles.Clear;
+  if Assigned(FLanguage) then
+  try
+    LocaleShort := GetLocaleShort;
+    //ShowMessage(ExtractFileDir(Application.ExeName) +
+    //  DirectorySeparator + 'Languages' + ' ' + '*.' + LocaleShort + '.po');
+    FileList := FindAllFiles(ExtractFileDir(Application.ExeName) +
+      DirectorySeparator + 'Languages', '*.' + LocaleShort + '.po');
+    for I := 0 to FileList.Count - 1 do begin
+      FileName := FileList[I];
+      //FileName := FindLocaleFileName('.po');
+      if FileExistsUTF8(FileName) then FPOFiles.Add(TPOFile.Create(FileName));
+    end;
+  finally
+    FileList.Free;
   end;
 end;
@@ -279 +309 @@
 
 function TCoolTranslator.TranslateText(Identifier, Text: string): string;
-begin
-  if Assigned(FPOFile) then
-    Result := FPOFile.Translate(Identifier, Text);
-  //ShowMessage(Text + ' => ' + Result);
+var
+  I: Integer;
+begin
+  if Text <> '' then begin
+    for I := 0 to FPoFiles.Count - 1 do begin
+      Result := TPoFile(FPOFiles[I]).Translate(Identifier, Text);
+      if Result <> Text then Break;
+    end;
+    if Result = '' then Result := Text;
+  end else Result := '';
 end;
 
@@ -315 +351 @@
 begin
   inherited;
+  FPOFiles := TObjectList.Create;
   ComponentExcludes := TComponentExcludesList.Create;
   Languages := TLanguageList.Create;
@@ -328 +365 @@
 destructor TCoolTranslator.Destroy;
 begin
-  FPOFile.Free;
+  FPOFiles.Free;
   Languages.Free;
   ComponentExcludes.Free;
@@ -334 +371 @@
 end;
 
-function TCoolTranslator.FindLocaleFileName(LCExt: string): string;
-var
+function TCoolTranslator.GetLocale: string;
+var
+  Lang: string;
+  I: Integer;
   T: string;
-  I: Integer;
-  Lang: string;
-begin
-  Result := '';
+begin
   // Win32 user may decide to override locale with LANG variable.
   Lang := GetEnvironmentVariableUTF8('LANG');
@@ -358 +394 @@
 
   if Lang = 'en' then Lang := ''; // English files are without en code
+  Result := Lang;
+end;
+
+function TCoolTranslator.GetLocaleShort: string;
+begin
+  Result := Copy(GetLocale, 1, 2);
+end;
+
+function TCoolTranslator.FindLocaleFileName(LCExt: string): string;
+var
+  T: string;
+  I: Integer;
+  Lang: string;
+begin
+  Result := '';
+  Lang := GetLocale;
 
   Result := GetLocaleFileName(Lang, LCExt);
@@ -365 +417 @@
   Result := ChangeFileExt(ParamStrUTF8(0), LCExt);
   if FileExistsUTF8(Result) then
-    exit;
+    Exit;
 
   Result := '';