Add missing localization for debug info dialog and print error
Fix #15375, fix #15105, close #15416pull/15447/head^2
parent
108b9f0d24
commit
ea5e36a5be
|
@ -5,7 +5,7 @@ Translation note:
|
||||||
2. All the comments are for explanation, they are not for translation.
|
2. All the comments are for explanation, they are not for translation.
|
||||||
-->
|
-->
|
||||||
<NotepadPlus>
|
<NotepadPlus>
|
||||||
<Native-Langue name="English" filename="english.xml" version="8.6.8">
|
<Native-Langue name="English" filename="english.xml" version="8.6.9">
|
||||||
<Menu>
|
<Menu>
|
||||||
<Main>
|
<Main>
|
||||||
<!-- Main Menu Entries -->
|
<!-- Main Menu Entries -->
|
||||||
|
@ -1396,6 +1396,11 @@ You can re-activate this dialog in Preferences later."/>
|
||||||
<Item id="7" name="&No"/>
|
<Item id="7" name="&No"/>
|
||||||
<Item id="4" name="&Always yes"/>
|
<Item id="4" name="&Always yes"/>
|
||||||
</DoSaveAll><!-- HowToReproduce: Check the "Enable Save All confirm dialog" checkbox in Preference->MISC, now click "Save all" -->
|
</DoSaveAll><!-- HowToReproduce: Check the "Enable Save All confirm dialog" checkbox in Preference->MISC, now click "Save all" -->
|
||||||
|
|
||||||
|
<DebugInfo title="Debug Info">
|
||||||
|
<Item id="1752" name="&Copy debug info to clipboard"/>
|
||||||
|
<Item id="1" name="OK"/>
|
||||||
|
</DebugInfo>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
<MessageBox>
|
<MessageBox>
|
||||||
<!-- $INT_REPLACE$ and $STR_REPLACE$ are place holders, don't translate these place holders. -->
|
<!-- $INT_REPLACE$ and $STR_REPLACE$ are place holders, don't translate these place holders. -->
|
||||||
|
@ -1538,6 +1543,7 @@ NOTE: Choosing not to create the placeholders or closing them later, your sessio
|
||||||
Press the OK button to open the Find dialog or set focus on it.
|
Press the OK button to open the Find dialog or set focus on it.
|
||||||
|
|
||||||
If you require the backward regex searching feature, consult the user manual for instructions on enabling it."/>
|
If you require the backward regex searching feature, consult the user manual for instructions on enabling it."/>
|
||||||
|
<PrintError title="0" message="Cannot start printer document."/><!-- Use title="0" to use Windows OS default translated "Error" title. -->
|
||||||
</MessageBox>
|
</MessageBox>
|
||||||
<ClipboardHistory>
|
<ClipboardHistory>
|
||||||
<PanelTitle name="Clipboard History"/>
|
<PanelTitle name="Clipboard History"/>
|
||||||
|
|
|
@ -5,7 +5,7 @@ Translation note:
|
||||||
2. All the comments are for explanation, they are not for translation.
|
2. All the comments are for explanation, they are not for translation.
|
||||||
-->
|
-->
|
||||||
<NotepadPlus>
|
<NotepadPlus>
|
||||||
<Native-Langue name="English" filename="english_customizable.xml" version="8.6.8">
|
<Native-Langue name="English" filename="english_customizable.xml" version="8.6.9">
|
||||||
<Menu>
|
<Menu>
|
||||||
<Main>
|
<Main>
|
||||||
<!-- Main Menu Entries -->
|
<!-- Main Menu Entries -->
|
||||||
|
@ -1395,6 +1395,11 @@ You can re-activate this dialog in Preferences later."/>
|
||||||
<Item id="7" name="&No"/>
|
<Item id="7" name="&No"/>
|
||||||
<Item id="4" name="&Always yes"/>
|
<Item id="4" name="&Always yes"/>
|
||||||
</DoSaveAll><!-- HowToReproduce: Check the "Enable Save All confirm dialog" checkbox in Preference->MISC, now click "Save all" -->
|
</DoSaveAll><!-- HowToReproduce: Check the "Enable Save All confirm dialog" checkbox in Preference->MISC, now click "Save all" -->
|
||||||
|
|
||||||
|
<DebugInfo title="Debug Info">
|
||||||
|
<Item id="1752" name="&Copy debug info to clipboard"/>
|
||||||
|
<Item id="1" name="OK"/>
|
||||||
|
</DebugInfo>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
<MessageBox>
|
<MessageBox>
|
||||||
<!-- $INT_REPLACE$ and $STR_REPLACE$ are place holders, don't translate these place holders. -->
|
<!-- $INT_REPLACE$ and $STR_REPLACE$ are place holders, don't translate these place holders. -->
|
||||||
|
@ -1537,6 +1542,7 @@ NOTE: Choosing not to create the placeholders or closing them later, your sessio
|
||||||
Press the OK button to open the Find dialog or set focus on it.
|
Press the OK button to open the Find dialog or set focus on it.
|
||||||
|
|
||||||
If you require the backward regex searching feature, consult the user manual for instructions on enabling it."/>
|
If you require the backward regex searching feature, consult the user manual for instructions on enabling it."/>
|
||||||
|
<PrintError title="0" message="Cannot start printer document."/><!-- Use title="0" to use Windows OS default translated "Error" title. -->
|
||||||
</MessageBox>
|
</MessageBox>
|
||||||
<ClipboardHistory>
|
<ClipboardHistory>
|
||||||
<PanelTitle name="Clipboard History"/>
|
<PanelTitle name="Clipboard History"/>
|
||||||
|
|
|
@ -7222,6 +7222,11 @@ bool Notepad_plus::reloadLang()
|
||||||
_nativeLangSpeaker.changePluginsAdminDlgLang(_pluginsAdminDlg);
|
_nativeLangSpeaker.changePluginsAdminDlgLang(_pluginsAdminDlg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_debugInfoDlg.isCreated())
|
||||||
|
{
|
||||||
|
_nativeLangSpeaker.changeDlgLang(_debugInfoDlg.getHSelf(), "DebugInfo");
|
||||||
|
}
|
||||||
|
|
||||||
UserDefineDialog *udd = _pEditView->getUserDefineDlg();
|
UserDefineDialog *udd = _pEditView->getUserDefineDlg();
|
||||||
if (udd->isCreated())
|
if (udd->isCreated())
|
||||||
{
|
{
|
||||||
|
|
|
@ -1347,7 +1347,7 @@ FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1
|
||||||
BEGIN
|
BEGIN
|
||||||
GROUPBOX "",IDC_STATIC,8,3,230,151,BS_CENTER
|
GROUPBOX "",IDC_STATIC,8,3,230,151,BS_CENTER
|
||||||
EDITTEXT IDC_DEBUGINFO_EDIT,18,16,210,128,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
|
EDITTEXT IDC_DEBUGINFO_EDIT,18,16,210,128,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
|
||||||
PUSHBUTTON "&Copy debug info into clipboard",IDC_DEBUGINFO_COPYLINK,8,157,126,14
|
PUSHBUTTON "&Copy debug info to clipboard",IDC_DEBUGINFO_COPYLINK,8,157,126,14
|
||||||
DEFPUSHBUTTON "OK",IDOK,98,175,50,14
|
DEFPUSHBUTTON "OK",IDOK,98,175,50,14
|
||||||
END
|
END
|
||||||
|
|
||||||
|
|
|
@ -3549,7 +3549,10 @@ void Notepad_plus::command(int id)
|
||||||
|
|
||||||
case IDM_DEBUGINFO:
|
case IDM_DEBUGINFO:
|
||||||
{
|
{
|
||||||
|
const bool isFirstTime = !_debugInfoDlg.isCreated();
|
||||||
_debugInfoDlg.doDialog();
|
_debugInfoDlg.doDialog();
|
||||||
|
if (isFirstTime)
|
||||||
|
_nativeLangSpeaker.changeDlgLang(_debugInfoDlg.getHSelf(), "DebugInfo");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
#include "Printer.h"
|
#include "Printer.h"
|
||||||
#include "RunDlg.h"
|
#include "RunDlg.h"
|
||||||
|
#include "localization.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
@ -180,9 +181,14 @@ size_t Printer::doPrint(bool justDoIt)
|
||||||
docInfo.lpszOutput = NULL;
|
docInfo.lpszOutput = NULL;
|
||||||
docInfo.lpszDatatype = NULL;
|
docInfo.lpszDatatype = NULL;
|
||||||
|
|
||||||
if (::StartDoc(_pdlg.hDC, &docInfo) < 0)
|
if (::StartDoc(_pdlg.hDC, &docInfo) < 0)
|
||||||
{
|
{
|
||||||
MessageBox(NULL, L"Can not start printer document.", 0, MB_OK);
|
NativeLangSpeaker* pNativeSpeaker = NppParameters::getInstance().getNativeLangSpeaker();
|
||||||
|
pNativeSpeaker->messageBox("PrintError",
|
||||||
|
nullptr,
|
||||||
|
L"Cannot start printer document.",
|
||||||
|
L"",
|
||||||
|
MB_OK);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1583,7 +1583,7 @@ int NativeLangSpeaker::messageBox(const char *msgBoxTagName, HWND hWnd, const wc
|
||||||
{
|
{
|
||||||
msgBoxType |= MB_RTLREADING | MB_RIGHT;
|
msgBoxType |= MB_RTLREADING | MB_RIGHT;
|
||||||
}
|
}
|
||||||
return ::MessageBox(hWnd, msg.c_str(), title.c_str(), msgBoxType);
|
return ::MessageBox(hWnd, msg.c_str(), (title.empty() || wcscmp(title.c_str(), L"0") == 0) ? nullptr : title.c_str(), msgBoxType);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default English localization during Notepad++ launch
|
// Default English localization during Notepad++ launch
|
||||||
|
|
Loading…
Reference in New Issue