X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-editor.git;a=blobdiff_plain;f=src%2Feditor%2Fg_language.pas;h=7a9b194002a0a0f1ca487f542dc44d0307b509be;hp=2a99675348972c5a22f5cfaff359af8fa72b4c1a;hb=c3be56f2a3849cd22be39ce594498c7990e05606;hpb=a3962cf56c3e652202f0e9192857c0b15c1398b7

diff --git a/src/editor/g_language.pas b/src/editor/g_language.pas
index 2a99675..7a9b194 100644
--- a/src/editor/g_language.pas
+++ b/src/editor/g_language.pas
@@ -1,4 +1,4 @@
-Unit g_language;
+Unit g_language;
 
 {$MODE Delphi}
 
@@ -602,7 +602,8 @@ Const
   LANGUAGE_ENGLISH_N = 2;
 
 Var
-  _lc: Array [TStrings_Locale] of String;
+  _lc: Array [TStrings_Locale] of String;  // for the GUI (in UTF-8)
+  _glc: Array [TStrings_Locale] of String; // for GL text (in CP1251)
 
   BoolNames: Array [False..True] of String;
   DirNames: Array [D_LEFT..D_RIGHT] of String;
@@ -628,7 +629,7 @@ Uses
   f_addresource_sky, f_addresource_sound,
   f_addresource_texture, f_choosetype, f_keys, f_mapcheck,
   f_mapoptions, f_maptest, f_mapoptimization, f_options,
-  f_packmap, f_savemap, f_saveminimap, f_selectmap, Forms;
+  f_packmap, f_savemap, f_saveminimap, f_selectmap, Forms, utils;
 
 Const
   g_lang_default: Array [TStrings_Locale] of Array [1..3] of String = (
@@ -2441,7 +2442,11 @@ begin
     n := LANGUAGE_RUSSIAN_N;
 
   for i := Low(TStrings_Locale) to High(TStrings_Locale) do
+  begin
     _lc[i] := g_lang_default[i][n];
+    // have to cache a CP1251 version for GL text
+    _glc[i] := utf8to1251(g_lang_default[i][n]);
+  end;
 
   SetupArrays();
   SetupCaptions();
@@ -2463,4 +2468,4 @@ begin
   CloseFile(F);
 end;
 
-End.
\ No newline at end of file
+End.