i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DriveSetup: minor GUI string changes

Browse Source 
* Use B_TRANSLATE_SYSTEM_NAME in BAlert title.
* Put filenames in quotes when spaces in filename could be
  confusing.
* Avoid a space at the endof a string where it could be overlooked
  ("Error:").

Change-Id: I7a705f4c36cbfcf27e69994b8f2126b7f6807363
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10221
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: Jérôme Duval <[email protected]>
This commit is contained in:
Humdinger
2026-01-10 17:17:07 +00:00
committed by Jérôme Duval
parent be37605a71
commit 2ee8a1ac06
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/drivesetup/MainWindow.cpp
+13 -9
View File
@@ -591,7 +591,9 @@ MainWindow::MessageReceived(BMessage* message)
fReadImageFilePanel = new(std::nothrow) BFilePanel(B_SAVE_PANEL, fReadImageFilePanel = new(std::nothrow) BFilePanel(B_SAVE_PANEL,
new BMessenger(this), NULL, B_FILE_NODE, false, NULL, NULL, new BMessenger(this), NULL, B_FILE_NODE, false, NULL, NULL,
true); true);
fReadImageFilePanel->Window()->SetTitle(B_TRANSLATE("DriveSetup: Save disk image")); BString title(B_TRANSLATE("%appname%: Save disk image"));
title.ReplaceFirst("%appname%", B_TRANSLATE_SYSTEM_NAME("DriveSetup"));
fReadImageFilePanel->Window()->SetTitle(title);
} }
if (fReadImageFilePanel != NULL) { if (fReadImageFilePanel != NULL) {
@@ -762,7 +764,9 @@ FileErrorAlert(const char* text, const char* fileName, alert_type type)
{ {
BString message; BString message;
message.SetToFormat(text, fileName); message.SetToFormat(text, fileName);
BAlert* alert = new BAlert(B_TRANSLATE("DriveSetup error"), message.String(), BString title(B_TRANSLATE("%appname% error"));
title.ReplaceFirst("%appname%", B_TRANSLATE_SYSTEM_NAME("DriveSetup"));
BAlert* alert = new BAlert(title, message.String(),
B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_FROM_WIDEST, type); B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_FROM_WIDEST, type);
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE); alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
alert->Go(NULL); alert->Go(NULL);
@@ -778,13 +782,13 @@ MainWindow::RegisterFileDiskDevice(const char* fileName)
if (lstat(fileName, &st) != 0) { if (lstat(fileName, &st) != 0) {
status_t error = errno; status_t error = errno;
FileErrorAlert(B_TRANSLATE("Failed to get information about %s"), FileErrorAlert(B_TRANSLATE("Failed to get information about '%s'."),
fileName, B_STOP_ALERT); fileName, B_STOP_ALERT);
return error; return error;
} }
if (!S_ISREG(st.st_mode)) { if (!S_ISREG(st.st_mode)) {
FileErrorAlert(B_TRANSLATE("%s is not a regular file."), fileName, FileErrorAlert(B_TRANSLATE("'%s' is not a regular file."), fileName,
B_STOP_ALERT); B_STOP_ALERT);
return B_BAD_VALUE; return B_BAD_VALUE;
} }
@@ -835,7 +839,7 @@ MainWindow::UnRegisterFileDiskDevice(const char* fileNameOrID)
return B_OK; return B_OK;
} else { } else {
FileErrorAlert(B_TRANSLATE( FileErrorAlert(B_TRANSLATE(
"No file disk device found with the given ID, trying file %s"), "No file disk device found with the given ID, trying file '%s'."),
fileNameOrID, B_WARNING_ALERT); fileNameOrID, B_WARNING_ALERT);
} }
} }
@@ -844,7 +848,7 @@ MainWindow::UnRegisterFileDiskDevice(const char* fileNameOrID)
struct stat st; struct stat st;
if (lstat(fileNameOrID, &st) != 0) { if (lstat(fileNameOrID, &st) != 0) {
status_t error = errno; status_t error = errno;
FileErrorAlert(B_TRANSLATE("Failed to get information about %s"), FileErrorAlert(B_TRANSLATE("Failed to get information about '%s'."),
fileNameOrID, B_STOP_ALERT); fileNameOrID, B_STOP_ALERT);
return error; return error;
} }
@@ -870,7 +874,7 @@ MainWindow::UnRegisterFileDiskDevice(const char* fileNameOrID)
status_t error = roster.UnregisterFileDevice(device.ID()); status_t error = roster.UnregisterFileDevice(device.ID());
if (error != B_OK) { if (error != B_OK) {
FileErrorAlert(B_TRANSLATE( FileErrorAlert(B_TRANSLATE(
"Failed to unregister file disk device %s"), fileNameOrID, "Failed to unregister file disk device %s."), fileNameOrID,
B_STOP_ALERT); B_STOP_ALERT);
return error; return error;
} }
@@ -1340,8 +1344,8 @@ MainWindow::_DisplayPartitionError(BString _message,
if (error < B_OK) { if (error < B_OK) {
BString helper = message; BString helper = message;
const char* errorString const char* errorString
= B_TRANSLATE_COMMENT("Error: ", "in any error alert"); = B_TRANSLATE_COMMENT("Error:", "in any error alert");
snprintf(message, sizeof(message), "%s\n\n%s%s", helper.String(), snprintf(message, sizeof(message), "%s\n\n%s %s", helper.String(),
errorString, strerror(error)); errorString, strerror(error));
} }