Changeset 148

Timestamp:

Dec 14, 2021, 7:49:07 PM (4 years ago)

Author:

Gregg Young

Message:

Add Russian tranlation

Location:

trunk

Files:

• NLS/ru/README_ru (added)
• NLS/ru/goqresru.rc (added)
• NLS/ru/gotcha_ru.ipf (added)
• NLS/ru/gotresru.rc (added)
• makefile (modified) (2 diffs)
• settings.cpp (modified) (2 diffs)

trunk/makefile

@@ -97 +97 @@
 #    $(CHDIR) ..\nl
 #    $(MAKE) -h $(__MAKEOPTS__) 
-#    $(CHDIR) ..\ru
-#    $(MAKE) -h $(__MAKEOPTS__) 
+    $(CHDIR) ..\ru
+    $(MAKE) -h $(__MAKEOPTS__) 
 #    $(CHDIR) ..\tw
 #    $(MAKE) -h $(__MAKEOPTS__) 
@@ -147 +147 @@
 # @if exist bin\utf8\README_NL.utf8 del bin\utf8\README_NL.utf8
 # @call tools\rxtxtcnv.cmd  NLS\NL\README_NL bin\utf8\README_NL.utf8 850 1208
-# @if exist bin\utf8\README_RU.utf8 del bin\utf8\README_RU.utf8
-# @call tools\rxtxtcnv.cmd  NLS\RU\README_RU bin\utf8\README_RU.utf8 866 1208
+ @if exist bin\utf8\README_RU.utf8 del bin\utf8\README_RU.utf8
+ @call tools\rxtxtcnv.cmd  NLS\RU\README_RU bin\utf8\README_RU.utf8 866 1208
 # @if exist bin\utf8\README_TW.utf8 del bin\utf8\README_TW.utf8
 # @call tools\rxtxtcnv.cmd  NLS\TW\README_TW bin\utf8\README_TW.utf8 950 1208

trunk/settings.cpp

@@ -492 +492 @@
            UniCreateUconvObject((UniChar *)L"IBM-866", &uconv_object866);
            UniCreateUconvObject((UniChar *)L"IBM-1207", &uconv_object1207);
-           
+
+           WinLoadString(hab, g_hmod, IDS_OK, sizeof(ucLangStr), ucLangStr);
+           if (pset->GetLangID() == CZ || pset->GetLangID() == PL) {
+               
+               UniStrToUcs( uconv_object852, target, ucLangStr, 299);
+           }
+           else if (pset->GetLangID() == RU)
+               UniStrToUcs( uconv_object866, target, ucLangStr, 299);
+           else {
+               UniStrToUcs( uconv_object850, target, ucLangStr, 299);
+           }
+           UniStrFromUcs( uconv_object1207, ucLangStr, target, 300);
+           WinSetDlgItemText(hwnd, WID_PB_OK, ucLangStr);
+
            WinLoadString(hab, g_hmod, IDS_UNDO, sizeof(ucLangStr), ucLangStr);
            if (pset->GetLangID() == CZ || pset->GetLangID() == PL) {
@@ -1634 +1647 @@
                     if (Lang == CZ) {
                         UniStrToUcs( uconv_object852, target, ucLangStr, 299);
-                        }
-                        else {
-                            UniStrToUcs( uconv_object850, target, ucLangStr, 299);
-                        }
-                        /*if (Lang == RU) {
-                            UniStrToUcs( uconv_object866, target, ucLangStr, 299);
-                        } */
+                    }
+                    else if (Lang == RU) {
+                        UniStrToUcs( uconv_object866, target, ucLangStr, 299);
+                    }
+                    else {
+                        UniStrToUcs( uconv_object850, target, ucLangStr, 299);
+                    }
                         UniStrFromUcs( uconv_object1207, ucLangStr, target, 300);
                     Lang = 0;