paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-20 07:29:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazUtils: improved newly added language ID trimming procedure name (LazGetTrimmedLanguageID -> LazTrimLanguageID) in order to signify that it only transforms passed ID value

Browse Source
This commit is contained in:
Maxim Ganetsky 2023-06-02 02:03:46 +03:00
parent 89d36acfab
commit e7b16e08e4
2 changed files with 4 additions and 4 deletions
components/lazutils
lazutf8.pas
lcl
lcltranslator.pas

6
components/lazutils/lazutf8.pas
View File

@ -210,7 +210,7 @@ function UTF16ToUTF8(const P: PWideChar; WideCnt: SizeUInt): AnsiString; overloa
// locale
procedure LazGetLanguageIDs(var Lang, FallbackLang: String);
procedure LazGetShortLanguageID(var Lang: String);
procedure LazGetTrimmedLanguageID(var Lang: String);
procedure LazTrimLanguageID(var Lang: String);
var
FPUpChars: array[char] of char;
@ -4071,7 +4071,7 @@ begin
{$ELSE}
GetLanguageIDs(Lang, FallbackLang);
{$ENDIF}
LazGetTrimmedLanguageID(Lang);
LazTrimLanguageID(Lang);
end;
{
@ -4097,7 +4097,7 @@ Language ID sometimes can be in a form of `ru_RU.utf8`, which will prevent
loading files with language in a form of `.ru_RU.po`.
This procedure trims this encoding.
}
procedure LazGetTrimmedLanguageID(var Lang: String);
procedure LazTrimLanguageID(var Lang: String);
var
p: SizeInt;
begin

2
lcl/lcltranslator.pas
View File

@ -123,7 +123,7 @@ begin
//Trim encoding from Lang if it presents. E. g. Lang can be `ru_RU.utf8`.
if Lang <> '' then
LazGetTrimmedLanguageID(Lang);
LazTrimLanguageID(Lang);
end;
function FindLocaleFileName(LCExt, LangID, Dir, LocaleFileName: string; out FoundLang: string): string;