paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 16:39:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazDataDesktop: use GetLanguageIDFromLocaleName function from Translations unit to properly extract language code from language name passed via command-line option

Browse Source
This commit is contained in:
Maxim Ganetsky 2023-06-12 16:41:34 +03:00
parent 9c8663e0f6
commit 065d9a7d64
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/lazdatadesktop/frmmain.pp
View File

@ -1867,7 +1867,7 @@ procedure TranslateStrs;
const const
ext = '.%s.po'; ext = '.%s.po';
var var
LangID1, LangID2, basedir, olddir: String; LangID1, basedir, olddir: String;
LangID: TLanguageID; LangID: TLanguageID;
begin begin
olddir := GetCurrentDir; olddir := GetCurrentDir;
@ -1876,21 +1876,21 @@ begin
basedir := AppendPathDelim('..') + AppendPathDelim('..'); basedir := AppendPathDelim('..') + AppendPathDelim('..');
// //
LangID1 := Application.GetOptionValue('language'); LangID1 := Application.GetOptionValue('language');
LangID2 := '';
if Trim(LangId1) = '' then if Trim(LangId1) = '' then
begin begin
LangID := GetLanguageID; LangID := GetLanguageID;
LangID1 := LangID.LanguageID; LangID1 := LangID.LanguageID;
LangID2 := LangID.LanguageCode; end
end; else
LangID := GetLanguageIDFromLocaleName(LangID1);
TranslateUnitResourceStrings('sdb_consts',basedir+ TranslateUnitResourceStrings('sdb_consts',basedir+
'components/dbexport/languages/sdb_consts'+ext, LangID1,LangID2); 'components/dbexport/languages/sdb_consts'+ext, LangID1,LangID.LanguageCode);
TranslateUnitResourceStrings('ldd_consts',basedir+ TranslateUnitResourceStrings('ldd_consts',basedir+
'components/datadict/languages/ldd_consts'+ext, LangID1,LangID2); 'components/datadict/languages/ldd_consts'+ext, LangID1,LangID.LanguageCode);
TranslateUnitResourceStrings('lclstrconsts',basedir+ TranslateUnitResourceStrings('lclstrconsts',basedir+
'lcl/languages/lclstrconsts'+ext, LangID1,LangID2); 'lcl/languages/lclstrconsts'+ext, LangID1,LangID.LanguageCode);
TranslateUnitResourceStrings('lazdatadeskstr',basedir+ TranslateUnitResourceStrings('lazdatadeskstr',basedir+
'tools/lazdatadesktop/languages/lazdatadesktop'+ext, LangID1,LangID2); 'tools/lazdatadesktop/languages/lazdatadesktop'+ext, LangID1,LangID.LanguageCode);
// //
SetCurrentDir(olddir); SetCurrentDir(olddir);
end; end;