Changeset 30 for trunk/Components/CoolTranslator/UCoolTranslator.pas

Timestamp:

Sep 8, 2012, 9:28:39 PM (12 years ago)

Author:

chronos

Message:

• Updated: Component versions.
• Added: Missing forms.

Location:

trunk

Files:

• . (modified) (1 prop)
• Components/CoolTranslator (modified) (1 prop)
• Components/CoolTranslator/UCoolTranslator.pas (modified) (8 diffs)

trunk

@@ -3 +3 @@
 backup
 tunneler.exe
+heaptrclog.trc

@@ -3 +3 @@
 backup
 tunneler.exe
+heaptrclog.trc

trunk/Components/CoolTranslator/UCoolTranslator.pas

@@ -10 +10 @@
 
 type
+  THandleStringEvent = function (AValue: string): string of object;
+
   { TComponentExcludes }
 
@@ -31 +33 @@
   private
     FLanguage: TLanguage;
+    FOnAutomaticLanguage: THandleStringEvent;
     FOnTranslate: TNotifyEvent;
     FPOFilesFolder: string;
@@ -40 +43 @@
     procedure ReloadFiles;
     procedure SetPOFilesFolder(const AValue: string);
-    procedure Translate;
     procedure SetLanguage(const AValue: TLanguage);
     procedure TranslateProperty(Component: TPersistent; PropInfo: PPropInfo);
@@ -47 +49 @@
     ComponentExcludes: TComponentExcludesList;
     Languages: TLanguageList;
+    procedure Translate;
     procedure LanguageListToStrings(Strings: TStrings);
     procedure TranslateResourceStrings(PoFileName: string);
@@ -61 +64 @@
     property Language: TLanguage read FLanguage write SetLanguage;
     property OnTranslate: TNotifyEvent read FOnTranslate write FOnTranslate;
+    property OnAutomaticLanguage: THandleStringEvent read FOnAutomaticLanguage
+      write FOnAutomaticLanguage;
   end;
 
@@ -131 +136 @@
       for J := 0 to Items.Count - 1 do
       with TPoFileItem(Items[J]) do
-        Po.Add(Identifier, Original, Translation, Comments, Context,
+        Po.Add(IdentifierLow, Original, Translation, Comments, Context,
           Flags, PreviousID);
     Translations.TranslateResourceStrings(Po);
@@ -152 +157 @@
     //ShowMessage(ExtractFileDir(Application.ExeName) +
     //  DirectorySeparator + 'Languages' + ' ' + '*.' + LocaleShort + '.po');
-    FileList := FindAllFiles(ExtractFileDir(Application.ExeName) +
-      DirectorySeparator + 'Languages', '*.' + LocaleShort + '.po');
+    FileList := FindAllFiles(ExtractFileDir(UTF8Encode(Application.ExeName)) +
+      DirectorySeparator + FPOFilesFolder, '*.' + LocaleShort + '.po');
     for I := 0 to FileList.Count - 1 do begin
       FileName := FileList[I];
@@ -393 +398 @@
     LCLGetLanguageIDs(Lang, T);
 
+  if Assigned(Language) and (Language.Code = '') and Assigned(FOnAutomaticLanguage) then begin
+    Lang := FOnAutomaticLanguage(Lang);
+  end;
+
   if Lang = 'en' then Lang := ''; // English files are without en code
+
   Result := Lang;
 end;

@@ -3 +3 @@
 backup
 tunneler.exe
+heaptrclog.trc