mirror of
https://github.com/pbatard/rufus.git
synced 2024-08-14 23:57:05 +00:00
[loc] fix additional right-to-left issues
* Fix mishandling of spaces after period, comma, colon, etc. * Fix Test/Alpha notifications not displaying properly in RTL mode * Part of #621
This commit is contained in:
Pete Batard
parent
5e85d4e47a
commit
805d44a5b8
8 changed files with 38 additions and 29 deletions
|
|
@ -840,12 +840,11 @@ t MSG_171 "بدء عملية الفرمتة. \nستم تدمير أية بيان
|
|||
t MSG_172 "معلومات الترخيص و اعتراف بالفضل"
|
||||
t MSG_173 "إضغط لاختيار..."
|
||||
# The following will appear in the about dialog
|
||||
# NOTE: In the line below, there are (potentially) invisible Right-To-Left marks
|
||||
# (UTF-8: 0xE2 0x80 0x8f) After "USB" and after "Rufus".
|
||||
t MSG_174 "Rufus - أداة فرمتة الـ USB جديرة بالثقة"
|
||||
# This one's a massive empirical fest of RTL marks and nonsensical parenthesis, to
|
||||
# make the output look about right... If you edit this, all I can say is: GOOD LUCK!!!
|
||||
t MSG_175 "إصدار %d.%d)بناء %d("
|
||||
# NOTE: Because it starts with English text, the line below requires an invisible
|
||||
# RIGHT-TO-LEFT EMBEDDING (UTF-8: 0xE2 0x80 0xAB) at the beginning and a
|
||||
# POP DIRECTIONAL FORMATTING (UTF-8: 0xE2 0x80 0xAC) at the end.
|
||||
t MSG_174 "Rufus - أداة فرمتة الـ USB جديرة بالثقة"
|
||||
t MSG_175 "إصدار %d.%d (بناء %d)"
|
||||
t MSG_176 "الترجمة العربية: عمر الصمد، تحديث: جلال شفرور (mailto:ch_djalel@yahoo.com)"
|
||||
t MSG_177 "إخبار عن مشكلة أو طلب تعديلات على:"
|
||||
t MSG_178 "حقوق الطبع والنشر الإضافية:"
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
const char* about_blurb_format =
|
||||
"{\\rtf1\\ansi\n"
|
||||
"{\\b\\fs20%s}\\line\n"
|
||||
"\\b\\fs20%s\\b0\\line\n"
|
||||
"\\fs18%s\\line\n"
|
||||
"\\line\n"
|
||||
"%s\\line\n"
|
||||
|
|
@ -30,7 +30,7 @@ RUFUS_URL "\\line\n"
|
|||
"%s\\line\n"
|
||||
"https://github.com/pbatard/rufus/issues\\line\n"
|
||||
"\\line\n"
|
||||
"{\\b\\fs19 %s}}";
|
||||
"\\b\\fs19 %s\\b0}";
|
||||
|
||||
const char* additional_copyrights =
|
||||
"{\\rtf1\\ansi\n"
|
||||
|
|
|
|||
|
|
@ -375,7 +375,7 @@ void reset_localization(int dlg_id)
|
|||
* Uses a rolling list of buffers to allow concurrency
|
||||
* TODO: use dynamic realloc'd buffer in case LOC_MESSAGE_SIZE is not enough
|
||||
*/
|
||||
char* lmprintf(int msg_id, ...)
|
||||
char* lmprintf(uint32_t msg_id, ...)
|
||||
{
|
||||
static int buf_id = 0;
|
||||
static char buf[LOC_MESSAGE_NB][LOC_MESSAGE_SIZE];
|
||||
|
|
@ -383,7 +383,9 @@ char* lmprintf(int msg_id, ...)
|
|||
va_list args;
|
||||
buf_id %= LOC_MESSAGE_NB;
|
||||
buf[buf_id][0] = 0;
|
||||
BOOL needs_rtf_rtl_marks = (msg_id & MSG_RTF) && right_to_left_mode;
|
||||
|
||||
msg_id &= MSG_MASK;
|
||||
if ((msg_id > MSG_000) && (msg_id < MSG_MAX)) {
|
||||
format = msg_table[msg_id - MSG_000];
|
||||
}
|
||||
|
|
@ -391,9 +393,13 @@ char* lmprintf(int msg_id, ...)
|
|||
if (format == NULL) {
|
||||
safe_sprintf(buf[buf_id], LOC_MESSAGE_SIZE-1, "MSG_%03d UNTRANSLATED", msg_id - MSG_000);
|
||||
} else {
|
||||
if (needs_rtf_rtl_marks)
|
||||
safe_strcpy(buf[buf_id], LOC_MESSAGE_SIZE-1, "\\rtlch");
|
||||
va_start(args, msg_id);
|
||||
safe_vsnprintf(buf[buf_id], LOC_MESSAGE_SIZE-1, format, args);
|
||||
safe_vsnprintf(&buf[buf_id][needs_rtf_rtl_marks?6:0], LOC_MESSAGE_SIZE-1, format, args);
|
||||
va_end(args);
|
||||
if (needs_rtf_rtl_marks)
|
||||
safe_strcat(buf[buf_id], LOC_MESSAGE_SIZE-1, "\\ltrch");
|
||||
buf[buf_id][LOC_MESSAGE_SIZE-1] = '\0';
|
||||
}
|
||||
return buf[buf_id++];
|
||||
|
|
|
|||
|
|
@ -37,6 +37,9 @@
|
|||
// the translation will be ignored
|
||||
#define LOC_FRAMEWORK_VERSION 1
|
||||
|
||||
#define MSG_RTF 0x10000000
|
||||
#define MSG_MASK 0x0FFFFFFF
|
||||
|
||||
#define luprint(msg) uprintf("%s(%d): " msg "\n", loc_filename, loc_line_nr)
|
||||
#define luprintf(msg, ...) uprintf("%s(%d): " msg "\n", loc_filename, loc_line_nr, __VA_ARGS__)
|
||||
|
||||
|
|
@ -166,7 +169,7 @@ void _exit_localization(BOOL reinit);
|
|||
void apply_localization(int dlg_id, HWND hDlg);
|
||||
void reset_localization(int dlg_id);
|
||||
void free_dialog_list(void);
|
||||
char* lmprintf(int msg_id, ...);
|
||||
char* lmprintf(uint32_t msg_id, ...);
|
||||
BOOL get_supported_locales(const char* filename);
|
||||
BOOL get_loc_data_file(const char* filename, loc_cmd* lcmd);
|
||||
void free_locale_list(void);
|
||||
|
|
|
|||
|
|
@ -2151,12 +2151,12 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
|
|||
|
||||
#if defined(ALPHA)
|
||||
// Add a VERY ANNOYING popup for Alpha releases, so that people don't start redistributing them
|
||||
Notification(MSG_INFO, NULL, "ALPHA VERSION", "This is an Alpha version of " APPLICATION_NAME
|
||||
" - It is meant to be used for testing ONLY and should NOT be distributed as a release.");
|
||||
MessageBoxA(NULL, "This is an Alpha version of " APPLICATION_NAME " - It is meant to be used for "
|
||||
"testing ONLY and should NOT be distributed as a release.", "ALPHA VERSION", MSG_INFO);
|
||||
#elif defined(TEST)
|
||||
// Same thing for Test releases
|
||||
Notification(MSG_INFO, NULL, "TEST VERSION", "This is a Test version of " APPLICATION_NAME
|
||||
" - It is meant to be used for testing ONLY and should NOT be distributed as a release.");
|
||||
MessageBoxA(NULL, "This is a Test version of " APPLICATION_NAME " - It is meant to be used for "
|
||||
"testing ONLY and should NOT be distributed as a release.", "TEST VERSION", MSG_INFO);
|
||||
#endif
|
||||
return (INT_PTR)FALSE;
|
||||
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
#define LEFT_TO_RIGHT_EMBEDDING ""
|
||||
#define RIGHT_TO_LEFT_EMBEDDING ""
|
||||
#define POP_DIRECTIONAL_FORMATTING ""
|
||||
#define RIGHT_TO_LEFT_OVERRIDE ""
|
||||
#define DRIVE_ACCESS_TIMEOUT 15000 // How long we should retry drive access (in ms)
|
||||
#define DRIVE_ACCESS_RETRIES 60 // How many times we should retry
|
||||
#define DRIVE_INDEX_MIN 0x00000080
|
||||
|
|
|
|||
12
src/rufus.rc
12
src/rufus.rc
|
|
@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
|||
|
||||
IDD_DIALOG DIALOGEX 12, 12, 242, 376
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Rufus 2.5.785"
|
||||
CAPTION "Rufus 2.5.786"
|
||||
FONT 8, "Segoe UI Symbol", 400, 0, 0x0
|
||||
BEGIN
|
||||
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
|
||||
|
|
@ -156,7 +156,7 @@ FONT 8, "Segoe UI Symbol", 400, 0, 0x0
|
|||
BEGIN
|
||||
ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20
|
||||
DEFPUSHBUTTON "Close",IDCANCEL,221,172,50,14,WS_GROUP
|
||||
CONTROL "",IDC_POLICY,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x804,46,8,235,132,WS_EX_STATICEDGE
|
||||
CONTROL "",IDC_POLICY,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_TABSTOP,46,8,235,132,WS_EX_STATICEDGE
|
||||
GROUPBOX "Settings",IDS_UPDATE_SETTINGS_GRP,45,145,165,46
|
||||
LTEXT "Check for updates",IDS_UPDATE_FREQUENCY_TXT,51,159,76,11
|
||||
COMBOBOX IDC_UPDATE_FREQUENCY,133,155,66,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
|
|
@ -319,8 +319,8 @@ END
|
|||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 2,5,785,0
|
||||
PRODUCTVERSION 2,5,785,0
|
||||
FILEVERSION 2,5,786,0
|
||||
PRODUCTVERSION 2,5,786,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
|
|
@ -337,13 +337,13 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
|
||||
VALUE "FileDescription", "Rufus"
|
||||
VALUE "FileVersion", "2.5.785"
|
||||
VALUE "FileVersion", "2.5.786"
|
||||
VALUE "InternalName", "Rufus"
|
||||
VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
|
||||
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
|
||||
VALUE "OriginalFilename", "rufus.exe"
|
||||
VALUE "ProductName", "Rufus"
|
||||
VALUE "ProductVersion", "2.5.785"
|
||||
VALUE "ProductVersion", "2.5.786"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
|
|||
12
src/stdlg.c
12
src/stdlg.c
|
|
@ -609,10 +609,10 @@ INT_PTR CALLBACK AboutCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP
|
|||
CenterDialog(hDlg);
|
||||
if (settings_commcheck)
|
||||
ShowWindow(GetDlgItem(hDlg, IDC_ABOUT_UPDATES), SW_SHOW);
|
||||
safe_sprintf(about_blurb, sizeof(about_blurb), about_blurb_format, lmprintf(MSG_174),
|
||||
lmprintf(MSG_175, rufus_version[0], rufus_version[1], rufus_version[2]),
|
||||
safe_sprintf(about_blurb, sizeof(about_blurb), about_blurb_format, lmprintf(MSG_174|MSG_RTF),
|
||||
lmprintf(MSG_175|MSG_RTF, rufus_version[0], rufus_version[1], rufus_version[2]),
|
||||
right_to_left_mode?"Akeo \\\\ Pete Batard 2011-2015 © Copyright":"Copyright © 2011-2015 Pete Batard / Akeo",
|
||||
lmprintf(MSG_176), lmprintf(MSG_177), lmprintf(MSG_178));
|
||||
lmprintf(MSG_176|MSG_RTF), lmprintf(MSG_177|MSG_RTF), lmprintf(MSG_178|MSG_RTF));
|
||||
for (i=0; i<ARRAYSIZE(hEdit); i++) {
|
||||
hEdit[i] = GetDlgItem(hDlg, edit_id[i]);
|
||||
SendMessage(hEdit[i], EM_AUTOURLDETECT, 1, 0);
|
||||
|
|
@ -1291,9 +1291,9 @@ INT_PTR CALLBACK UpdateCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
|
|||
IGNORE_RETVAL(ComboBox_SetCurSel(hBeta, ReadSettingBool(SETTING_INCLUDE_BETAS)?0:1));
|
||||
hPolicy = GetDlgItem(hDlg, IDC_POLICY);
|
||||
SendMessage(hPolicy, EM_AUTOURLDETECT, 1, 0);
|
||||
safe_sprintf(update_policy_text, sizeof(update_policy_text), update_policy, lmprintf(MSG_179),
|
||||
lmprintf(MSG_180), lmprintf(MSG_181), lmprintf(MSG_182), lmprintf(MSG_183), lmprintf(MSG_184),
|
||||
lmprintf(MSG_185), lmprintf(MSG_186));
|
||||
safe_sprintf(update_policy_text, sizeof(update_policy_text), update_policy, lmprintf(MSG_179|MSG_RTF),
|
||||
lmprintf(MSG_180|MSG_RTF), lmprintf(MSG_181|MSG_RTF), lmprintf(MSG_182|MSG_RTF), lmprintf(MSG_183|MSG_RTF),
|
||||
lmprintf(MSG_184|MSG_RTF), lmprintf(MSG_185|MSG_RTF), lmprintf(MSG_186|MSG_RTF));
|
||||
SendMessageA(hPolicy, EM_SETTEXTEX, (WPARAM)&friggin_microsoft_unicode_amateurs, (LPARAM)update_policy_text);
|
||||
SendMessage(hPolicy, EM_SETSEL, -1, -1);
|
||||
SendMessage(hPolicy, EM_SETEVENTMASK, 0, ENM_LINK|ENM_REQUESTRESIZE);
|
||||
|
|
|
|||
Loading…
Reference in a new issue