rvtr/GodMode9i
1
Fork 0
mirror of https://github.com/rvtr/GodMode9i.git synced 2025-11-02 00:11:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make a couple strings more flexible

Browse Source 
Force push fixes some typos
This commit is contained in:
Pk11 2021-11-22 22:42:42 -06:00
parent af1772a337
commit 52355b98c7
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arm9/source/fileOperations.cpp
View File

@ -81,8 +81,7 @@ bool calculateSHA1(const char *fileName, u8 *sha1) {
swiSHA1Init(&ctx); swiSHA1Init(&ctx);
font->clear(false); font->clear(false);
font->print(0, 0, false, STR_CALCULATING_SHA1); font->printf(0, 0, false, Alignment::left, Palette::white, STR_CALCULATING_SHA1.c_str(), fileName);
font->print(0, 1, false, fileName);
int nameHeight = font->calcHeight(fileName); int nameHeight = font->calcHeight(fileName);
font->print(0, nameHeight + 2, false, STR_START_CANCEL); font->print(0, nameHeight + 2, false, STR_START_CANCEL);

3
arm9/source/file_browse.cpp
View File

@ -842,8 +842,7 @@ std::string browseForFile (void) {
fileOffset = 0; fileOffset = 0;
} else if (FAT_getAttr(entry->name.c_str()) & ATTR_READONLY) { } else if (FAT_getAttr(entry->name.c_str()) & ATTR_READONLY) {
font->clear(false); font->clear(false);
font->print(0, 0, false, STR_FAILED_DELETING); font->printf(0, 0, false, Alignment::left, Palette::white, STR_FAILED_DELETING.c_str(), entry->name.c_str());
font->print(0, 1, false, entry->name);
font->print(0, 3, false, STR_A_CONTINUE); font->print(0, 3, false, STR_A_CONTINUE);
pressed = 0; pressed = 0;

4
arm9/source/language.inl
View File

@ -23,10 +23,10 @@ STRING(AND_N_MORE, "- and %d more...")
STRING(DELETE_X, "Delete \"%s\"?") STRING(DELETE_X, "Delete \"%s\"?")
STRING(DELETING_FILES, "Deleting files, please wait...") STRING(DELETING_FILES, "Deleting files, please wait...")
STRING(DELETING_FOLDER, "Deleting folder, 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_ALLOCATE_BUFFER, "Could not allocate buffer")
STRING(COULD_NOT_OPEN_FILE_READING, "Could not open file for reading") 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(N_OF_N_BYTES_PROCESSED, "%d/%d bytes processed")
STRING(RUNNING_X_WITH_N_PARAMETERS, "Running %s with %d parameters") STRING(RUNNING_X_WITH_N_PARAMETERS, "Running %s with %d parameters")
STRING(START_FAILED_ERROR_N, "Start failed. Error %d") STRING(START_FAILED_ERROR_N, "Start failed. Error %d")

4
nitrofiles/languages/en-US/language.ini
View File

@ -23,10 +23,10 @@ AND_N_MORE=- and %d more...
DELETE_X=Delete "%s"? DELETE_X=Delete "%s"?
DELETING_FILES=Deleting files, please wait... DELETING_FILES=Deleting files, please wait...
DELETING_FOLDER=Deleting folder, 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_ALLOCATE_BUFFER=Could not allocate buffer
COULD_NOT_OPEN_FILE_READING=Could not open file for reading 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 N_OF_N_BYTES_PROCESSED=%d/%d bytes processed
RUNNING_X_WITH_N_PARAMETERS=Running %s with %d parameters RUNNING_X_WITH_N_PARAMETERS=Running %s with %d parameters
START_FAILED_ERROR_N=Start failed. Error %d START_FAILED_ERROR_N=Start failed. Error %d