From 065d9a7d640498fc5db08b09f90346b2e88169f1 Mon Sep 17 00:00:00 2001 From: Maxim Ganetsky Date: Mon, 12 Jun 2023 16:41:34 +0300 Subject: [PATCH] LazDataDesktop: use GetLanguageIDFromLocaleName function from Translations unit to properly extract language code from language name passed via command-line option --- tools/lazdatadesktop/frmmain.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/lazdatadesktop/frmmain.pp b/tools/lazdatadesktop/frmmain.pp index f7389d06a8..c24e14e0dc 100644 --- a/tools/lazdatadesktop/frmmain.pp +++ b/tools/lazdatadesktop/frmmain.pp @@ -1867,7 +1867,7 @@ procedure TranslateStrs; const ext = '.%s.po'; var - LangID1, LangID2, basedir, olddir: String; + LangID1, basedir, olddir: String; LangID: TLanguageID; begin olddir := GetCurrentDir; @@ -1876,21 +1876,21 @@ begin basedir := AppendPathDelim('..') + AppendPathDelim('..'); // LangID1 := Application.GetOptionValue('language'); - LangID2 := ''; if Trim(LangId1) = '' then begin LangID := GetLanguageID; LangID1 := LangID.LanguageID; - LangID2 := LangID.LanguageCode; - end; + end + else + LangID := GetLanguageIDFromLocaleName(LangID1); 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+ - 'components/datadict/languages/ldd_consts'+ext, LangID1,LangID2); + 'components/datadict/languages/ldd_consts'+ext, LangID1,LangID.LanguageCode); TranslateUnitResourceStrings('lclstrconsts',basedir+ - 'lcl/languages/lclstrconsts'+ext, LangID1,LangID2); + 'lcl/languages/lclstrconsts'+ext, LangID1,LangID.LanguageCode); TranslateUnitResourceStrings('lazdatadeskstr',basedir+ - 'tools/lazdatadesktop/languages/lazdatadesktop'+ext, LangID1,LangID2); + 'tools/lazdatadesktop/languages/lazdatadesktop'+ext, LangID1,LangID.LanguageCode); // SetCurrentDir(olddir); end;