From 912c5ee3003eb7bfeef7ca2a8eb3ba5e32b32bb4 Mon Sep 17 00:00:00 2001 From: ozone10 Date: Tue, 21 May 2024 08:07:49 +0200 Subject: [PATCH] Make english language text with colon (':') consistent Fix #4628, close #15165 --- PowerEditor/installer/nativeLang/english.xml | 18 +++---- .../nativeLang/english_customizable.xml | 52 +++++++++++-------- .../src/ScintillaComponent/FindReplaceDlg.cpp | 4 +- .../WinControls/ColourPicker/WordStyleDlg.cpp | 2 +- .../src/WinControls/Preference/preference.rc | 4 +- .../StaticDialog/RunDlg/RunDlg.cpp | 6 +-- PowerEditor/src/winmain.cpp | 2 +- 7 files changed, 47 insertions(+), 41 deletions(-) diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index f20cd85bf..2b6d42583 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -5,7 +5,7 @@ Translation note: 2. All the comments are for explanation, they are not for translation. --> - +
@@ -468,7 +468,7 @@ Translation note: - + @@ -477,7 +477,7 @@ Translation note: - + @@ -486,8 +486,8 @@ Translation note: - - + + @@ -1076,7 +1076,7 @@ Translation note: - + @@ -1199,7 +1199,7 @@ Translation note: - + @@ -1720,8 +1720,8 @@ Find in all files but exclude all folders log or logs recursively: - - + + diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml index 87cbb5274..29be6810d 100644 --- a/PowerEditor/installer/nativeLang/english_customizable.xml +++ b/PowerEditor/installer/nativeLang/english_customizable.xml @@ -5,7 +5,7 @@ Translation note: 2. All the comments are for explanation, they are not for translation. --> - +
@@ -120,16 +120,6 @@ Translation note: - - - - - - - - - - @@ -166,6 +156,16 @@ Translation note: + + + + + + + + + + @@ -468,7 +468,7 @@ Translation note: - + @@ -477,7 +477,7 @@ Translation note: - + @@ -486,8 +486,8 @@ Translation note: - - + + @@ -514,9 +514,9 @@ Translation note: - - - + + + @@ -971,7 +971,7 @@ Translation note: - + @@ -1076,7 +1076,7 @@ Translation note: - + @@ -1094,6 +1094,7 @@ Translation note: + @@ -1198,7 +1199,7 @@ Translation note: - + @@ -1719,8 +1720,8 @@ Find in all files but exclude all folders log or logs recursively: - - + + @@ -1730,6 +1731,11 @@ Find in all files but exclude all folders log or logs recursively: + + + + + diff --git a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp index 4bb37e95a..ae7a64156 100644 --- a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp @@ -4974,13 +4974,13 @@ bool FindReplaceDlg::replaceInFilesConfirmCheck(generic_string directory, generi generic_string title = pNativeSpeaker->getLocalizedStrFromID("replace-in-files-confirm-title", TEXT("Are you sure?")); - generic_string msg = pNativeSpeaker->getLocalizedStrFromID("replace-in-files-confirm-directory", TEXT("Are you sure you want to replace all occurrences in :")); + generic_string msg = pNativeSpeaker->getLocalizedStrFromID("replace-in-files-confirm-directory", L"Are you sure you want to replace all occurrences in:"); msg += TEXT("\r\r"); msg += directory; msg += TEXT("\r\r"); - generic_string msg2 = pNativeSpeaker->getLocalizedStrFromID("replace-in-files-confirm-filetype", TEXT("For file type :")); + generic_string msg2 = pNativeSpeaker->getLocalizedStrFromID("replace-in-files-confirm-filetype", L"For file type:"); msg2 += TEXT("\r\r"); msg2 += fileTypes[0] ? fileTypes : TEXT("*.*"); diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp index b62aa946f..8e1145a18 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp @@ -1069,7 +1069,7 @@ void WordStyleDlg::setVisualFromStyleList() if (static_cast(lbTextLen) > styleNameLen) return; ::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXT, i, reinterpret_cast(styleName)); - wcscat_s(str, TEXT(" : ")); + wcscat_s(str, L": "); wcscat_s(str, styleName); // PAD for fix a display glitch diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index bf18ac921..280694651 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -228,7 +228,7 @@ BEGIN CONTROL "UTF-16 Little Endian with BOM",IDC_RADIO_UTF16SMALL,"Button",BS_AUTORADIOBUTTON,242,111,110,10 CONTROL "",IDC_RADIO_OTHERCP,"Button",BS_AUTORADIOBUTTON,242,126,10,10 COMBOBOX IDC_COMBO_OTHERCP,257,125,100,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Default language :",IDC_DEFAULTLANG_STATIC,16,125,77,8 + RTEXT "Default language:",IDC_DEFAULTLANG_STATIC,16,125,77,8 COMBOBOX IDC_COMBO_DEFAULTLANG,98,123,100,140,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Always open a new document in addition at startup",IDC_CHECK_ADDNEWDOCONSTARTUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,152,250,10 END @@ -479,7 +479,7 @@ BEGIN CONTROL "Reverse default date time order (short && long formats)",IDD_DATETIMEFORMAT_REVERSEORDER_CHECK,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | BS_TOP | WS_TABSTOP,17,93,256,20 RTEXT "yyyy-MM-dd HH:mm:ss\nH:m d/M/yyyy\nMMM d, yyyy tt h:m",IDC_STATIC,36,118,77,25 LTEXT "1985-10-26 16:24:42\n16:24 26/10/1985\nOct 26, 1985 PM 4:24",IDC_STATIC,136,118,94,25 - RTEXT "Custom format :",IDD_DATETIMEFORMAT_STATIC,14,148,77,8 + RTEXT "Custom format:",IDD_DATETIMEFORMAT_STATIC,14,148,77,8 EDITTEXT IDC_DATETIMEFORMAT_EDIT,92,146,175,12,ES_AUTOHSCROLL LTEXT "",IDD_DATETIMEFORMAT_RESULT_STATIC,94,163,180,8 diff --git a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp index b5148d0bb..eb3a00445 100644 --- a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp +++ b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp @@ -393,11 +393,11 @@ intptr_t CALLBACK RunDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam return TRUE; } - case IDC_BUTTON_FILE_BROWSER : + case IDC_BUTTON_FILE_BROWSER: { CustomFileDialog fd(_hSelf); - fd.setExtFilter(TEXT("Executable file : "), { TEXT(".exe"), TEXT(".com"), TEXT(".cmd"), TEXT(".bat") }); - fd.setExtFilter(TEXT("All files : "), TEXT(".*")); + fd.setExtFilter(L"Executable File", { L".exe", L".com", L".cmd", L".bat" }); + fd.setExtFilter(L"All Files", L".*"); generic_string fn = fd.doOpenSingleFileDlg(); if (!fn.empty()) diff --git a/PowerEditor/src/winmain.cpp b/PowerEditor/src/winmain.cpp index f1db98ebf..c43b0150a 100644 --- a/PowerEditor/src/winmain.cpp +++ b/PowerEditor/src/winmain.cpp @@ -730,7 +730,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE /*hPrevInstance } catch (int i) { - TCHAR str[50] = TEXT("God Damned Exception : "); + wchar_t str[50] = L"God Damned Exception:"; TCHAR code[10]; wsprintf(code, TEXT("%d"), i); wcscat_s(str, code);