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 #1271 from RaiKoHoff/Dev_RC_Fixes

Browse Source 
Fix some format strings for dialog displaying long integers
This commit is contained in:
Rainer Kottenhoff 2019-05-29 16:23:25 +02:00 committed by GitHub
commit a7a3f3152c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
language/np3_af_za/strings_af_za.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Geassosieerde lêernaam uitbreidings:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "Line (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Column (1 - %lli):"
IDS_MUI_GOTO_LINE "Line (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Column (1 - %ti):"
END
STRINGTABLE

4
language/np3_be_by/strings_be_by.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Çâ˙çŕíű˙ ďŕřűđýííł ôŕéëŕ˘:"
IDS_MUI_EXAMPLE_TEXT "Ó ˛˘ł őóäű ćâŕâű ÷îđň ó ç˙ë¸íŕé ęŕěłçýëüöű ďŕáĺă ďŕä'ĺńöł ôŕđřó ç ţřęŕé, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Ńóďŕäçĺííĺ íóë˙âîé äŕ˘ćűíł"
IDS_MUI_GOTO_LINE "Ðàäîê (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Ñëóïîê (1 - %lli):"
IDS_MUI_GOTO_LINE "Ðàäîê (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Ñëóïîê (1 - %ti):"
END
STRINGTABLE

4
language/np3_de_de/strings_de_de.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Zugeordnete Dateitypen:"
IDS_MUI_EXAMPLE_TEXT "Zwölf laxe Typen qualmen verdächtig süße Objekte, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Null-Längen-Fund"
IDS_MUI_GOTO_LINE "Zeile (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Spalte (1 - %lli):"
IDS_MUI_GOTO_LINE "Zeile (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Spalte (1 - %ti):"
END
STRINGTABLE

4
language/np3_en_gb/strings_en_gb.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Associated filename extensions:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "Line (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Column (1 - %lli):"
IDS_MUI_GOTO_LINE "Line (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Column (1 - %ti):"
END
STRINGTABLE

4
language/np3_en_us/strings_en_us.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Associated filename extensions:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "Line (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Column (1 - %lli):"
IDS_MUI_GOTO_LINE "Line (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Column (1 - %ti):"
END
STRINGTABLE

4
language/np3_es_es/strings_es_es.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Extensiones de nombre de archivo asociadas:"
IDS_MUI_EXAMPLE_TEXT "El veloz murciélago hindú comía feliz cardillo y kiwi. La cigüeña tocaba el saxofón detrás del palenque de paja, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Corresponde a longitud cero"
IDS_MUI_GOTO_LINE "Línea (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Columna (1 - %lli):"
IDS_MUI_GOTO_LINE "Línea (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Columna (1 - %ti):"
END
STRINGTABLE

4
language/np3_fr_fr/strings_fr_fr.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Extensions des fichiers associés:"
IDS_MUI_EXAMPLE_TEXT "Voix ambiguë d'un cœur qui au zéphyr préfère les jattes de kiwis, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Correspond à longueur zéro"
IDS_MUI_GOTO_LINE "Ligne (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Colonne (1 - %lli):"
IDS_MUI_GOTO_LINE "Ligne (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Colonne (1 - %ti):"
END
STRINGTABLE

4
language/np3_hu_hu/strings_hu_hu.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Hozzárendelt kiterjesztések:"
IDS_MUI_EXAMPLE_TEXT "Árvíztűrő tükörfúrógép, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Nulla hosszú egyezés"
IDS_MUI_GOTO_LINE "Sor (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Oszlop (1 - %lli):"
IDS_MUI_GOTO_LINE "Sor (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Oszlop (1 - %ti):"
END
STRINGTABLE

4
language/np3_it_it/strings_it_it.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Estensioni associate:"
IDS_MUI_EXAMPLE_TEXT "Nel Quebec zio John postava: W Eddy Merckx in fuga!, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "Riga (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Colonna (1 - %lli):"
IDS_MUI_GOTO_LINE "Riga (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Colonna (1 - %ti):"
END
STRINGTABLE

4
language/np3_ja_jp/strings_ja_jp.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "関連付けるファイル拡張子:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789.\nいろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす。\nとても綺麗な夕日、今日もたくさん動いて、ご飯もおいしい。よく眠れそうだ。"
IDS_MUI_ZERO_LEN_MATCH "^ 空文字列に一致"
IDS_MUI_GOTO_LINE "<22>s (1 - %lli):"
IDS_MUI_GOTO_COLUMN "—ñ (1 - %lli):"
IDS_MUI_GOTO_LINE "<22>s (1 - %ti):"
IDS_MUI_GOTO_COLUMN "—ñ (1 - %ti):"
END
STRINGTABLE

4
language/np3_ko_kr/strings_ko_kr.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "연결된 확장자:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789.\r\n빠른 갈색 여우가 느린 개를 뛰어 넘었다.\r\n\\ * & ^ % $ # @ ! ~"
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "Çà (1 - %lli):"
IDS_MUI_GOTO_COLUMN "¿­ (1 - %lli):"
IDS_MUI_GOTO_LINE "Çà (1 - %ti):"
IDS_MUI_GOTO_COLUMN "¿­ (1 - %ti):"
END
STRINGTABLE

4
language/np3_nl_nl/strings_nl_nl.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Bijbehorende bestandsextensies:"
IDS_MUI_EXAMPLE_TEXT "Pa's wijze lynx bezag vroom het fikse aquaduct, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Nul-lengte Match"
IDS_MUI_GOTO_LINE "Lijn (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Kolom (1 - %lli):"
IDS_MUI_GOTO_LINE "Lijn (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Kolom (1 - %ti):"
END
STRINGTABLE

4
language/np3_pl_pl/strings_pl_pl.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Associated filename extensions:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "Line (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Column (1 - %lli):"
IDS_MUI_GOTO_LINE "Line (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Column (1 - %ti):"
END
STRINGTABLE

4
language/np3_pt_br/strings_pt_br.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Associated filename extensions:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "Line (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Column (1 - %lli):"
IDS_MUI_GOTO_LINE "Line (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Column (1 - %ti):"
END
STRINGTABLE

4
language/np3_ru_ru/strings_ru_ru.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Связанные расширения файлов:"
IDS_MUI_EXAMPLE_TEXT "Съешь ещё этих мягких французских булок да выпей чаю, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Совпадение нулевой длины"
IDS_MUI_GOTO_LINE "Ñòðîêà (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Êîëîíêà (1 - %lli):"
IDS_MUI_GOTO_LINE "Ñòðîêà (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Êîëîíêà (1 - %ti):"
END
STRINGTABLE

4
language/np3_zh_cn/strings_zh_cn.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "关联的文件扩展名："
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789.\n中国智造，慧及全球"
IDS_MUI_ZERO_LEN_MATCH "^ 零宽度匹配"
IDS_MUI_GOTO_LINE "行（1 - %lli）："
IDS_MUI_GOTO_COLUMN "列（1 - %lli）："
IDS_MUI_GOTO_LINE "行（1 - %ti）："
IDS_MUI_GOTO_COLUMN "列（1 - %ti）："
END
STRINGTABLE

9
src/Edit.c
View File

@ -7011,14 +7011,15 @@ static INT_PTR CALLBACK EditLinenumDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPA
DocPos const iCurColumn = SciCall_GetColumn(SciCall_GetCurrentPos()) + 1;
DocPos const iLineEndPos = Sci_GetNetLineLength(iCurLine);
FormatLngStringW(wchLineCaption, COUNTOF(wchLineCaption), IDS_MUI_GOTO_LINE, iMaxLnNum);
FormatLngStringW(wchLineCaption, COUNTOF(wchLineCaption), IDS_MUI_GOTO_LINE,
(int)clampp(iMaxLnNum, 0, INT_MAX));
FormatLngStringW(wchColumnCaption, COUNTOF(wchColumnCaption), IDS_MUI_GOTO_COLUMN,
max_p(iLineEndPos, (DocPos)Globals.fvCurFile.iLongLinesLimit));
(int)clampp(max_p(iLineEndPos, (DocPos)Globals.fvCurFile.iLongLinesLimit), 0, INT_MAX));
SetDlgItemText(hwnd, IDC_LINE_TEXT, wchLineCaption);
SetDlgItemText(hwnd, IDC_COLUMN_TEXT, wchColumnCaption);
SetDlgItemInt(hwnd, IDC_LINENUM, (UINT)iCurLine, false);
SetDlgItemInt(hwnd, IDC_COLNUM, (UINT)iCurColumn, false);
SetDlgItemInt(hwnd, IDC_LINENUM, (int)clampp(iCurLine, 0, INT_MAX), false);
SetDlgItemInt(hwnd, IDC_COLNUM, (int)clampp(iCurColumn, 0, INT_MAX), false);
SendDlgItemMessage(hwnd,IDC_LINENUM,EM_LIMITTEXT,80,0);
SendDlgItemMessage(hwnd,IDC_COLNUM,EM_LIMITTEXT,80,0);
CenterDlgInParent(hwnd);

6
src/Helpers.c
View File

@ -234,9 +234,9 @@ DocPos IniSectionGetPos(LPCWSTR lpCachedIniSection, LPCWSTR lpName, DocPos posDe
int const ich = (int)StringCchLen(lpName,0);
while (*p) {
if ((StrCmpNI(p, lpName, ich) == 0) && (p[ich] == L'=')) {
long long pos = 0;
if (swscanf_s((p + ich + 1), L"%lli", &pos) == 1) {
return (DocPos)pos;
DocPos pos = 0;
if (swscanf_s((p + ich + 1), DOCPOSFMTW, &pos) == 1) {
return pos;
}
return posDefault;
}

10
src/Helpers.h
View File

@ -122,6 +122,10 @@ inline unsigned clampul(unsigned long x, unsigned long lower, unsigned long uppe
return (x < lower) ? lower : ((x > upper) ? upper : x);
}
inline DocPos clampp(DocPos x, DocPos lower, DocPos upper) {
return (x < lower) ? lower : ((x > upper) ? upper : x);
}
// Is the character an octal digit?
inline bool IsDigitA(const CHAR ch) { return ((ch >= '0') && (ch <= '9')); }
inline bool IsDigitW(const WCHAR wch) { return ((wch >= L'0') && (wch <= L'9')); }
@ -190,13 +194,15 @@ inline bool IniSectionGetBool(LPCWSTR lpCachedIniSection, LPCWSTR lpName, bool b
bool IniSectionSetString(LPWSTR lpCachedIniSection,LPCWSTR lpName,LPCWSTR lpString);
inline bool IniSectionSetInt(LPWSTR lpCachedIniSection,LPCWSTR lpName, int i) {
WCHAR tch[32]={L'\0'}; StringCchPrintf(tch,COUNTOF(tch),L"%i",i); return IniSectionSetString(lpCachedIniSection,lpName,tch);
WCHAR tch[32]={L'\0'}; StringCchPrintf(tch,COUNTOF(tch),L"%i",i);
return IniSectionSetString(lpCachedIniSection,lpName,tch);
}
inline bool IniSectionSetBool(LPWSTR lpCachedIniSection, LPCWSTR lpName, bool b) {
return IniSectionSetInt(lpCachedIniSection, lpName, (b ? 1 : 0));
}
inline bool IniSectionSetPos(LPWSTR lpCachedIniSection, LPCWSTR lpName, DocPos pos){
WCHAR tch[64] = { L'\0' }; StringCchPrintf(tch, COUNTOF(tch), L"%td", (long long)pos); return IniSectionSetString(lpCachedIniSection, lpName, tch);
WCHAR tch[64] = { L'\0' }; StringCchPrintf(tch, COUNTOF(tch), DOCPOSFMTW, pos);
return IniSectionSetString(lpCachedIniSection, lpName, tch);
}
// ----------------------------------------------------------------------------

2
src/Notepad3.c
View File

@ -8981,7 +8981,7 @@ static void _UpdateStatusbarDelayed(bool bForceRedraw)
tchLinesSelected[2] = L'\0';
}
else {
StringCchPrintf(tchLinesSelected, COUNTOF(tchLinesSelected), L"%lli", iLinesSelected);
StringCchPrintf(tchLinesSelected, COUNTOF(tchLinesSelected), DOCPOSFMTW, iLinesSelected);
FormatNumberStr(tchLinesSelected, COUNTOF(tchLinesSelected), 0);
}
StringCchPrintf(tchStatusBar[STATUS_SELCTLINES], txtWidth, L"%s%s%s",