From 7c88e74478a6c37e2885c973949d8cf283ce5da5 Mon Sep 17 00:00:00 2001 From: Tatsunori Uchino Date: Wed, 13 Sep 2023 17:25:55 +0900 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E8=A6=8F=E8=A1=A8=E7=8F=BE=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E3=83=91=E3=82=A4=E3=83=AB=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E6=99=82=E3=81=AE=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=A1=E3=83=83?= =?UTF-8?q?=E3=82=BB=E3=83=BC=E3=82=B8=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/String_define.h | 3 ++- sakura_core/extmodule/CBregexp.cpp | 4 +++- sakura_core/sakura_rc.rc | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sakura_core/String_define.h b/sakura_core/String_define.h index e878572890..f45be768df 100644 --- a/sakura_core/String_define.h +++ b/sakura_core/String_define.h @@ -1326,5 +1326,6 @@ #define STR_FILEDIALOG_MRU 35040 #define STR_FILEDIALOG_OPENFOLDER 35041 #define STR_GSTR_APPNAME 35047 +#define STR_BREGONIG_PREAMBLE 35048 -// Now using max number 35047 by STR_GSTR_APPNAME +// Now using max number 35048 by STR_GSTR_APPNAME diff --git a/sakura_core/extmodule/CBregexp.cpp b/sakura_core/extmodule/CBregexp.cpp index 0b4d12fd1f..2796ed99c1 100644 --- a/sakura_core/extmodule/CBregexp.cpp +++ b/sakura_core/extmodule/CBregexp.cpp @@ -675,7 +675,9 @@ bool CheckRegexpSyntax( } if( !cRegexp.Compile( szPattern, NULL, nOption, bKakomi ) ){ // 2002/2/1 hor追加 if( bShowMessage ){ - ::MessageBox( hWnd, cRegexp.GetLastMessage(), + std::wstring message(LS(STR_BREGONIG_PREAMBLE)); + message.append(cRegexp.GetLastMessage()); + ::MessageBox( hWnd, message.c_str(), LS(STR_BREGONIG_TITLE), MB_OK | MB_ICONEXCLAMATION ); } return false; diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index 19ed8e290e..a77ded92a6 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -3161,6 +3161,7 @@ BEGIN STR_DLGFNCLST_UNIFY "現在の画面のドッキング配置情報をすべての共通設定・タイプ別設定にコピーして統一します。\n(現在開いている他画面の状態も統一します。)\n" STR_BREGONIG_ERROR "bregonig.dll のロードで予期せぬエラーが発生しました。" STR_BREGONIG_TITLE "正規表現エラー" + STR_BREGONIG_PREAMBLE "正規表現の構文に誤りがあります。\n詳細:" STR_ERR_CWSH09 "マクロの実行を中断しました。" STR_ERR_DLGMACRO03_1 "入力改行コードが指定されていません." STR_ERR_DLGMACRO16 "数値を指定してください."