Changeset 41 for trunk/Packages/CoolTranslator

Timestamp:

May 8, 2019, 11:54:23 AM (6 years ago)

Author:

chronos

Message:

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

Location:

trunk/Packages/CoolTranslator

Files:

• . (modified) (1 prop)
• CoolTranslator.lpk (modified) (2 diffs)
• UCoolTranslator.pas (modified) (7 diffs)

trunk/Packages/CoolTranslator/CoolTranslator.lpk

@@ -1 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <Package Version="4">
     <PathDelim Value="\"/>
     <Name Value="CoolTranslator"/>
+    <Type Value="RunAndDesignTime"/>
     <AddToProjectUsesSection Value="True"/>
     <Author Value="Chronos (robie@centrum.cz)"/>
     <CompilerOptions>
-      <Version Value="10"/>
+      <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
       </SearchPaths>
+      <Parsing>
+        <SyntaxOptions>
+          <SyntaxMode Value="Delphi"/>
+          <CStyleOperator Value="False"/>
+          <AllowLabel Value="False"/>
+          <CPPInline Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
+      <CodeGeneration>
+        <Optimizations>
+          <OptimizationLevel Value="0"/>
+        </Optimizations>
+      </CodeGeneration>
+      <Linking>
+        <Debugging>
+          <GenerateDebugInfo Value="False"/>
+        </Debugging>
+      </Linking>
       <Other>
-        <CompilerPath Value="$(CompPath)"/>
+        <CompilerMessages>
+          <IgnoredMessages idx5024="True"/>
+        </CompilerMessages>
       </Other>
     </CompilerOptions>
@@ -38 +59 @@
       <OutDir Value="Languages"/>
     </i18n>
-    <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="2">
       <Item1>

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
@@ -197 +200 @@
   PropInfo: PPropInfo;
   PropList: PPropList;
-  Excludes: TComponentExcludes;
 begin
   Count := GetTypeData(Component.ClassInfo)^.PropCount;
@@ -250 +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
@@ -295 +297 @@
   Result := FPOFilesFolder;
   if Copy(Result, 1, 1) <> DirectorySeparator then
-    Result := ExtractFileDir(UTF8Encode(Application.ExeName)) +
+    Result := ExtractFileDir(Application.ExeName) +
       DirectorySeparator + Result;
 end;
@@ -412 +414 @@
         Lang := ParamStr(i + 1);
   end;
-  if Lang = '' then
-    LCLGetLanguageIDs(Lang, T);
+  if Lang = '' then begin
+    T := '';
+    LazGetLanguageIDs(Lang, T);
+  end;
 
   if Assigned(Language) and (Language.Code = '') and Assigned(FOnAutomaticLanguage) then begin
@@ -429 +433 @@
 function TCoolTranslator.FindLocaleFileName(LCExt: string): string;
 var
-  T: string;
   Lang: string;
 begin