Changeset 463 for branches/highdpi/Packages/Common/Languages.pas

Timestamp:

Nov 29, 2023, 2:35:44 PM (12 months ago)

Author:

chronos

Message:

• Modified: HighDpi branch updated to trunk version.

File:

• branches/highdpi/Packages/Common/Languages.pas (moved) (moved from branches/highdpi/Packages/Common/ULanguages.pas ) (5 diffs)

branches/highdpi/Packages/Common/Languages.pas

@@ -1 @@
-unit ULanguages;
-
-{$mode objfpc}{$H+}
+unit Languages;
 
 interface
 
 uses
-  Classes, SysUtils, Contnrs;
+  Classes, SysUtils, Generics.Collections;
 
 type
@@ -15 +13 @@
   end;
 
-  { TLanguageList }
-
-  TLanguageList = class(TObjectList)
+  { TLanguages }
+
+  TLanguages = class(TObjectList<TLanguage>)
     function SearchByCode(ACode: string): TLanguage;
     procedure AddNew(Code: string; Name: string);
-    constructor Create;
+    constructor Create(FreeObjects: Boolean = True);
   end;
 
@@ -218 +216 @@
   SLang_za = 'Zhuang';
   SLang_zh = 'Chinese';
+  SLang_zh_Hans = 'Simplified Chinese';
+  SLang_zh_Hant = 'Traditional Chinese';
   SLang_zu = 'Zulu';
 
+
 implementation
 
 
-{ TLanguageList }
-
-function TLanguageList.SearchByCode(ACode: string): TLanguage;
+{ TLanguages }
+
+function TLanguages.SearchByCode(ACode: string): TLanguage;
 var
   I: Integer;
 begin
   I := 0;
-  while (I < Count) and (TLanguage(Items[I]).Code < ACode) do Inc(I);
-  if I < Count then Result := TLanguage(Items[I])
+  while (I < Count) and (Items[I].Code <> ACode) do Inc(I);
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
 
-procedure TLanguageList.AddNew(Code: string; Name: string);
+procedure TLanguages.AddNew(Code: string; Name: string);
 var
   NewItem: TLanguage;
@@ -245 +246 @@
 end;
 
-constructor TLanguageList.Create;
+constructor TLanguages.Create(FreeObjects: Boolean);
 begin
-  inherited Create;
+  inherited;
   AddNew('', SLangAuto);
   AddNew('aa', SLang_aa);
@@ -441 +442 @@
   AddNew('za', SLang_za);
   AddNew('zh', SLang_zh);
+  AddNew('zh-Hant', SLang_zh_Hant);
+  AddNew('zh-Hans', SLang_zh_Hans);
   AddNew('zu', SLang_zu);
 end;
 
 end.
-