CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4965 from RaiKoHoff/Dev_Master

Browse Source 
try to fix removal of es-MX language resource
This commit is contained in:
Rainer Kottenhoff 2023-08-26 17:23:05 +02:00 committed by GitHub
commit 2dd4ab7153
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Notepad3.sln
View File

@ -33,7 +33,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad3", "src\Notepad3.vc
{7E16647B-CA40-43E8-8ABB-E4C430C186CA} = {7E16647B-CA40-43E8-8ABB-E4C430C186CA}
{0873B090-7FFD-4ABD-9B42-619A06C5041F} = {0873B090-7FFD-4ABD-9B42-619A06C5041F}
{2EB07C98-0F3F-4CB6-B448-099770AF1989} = {2EB07C98-0F3F-4CB6-B448-099770AF1989}
{B6757299-D2DD-4103-834D-45227AC13CB7} = {B6757299-D2DD-4103-834D-45227AC13CB7}
{3B8C289D-FF47-4237-AD7B-0702230F41A3} = {3B8C289D-FF47-4237-AD7B-0702230F41A3}
{82BD93B4-0306-4DDC-87F6-84B906DBAA77} = {82BD93B4-0306-4DDC-87F6-84B906DBAA77}
{C8DF31BC-9280-4663-93DF-FDCFFC298269} = {C8DF31BC-9280-4663-93DF-FDCFFC298269}
@ -53,7 +52,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minipath", "minipath\minipa
{954B9D26-1735-4674-8279-FF2C44E4258B} = {954B9D26-1735-4674-8279-FF2C44E4258B}
{CC891C3A-8A32-46EA-B80A-0D1DED2BCFB1} = {CC891C3A-8A32-46EA-B80A-0D1DED2BCFB1}
{B3CF6147-AD32-4238-B6C5-9A88BA503567} = {B3CF6147-AD32-4238-B6C5-9A88BA503567}
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58} = {2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}
{6503214A-CE25-45B5-84BB-61EEFB35D1A9} = {6503214A-CE25-45B5-84BB-61EEFB35D1A9}
{DA372A4B-7AE0-4C50-97B7-49D5FF953325} = {DA372A4B-7AE0-4C50-97B7-49D5FF953325}
{FF993C51-06FB-461A-9780-FE57BF498155} = {FF993C51-06FB-461A-9780-FE57BF498155}
@ -1035,30 +1033,6 @@ Global
{1F757558-0E57-4DE5-82D6-A14E9D81F05F}.Release|Win32.Build.0 = Release|Win32
{1F757558-0E57-4DE5-82D6-A14E9D81F05F}.Release|x64.ActiveCfg = Release|x64
{1F757558-0E57-4DE5-82D6-A14E9D81F05F}.Release|x64.Build.0 = Release|x64
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|ARM.ActiveCfg = Debug|Win32
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|ARM64.ActiveCfg = Debug|Win32
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|Win32.ActiveCfg = Debug|Win32
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|Win32.Build.0 = Debug|Win32
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|x64.ActiveCfg = Debug|x64
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Debug|x64.Build.0 = Debug|x64
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|ARM.ActiveCfg = Release|Win32
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|ARM64.ActiveCfg = Release|Win32
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|Win32.ActiveCfg = Release|Win32
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|Win32.Build.0 = Release|Win32
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|x64.ActiveCfg = Release|x64
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58}.Release|x64.Build.0 = Release|x64
{B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|ARM.ActiveCfg = Debug|Win32
{B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|ARM64.ActiveCfg = Debug|Win32
{B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|Win32.ActiveCfg = Debug|Win32
{B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|Win32.Build.0 = Debug|Win32
{B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|x64.ActiveCfg = Debug|x64
{B6757299-D2DD-4103-834D-45227AC13CB7}.Debug|x64.Build.0 = Debug|x64
{B6757299-D2DD-4103-834D-45227AC13CB7}.Release|ARM.ActiveCfg = Release|Win32
{B6757299-D2DD-4103-834D-45227AC13CB7}.Release|ARM64.ActiveCfg = Release|Win32
{B6757299-D2DD-4103-834D-45227AC13CB7}.Release|Win32.ActiveCfg = Release|Win32
{B6757299-D2DD-4103-834D-45227AC13CB7}.Release|Win32.Build.0 = Release|Win32
{B6757299-D2DD-4103-834D-45227AC13CB7}.Release|x64.ActiveCfg = Release|x64
{B6757299-D2DD-4103-834D-45227AC13CB7}.Release|x64.Build.0 = Release|x64
{FF993C51-06FB-461A-9780-FE57BF498155}.Debug|ARM.ActiveCfg = Debug|Win32
{FF993C51-06FB-461A-9780-FE57BF498155}.Debug|ARM64.ActiveCfg = Debug|Win32
{FF993C51-06FB-461A-9780-FE57BF498155}.Debug|Win32.ActiveCfg = Debug|Win32
@ -1158,8 +1132,6 @@ Global
{6D470002-E04D-4BBB-8B57-D20C2721FECE} = {C3735E17-6EAE-4CC5-980E-30BCEF094862}
{0873B090-7FFD-4ABD-9B42-619A06C5041F} = {C3735E17-6EAE-4CC5-980E-30BCEF094862}
{1F757558-0E57-4DE5-82D6-A14E9D81F05F} = {C3735E17-6EAE-4CC5-980E-30BCEF094862}
{2AD33E48-FEC6-47B1-8FEF-A0CF1F23DD58} = {8FD783D5-8709-432D-A88E-6E3073AFF220}
{B6757299-D2DD-4103-834D-45227AC13CB7} = {8C28F8E6-5B4E-4233-B5C7-5A903596AEB2}
{FF993C51-06FB-461A-9780-FE57BF498155} = {8FD783D5-8709-432D-A88E-6E3073AFF220}
{740715FC-9F1A-4FA0-8876-D28A9CB11E67} = {8C28F8E6-5B4E-4233-B5C7-5A903596AEB2}
{0210F830-26C6-40FC-BFD1-6ED833B90830} = {C3735E17-6EAE-4CC5-980E-30BCEF094862}

37
language/common_res.h
View File

@ -561,25 +561,24 @@
#define IDS_MUI_LANG_EL_GR 34505
#define IDS_MUI_LANG_EN_GB 34506
#define IDS_MUI_LANG_ES_ES 34507
#define IDS_MUI_LANG_ES_MX 34508
#define IDS_MUI_LANG_FR_FR 34509
#define IDS_MUI_LANG_HI_IN 34510
#define IDS_MUI_LANG_HU_HU 34511
#define IDS_MUI_LANG_ID_ID 34512
#define IDS_MUI_LANG_IT_IT 34513
#define IDS_MUI_LANG_JP_JP 34514
#define IDS_MUI_LANG_KO_KR 34515
#define IDS_MUI_LANG_NL_NL 34516
#define IDS_MUI_LANG_PL_PL 34517
#define IDS_MUI_LANG_PT_BR 34518
#define IDS_MUI_LANG_PT_PT 34519
#define IDS_MUI_LANG_RU_RU 34520
#define IDS_MUI_LANG_SK_SK 34521
#define IDS_MUI_LANG_SV_SE 34522
#define IDS_MUI_LANG_TR_TR 34523
#define IDS_MUI_LANG_VI_VN 34524
#define IDS_MUI_LANG_ZH_CN 34525
#define IDS_MUI_LANG_ZH_TW 34526
#define IDS_MUI_LANG_FR_FR 34508
#define IDS_MUI_LANG_HI_IN 34509
#define IDS_MUI_LANG_HU_HU 34510
#define IDS_MUI_LANG_ID_ID 34511
#define IDS_MUI_LANG_IT_IT 34512
#define IDS_MUI_LANG_JP_JP 34513
#define IDS_MUI_LANG_KO_KR 34514
#define IDS_MUI_LANG_NL_NL 34515
#define IDS_MUI_LANG_PL_PL 34516
#define IDS_MUI_LANG_PT_BR 34517
#define IDS_MUI_LANG_PT_PT 34518
#define IDS_MUI_LANG_RU_RU 34519
#define IDS_MUI_LANG_SK_SK 34520
#define IDS_MUI_LANG_SV_SE 34521
#define IDS_MUI_LANG_TR_TR 34522
#define IDS_MUI_LANG_VI_VN 34523
#define IDS_MUI_LANG_ZH_CN 34524
#define IDS_MUI_LANG_ZH_TW 34525
#define IDS_USE_LOCALE_DATEFMT 34700
#define IDS_MUI_MENU_THEMES 37000

10
src/MuiLanguage.c
View File

@ -63,7 +63,6 @@ grepWinLng_t grepWinLangResName[] = {
{ L"el-GR", L".\\lng\\gwLng\\Ελληνικά (Ελλάδα) [el-GR].lang" },
{ L"en-GB", L".\\lng\\gwLng\\English (United Kingdom) [en-GB].lang" },
{ L"es-ES", L".\\lng\\gwLng\\Español (España) [es-ES].lang" },
{ L"es-MX", L".\\lng\\gwLng\\Español Mexicano (Mexico) [es-MX].lang" },
{ L"fr-FR", L".\\lng\\gwLng\\Français (France) [fr-FR].lang" },
{ L"hi-IN", L".\\lng\\gwLng\\हिन्दी (भारत) [hi-IN].lang" },
{ L"hu-HU", L".\\lng\\gwLng\\Magyar (Magyarország) [hu-HU].lang" },
@ -216,14 +215,13 @@ MUILANGUAGE MUI_LanguageDLLs[] = {
{ IDS_MUI_LANG_EL_GR, L"el-GR", L"Ελληνικά (Ελλάδα)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_EN_GB, L"en-GB", L"English (United Kingdom)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_ES_ES, L"es-ES", L"Español (España)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_ES_MX, L"es-MX", L"Español Mexicano (Mexico)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_FR_FR, L"fr-FR", L"Français (France)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_HI_IN, L"hi-IN", L"हिन्दी (भारत)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_HU_HU, L"hu-HU", L"Magyar (Magyarország)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_ID_ID, L"id-ID", L"Bahasa Indonesia (Indonesia)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_IT_IT, L"it-IT", L"Italiano (Italia)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_JP_JP, L"ja-JP", L"日本語 (日本)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_KO_KR, L"ko-KR", L"한국어 (대한민국)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_JP_JP, L"ja-JP", L"日本語 (日本)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_KO_KR, L"ko-KR", L"한국어 (대한민국)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_NL_NL, L"nl-NL", L"Nederlands (Nederland)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_PL_PL, L"pl-PL", L"Polski (Polska)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_PT_BR, L"pt-BR", L"Português Brasileiro (Brasil)\t\t\t[%s]", false, false },
@ -233,8 +231,8 @@ MUILANGUAGE MUI_LanguageDLLs[] = {
{ IDS_MUI_LANG_SV_SE, L"sv-SE", L"Svenska (Sverige)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_TR_TR, L"tr-TR", L"Türkçe (Türkiye)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_VI_VN, L"vi-VN", L"Tiếng Việt (Việt Nam)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_ZH_CN, L"zh-CN", L"简体中文 (中国大陆)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_ZH_TW, L"zh-TW", L"正體中文 (中國台灣)\t\t\t[%s]", false, false }
{ IDS_MUI_LANG_ZH_CN, L"zh-CN", L"简体中文 (中国大陆)\t\t\t[%s]", false, false },
{ IDS_MUI_LANG_ZH_TW, L"zh-TW", L"正體中文 (中國台灣)\t\t\t[%s]", false, false }
};
//NUM_OF_MUI_LANGUAGES

12
src/Notepad3.c
View File

@ -683,8 +683,10 @@ static inline void ResetFileObservationData(const bool bResetEvt) {
void TinyExprToStringA(LPSTR pszDest, size_t cchDest, const double dExprEval)
{
double intpart = 0.0;
if ((fabs(modf(dExprEval, &intpart)) < TE_ZERO) && (fabs(intpart) < 1.0E+21)) {
double idbl = 0.0;
double const fracpart = fabs(modf(dExprEval, &idbl));
double const intpart = fabs(idbl);
if ((fracpart < TE_ZERO) && (intpart < 1.0E+21)) {
StringCchPrintfA(pszDest, cchDest, "%.21G", intpart); // integer full number display
}
else {
@ -695,8 +697,10 @@ void TinyExprToStringA(LPSTR pszDest, size_t cchDest, const double dExprEval)
void TinyExprToString(LPWSTR pszDest, size_t cchDest, const double dExprEval)
{
double intpart = 0.0;
if ((fabs(modf(dExprEval, &intpart)) < TE_ZERO) && (fabs(intpart) < 1.0E+21)) {
double idbl = 0.0;
double const fracpart = fabs(modf(dExprEval, &idbl));
double const intpart = fabs(idbl);
if ((fracpart < TE_ZERO) && (intpart < 1.0E+21)) {
StringCchPrintf(pszDest, cchDest, L"%.21G", intpart); // integer full number display
}
else {