Changeset 149 for trunk/settings.cpp

Timestamp:

Dec 24, 2021, 10:25:17 PM (4 years ago)

Author:

Gregg Young

Message:

Get Russian translation working. Fix it so a for example Spanish translation could be used on a Russian system

File:

• trunk/settings.cpp (modified) (5 diffs)

trunk/settings.cpp

@@ -342 +342 @@
                             MPFROM2SHORT (BKA_MAJOR | BKA_AUTOPAGESIZE,
                                           BKA_LAST));
-            if (pset->GetLangID() == CZ || pset->GetLangID() == RU || pset->GetLangID() == PL) {
+            //if (pset->GetLangID() == CZ || pset->GetLangID() == RU || pset->GetLangID() == PL) {
                 UniChar     target[300];
                 CHAR       ucLangStr[300];
@@ -378 +378 @@
                 if (uconv_object1207)
                     UniFreeUconvObject(uconv_object1207);
-            }
+            //}
             else
                 WinSendMsg (hwndNB, BKM_SETTABTEXT,
@@ -468 +468 @@
     {
     case WM_INITDLG:
+        {
 #ifdef _DOLOGDEBUG_
         LogDebug( "DialogProcedure: start WM_INITDLG" );
@@ -477 +478 @@
         CHAR ucFont[FACESIZE];
 
-        if (pset->GetLangID() == CZ || pset->GetLangID() == RU || pset->GetLangID() == PL) {
+        //if (pset->GetLangID() == CZ || pset->GetLangID() == RU || pset->GetLangID() == PL) {
            UniChar     target[300];
            CHAR       ucLangStr[300];
            UconvObject     uconv_object866 = NULL;
-           UconvObject     uconv_object860 = NULL;
            UconvObject     uconv_object852 = NULL;
            UconvObject     uconv_object1207 = NULL;
            UconvObject     uconv_object850 = NULL;
            HAB hab;
-           CHAR ucFont[FACESIZE];
+           //CHAR ucFont[FACESIZE];
 
            UniCreateUconvObject((UniChar *)L"IBM-852", &uconv_object852);
@@ -541 +541 @@
            HMQ hmq = WinQueryWindowULong( hwnd, QWL_HMQ);
            WinSetCp(hmq, 1207);
-           strcpy(ucFont, "9.Times New Roman MT 30");
-           WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
-        }
-        else if (g_installer) {
-        strcpy(ucFont, "9.WarpSans");
-        WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
-        }
+           if (pset->GetLangID() == CZ || pset->GetLangID() == RU || pset->GetLangID() == PL) {
+               strcpy(ucFont, "9.Times New Roman MT 30");
+               WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
+           }
+        //}
+           else if (g_installer) {
+               strcpy(ucFont, "9.WarpSans");
+               WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
+           }
         return MRESULT (FALSE);
-
+        }
     case WM_COMMAND:
         switch (SHORT1FROMMP (mp1))