diff --git a/arm9/source/fileOperations.cpp b/arm9/source/fileOperations.cpp index 033ed72..dcc8801 100644 --- a/arm9/source/fileOperations.cpp +++ b/arm9/source/fileOperations.cpp @@ -81,8 +81,7 @@ bool calculateSHA1(const char *fileName, u8 *sha1) { swiSHA1Init(&ctx); font->clear(false); - font->print(0, 0, false, STR_CALCULATING_SHA1); - font->print(0, 1, false, fileName); + font->printf(0, 0, false, Alignment::left, Palette::white, STR_CALCULATING_SHA1.c_str(), fileName); int nameHeight = font->calcHeight(fileName); font->print(0, nameHeight + 2, false, STR_START_CANCEL); diff --git a/arm9/source/file_browse.cpp b/arm9/source/file_browse.cpp index d0fab3a..7c9cbbd 100644 --- a/arm9/source/file_browse.cpp +++ b/arm9/source/file_browse.cpp @@ -842,8 +842,7 @@ std::string browseForFile (void) { fileOffset = 0; } else if (FAT_getAttr(entry->name.c_str()) & ATTR_READONLY) { font->clear(false); - font->print(0, 0, false, STR_FAILED_DELETING); - font->print(0, 1, false, entry->name); + font->printf(0, 0, false, Alignment::left, Palette::white, STR_FAILED_DELETING.c_str(), entry->name.c_str()); font->print(0, 3, false, STR_A_CONTINUE); pressed = 0; diff --git a/arm9/source/language.inl b/arm9/source/language.inl index 380159f..a9c6b4a 100644 --- a/arm9/source/language.inl +++ b/arm9/source/language.inl @@ -23,10 +23,10 @@ STRING(AND_N_MORE, "- and %d more...") STRING(DELETE_X, "Delete \"%s\"?") STRING(DELETING_FILES, "Deleting files, please wait...") STRING(DELETING_FOLDER, "Deleting folder, please wait...") -STRING(FAILED_DELETING, "Failed deleting:") +STRING(FAILED_DELETING, "Failed deleting:\n%s") STRING(COULD_NOT_ALLOCATE_BUFFER, "Could not allocate buffer") STRING(COULD_NOT_OPEN_FILE_READING, "Could not open file for reading") -STRING(CALCULATING_SHA1, "Calculating SHA1 hash of:") +STRING(CALCULATING_SHA1, "Calculating SHA1 hash of:\n%s") STRING(N_OF_N_BYTES_PROCESSED, "%d/%d bytes processed") STRING(RUNNING_X_WITH_N_PARAMETERS, "Running %s with %d parameters") STRING(START_FAILED_ERROR_N, "Start failed. Error %d") diff --git a/nitrofiles/languages/en-US/language.ini b/nitrofiles/languages/en-US/language.ini index dd98ff8..7f6df03 100644 --- a/nitrofiles/languages/en-US/language.ini +++ b/nitrofiles/languages/en-US/language.ini @@ -23,10 +23,10 @@ AND_N_MORE=- and %d more... DELETE_X=Delete "%s"? DELETING_FILES=Deleting files, please wait... DELETING_FOLDER=Deleting folder, please wait... -FAILED_DELETING=Failed deleting: +FAILED_DELETING=Failed deleting:\n%s COULD_NOT_ALLOCATE_BUFFER=Could not allocate buffer COULD_NOT_OPEN_FILE_READING=Could not open file for reading -CALCULATING_SHA1=Calculating SHA1 hash of: +CALCULATING_SHA1=Calculating SHA1 hash of:\n%s N_OF_N_BYTES_PROCESSED=%d/%d bytes processed RUNNING_X_WITH_N_PARAMETERS=Running %s with %d parameters START_FAILED_ERROR_N=Start failed. Error %d