Changeset 21 for trunk/Packages/CoolTranslator/UCoolTranslator.pas

Timestamp:

May 8, 2019, 12:11:40 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Build under Lazarus 2.0.
• Modified: Used .lrj files instead of .lrt files.
• Removed: TemplateGenerics package.

File:

• trunk/Packages/CoolTranslator/UCoolTranslator.pas (modified) (5 diffs)

trunk/Packages/CoolTranslator/UCoolTranslator.pas

@@ -127 +127 @@
   I, J: Integer;
   Po: TPoFile;
+  Item: TPOFileItem;
 begin
   TranslateComponentRecursive(Application);
@@ -136 +137 @@
     with TPoFile(FPoFiles[I]) do
       for J := 0 to Items.Count - 1 do
-      with TPoFileItem(Items[J]) do
-        Po.Add(IdentifierLow, Original, Translation, Comments, Context,
+      with TPoFileItem(Items[J]) do begin
+        Item := nil;
+        Po.FillItem(Item, IdentifierLow, Original, Translation, Comments, Context,
           Flags, PreviousID);
+      end;
     Translations.TranslateResourceStrings(Po);
   finally
@@ -249 +252 @@
           if (UpperCase(PropType.Name) = 'TTRANSLATESTRING') then
           //if not IsExcluded(Component, PropInfo^.Name) then
-              SetStrProp(Component, PropInfo, TranslateText(PropInfo^.Name, GetWideStrProp(Component, PropInfo)));
+              SetStrProp(Component, PropInfo, TranslateText(PropInfo^.Name, string(GetWideStrProp(Component, PropInfo))));
         end;
         tkClass: begin
@@ -294 +297 @@
   Result := FPOFilesFolder;
   if Copy(Result, 1, 1) <> DirectorySeparator then
-    Result := ExtractFileDir(UTF8Encode(Application.ExeName)) +
+    Result := ExtractFileDir(Application.ExeName) +
       DirectorySeparator + Result;
 end;
@@ -411 +414 @@
         Lang := ParamStr(i + 1);
   end;
-  if Lang = '' then
+  if Lang = '' then begin
+    T := '';
     LazGetLanguageIDs(Lang, T);
+  end;
 
   if Assigned(Language) and (Language.Code = '') and Assigned(FOnAutomaticLanguage) then begin