Changeset 63

Timestamp:

Jan 13, 2017, 10:50:31 PM (8 years ago)

Author:

chronos

Message:

• Modified: Loading of StringTables with localization texts redone to simple load lines from text files encoded in UTF-8.
• Fixed: Correctly load localized files.

Location:

trunk

Files:

• ScreenTools.pas (modified) (1 diff)
• StringTables.pas (modified) (5 diffs)

trunk/ScreenTools.pas

@@ -1558 +1558 @@
   if FileExists(DataDir + 'Localization' + DirectorySeparator + 'Language.txt') then
   begin
-    Phrases.loadfromfile(DataDir + 'Localization' + DirectorySeparator + ' + Language.txt');
+    Phrases.loadfromfile(DataDir + 'Localization' + DirectorySeparator + 'Language.txt');
     if FileExists(DataDir + 'Localization' + DirectorySeparator + 'Language2.txt') then
       Phrases2.loadfromfile(DataDir + 'Localization' + DirectorySeparator + 'Language2.txt')

trunk/StringTables.pas

@@ -4 +4 @@
 interface
 
-const
-  MaxCount = 4000;
+uses
+  Classes;
 
 type
-  TCharList = array [0 .. 9999999] of AnsiChar;
+  { TStringTable }
 
   TStringTable = class
+  private
+    Lines: TStringList;
+    function IsLabel(Text, Name: string): Boolean;
+  public
     constructor Create;
     destructor Destroy; override;
@@ -18 +22 @@
     function Lookup(const Item: string; Index: integer = -1): string;
     function Search(const Content: string; var Handle, Index: integer): boolean;
-  protected
-    Count: integer;
-    Data: ^TCharList;
-    Lines: array [0 .. MaxCount - 1] of PAnsiChar;
   end;
 
@@ -27 +27 @@
 
 uses
-  Classes, SysUtils;
+  SysUtils;
+
+function TStringTable.IsLabel(Text, Name: string): Boolean;
+begin
+  Result := ((Copy(Text, 1, 1) = '#') and (Copy(Text, 2, Length(Name)) = Name))
+    and ((Length(Text) = (Length(Name) + 1)) or (Copy(Text, Length(Name) + 2, 1) = ' '));
+end;
 
 constructor TStringTable.Create;
 begin
-  Data := nil;
+  Lines := TStringList.Create;
 end;
 
 destructor TStringTable.Destroy;
 begin
-  if Data <> nil then
-    FreeMem(Data);
+  FreeAndNil(Lines);
 end;
 
-function TStringTable.LoadFromFile(const FileName: string): boolean;
-var
-  nData, i: integer;
-  f: TFileStream;
+function TStringTable.LoadFromFile(const FileName: String): boolean;
 begin
-  if Data <> nil then
-    FreeMem(Data);
-  try
-    f := TFileStream.Create(FileName, fmOpenRead or fmShareExclusive);
-  except
-    result := false;
-    exit;
-  end;
-  result := true;
-  nData := f.Size;
-  GetMem(Data, nData + 1);
-  f.read(Data^, nData);
-  f.Free;
-  i := 0;
-  Count := 0;
-  while (i < nData) and (Count < MaxCount) do
-  begin
-    Lines[Count] := @Data[i];
-    while (i < nData) and (Data[i] <> #13) do
-      inc(i);
-    Data[i] := #0;
-    inc(i, 2);
-    inc(Count);
-  end;
+  Lines.LoadFromFile(FileName);
 end;
 
 function TStringTable.GetHandle(const Item: AnsiString): integer;
 var
-  i, l: integer;
+  I: Integer;
 begin
-  l := Length(Item);
-  i := Count - 1;
-  while (i >= 0) and ((Lines[i][0] <> '#') or (StrLComp(Lines[i] + 1, @Item[1],
-    l) <> 0) or (Lines[i][l + 1] <> #0) and (Lines[i][l + 1] <> ' ')) do
-    dec(i);
-  result := i
+  I := 0;
+  while (I < Lines.Count) and not IsLabel(Lines[I], Item) do
+    Inc(I);
+  if I < Lines.Count then Result := I
+    else Result := -1;
 end;
 
@@ -88 +66 @@
 begin
   if Index < 0 then
-    if Handle < 0 then
-    begin
-      result := '';
-      exit
-    end
-    else
-    begin
-      if pos(' ', Lines[Handle]) = 0 then
-        s := ''
-      else
-        s := copy(Lines[Handle], pos(' ', Lines[Handle]) + 1, MaxInt);
-      while (Handle + 1 < Count) and (Lines[Handle + 1][0] <> '#') do
-      begin
-        inc(Handle);
-        if (Lines[Handle][0] <> #0) and (Lines[Handle][0] <> '''') then
-        begin
+    if Handle < 0 then begin
+      Result := '';
+      Exit;
+    end else begin
+      if Pos(' ', Lines[Handle]) = 0 then S := ''
+        else s := Copy(Lines[Handle], Pos(' ', Lines[Handle]) + 1, MaxInt);
+      while ((Handle + 1) < Lines.Count) and (Copy(Lines[Handle + 1], 1, 1) <> '#') do begin
+        Inc(Handle);
+        if (Length(Lines[Handle]) > 0) and (Lines[Handle][1] <> '''') then begin
           if (s <> '') and (s[Length(s)] <> '\') then
             s := s + ' ';
           s := s + Lines[Handle];
-        end
+        end;
       end;
-      result := s
-    end
-  else if Handle + Index + 1 >= Count then
-  begin
-    result := '';
-    exit
-  end
-  else
-    result := Lines[Handle + Index + 1];
-  while (result <> '') and ((result[1] = ' ') or (result[1] = #9)) do
-    Delete(result, 1, 1);
-  while (result <> '') and ((result[Length(result)] = ' ') or
-    (result[Length(result)] = #9)) do
-    Delete(result, Length(result), 1);
-  if result = '' then
-    result := '*';
+      Result := S;
+    end else
+    if (Handle + Index + 1) >= Lines.Count then begin
+      Result := '';
+      Exit;
+    end else Result := Lines[Handle + Index + 1];
+  while (Result <> '') and ((Result[1] = ' ') or (Result[1] = #9)) do
+    Delete(Result, 1, 1);
+  while (Result <> '') and ((Result[Length(Result)] = ' ') or
+    (Result[Length(Result)] = #9)) do
+    Delete(Result, Length(Result), 1);
+  if Result = '' then Result := '*';
 end;
 
@@ -178 +145 @@
     i := Index + 1;
   repeat
-    if h + i + 1 >= Count then
+    if h + i + 1 >= Lines.Count then
     begin
       result := false;
       exit
     end;
-    if Lines[h + i + 1][0] = '#' then
+    if Copy(Lines[h + i + 1], 1, 1) = '#' then
     begin
       h := h + i + 1;
       i := -1
     end;
-    if (h >= 0) and not(Lines[h + i + 1][0] in ['#', ':', ';']) and
-      (pos(UContent, UpperCase(Lines[h + i + 1])) > 0) then
+    if (h >= 0) and not ((Length(Lines[h + i + 1]) > 0) and (Lines[h + i + 1][1] in ['#', ':', ';'])) and
+      (Pos(UContent, UpperCase(Lines[h + i + 1])) > 0) then
     begin
       Index := i;
       Handle := h;
-      result := true;
-      exit
+      Result := True;
+      Exit;
     end;
-    inc(i);
-  until false;
+    Inc(I);
+  until False;
 end;