Use localized 'Trash' in error message
If the user uses localized files/folders, the 'Trash' in the move/copy/link error message should be localized as well. The "Printers" folder is actually ~/config/settings/printers, so the error message should use a lower case folder name as well. Change-Id: I1f81b4a5cf391915b0e5687d6c2534048d993483 Reviewed-on: https://review.haiku-os.org/c/haiku/+/10035 Reviewed-by: waddlesplash <[email protected]> Tested-by: Commit checker robot <[email protected]> Haiku-Format: Haiku-format Bot <[email protected]>
This commit is contained in:
@@ -58,6 +58,7 @@ respective holders. All rights reserved.
|
||||
#include <Entry.h>
|
||||
#include <FindDirectory.h>
|
||||
#include <Locale.h>
|
||||
#include <LocaleRoster.h>
|
||||
#include <NodeInfo.h>
|
||||
#include <Path.h>
|
||||
#include <Roster.h>
|
||||
@@ -906,10 +907,18 @@ InitCopy(CopyLoopControl* loopControl, uint32 moveMode,
|
||||
return B_ERROR;
|
||||
} else if (FSIsTrashDir(&entry)) {
|
||||
BString errorStr;
|
||||
BString folderName;
|
||||
|
||||
if (moveMode == kCreateLink || moveMode == kCreateRelativeLink)
|
||||
errorStr.SetTo(B_TRANSLATE("You cannot create a link to the Trash directory."));
|
||||
errorStr.SetTo(B_TRANSLATE("You cannot create a link to the %trash% directory."));
|
||||
else
|
||||
errorStr.SetTo(B_TRANSLATE("You cannot copy or move the Trash directory."));
|
||||
errorStr.SetTo(B_TRANSLATE("You cannot copy or move the %trash% directory."));
|
||||
|
||||
if (BLocaleRoster::Default()->IsFilesystemTranslationPreferred())
|
||||
folderName.SetTo(B_TRANSLATE("Trash"));
|
||||
else
|
||||
folderName.SetTo("Trash");
|
||||
errorStr.ReplaceFirst("%trash%", folderName.String());
|
||||
|
||||
BAlert* alert = new BAlert("", errorStr.String(), B_TRANSLATE("Cancel"), 0, 0,
|
||||
B_WIDTH_AS_USUAL, B_WARNING_ALERT);
|
||||
@@ -919,7 +928,7 @@ InitCopy(CopyLoopControl* loopControl, uint32 moveMode,
|
||||
return B_ERROR;
|
||||
} else if (FSIsPrintersDir(&entry)
|
||||
&& (moveMode == kCopySelectionTo || moveMode == kMoveSelectionTo)) {
|
||||
BString errorStr(B_TRANSLATE("You cannot copy or move the Printers directory."));
|
||||
BString errorStr(B_TRANSLATE("You cannot copy or move the 'printers' directory."));
|
||||
|
||||
BAlert* alert = new BAlert("", errorStr.String(), B_TRANSLATE("Cancel"), 0, 0,
|
||||
B_WIDTH_AS_USUAL, B_WARNING_ALERT);
|
||||
|
||||
Reference in New Issue
Block a user