Cleanup, add the new strings to en_US.ini

hrydgard · Oct 26, 2023 · e0ada6e · e0ada6e
1 parent b71e44c
commit e0ada6e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/Core/Util/GameDB.cpp b/Core/Util/GameDB.cpp
@@ -7,7 +7,7 @@
 
 GameDB g_gameDB;
 
-void SplitCSVLine(const std::string_view str, const char delim, std::vector<std::string_view> &result) {
+static void SplitCSVLine(const std::string_view str, std::vector<std::string_view> &result) {
 	result.clear();
 
 	int indexCommaToLeftOfColumn = 0;
@@ -67,7 +67,7 @@ bool GameDB::LoadFromVFS(VFSInterface &vfs, const char *filename) {
 	// Split the string into views of each line, keeping the original.
 	std::vector<std::string_view> lines = splitSV(contents_, '\n', false);
 
-	SplitCSVLine(lines[0], ',', columns_);
+	SplitCSVLine(lines[0], columns_);
 
 	const size_t titleColumn = GetColumnIndex("Title");
 	const size_t foreignTitleColumn = GetColumnIndex("Foreign Title");
@@ -78,7 +78,7 @@ bool GameDB::LoadFromVFS(VFSInterface &vfs, const char *filename) {
 	std::vector<std::string_view> items;
 	for (size_t i = 1; i < lines.size(); i++) {
 		auto &lineString = lines[i];
-		SplitCSVLine(lineString, ',', items);
+		SplitCSVLine(lineString, items);
 		if (items.size() != columns_.size()) {
 			// Bad line
 			ERROR_LOG(SYSTEM, "Bad line in CSV file: %s", std::string(lineString).c_str());

diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp
@@ -323,14 +323,14 @@ void GameScreen::render() {
 			}
 			tvVerified_->SetVisibility(UI::V_VISIBLE);
 			if (found) {
-				tvVerified_->SetText(ga->T("Verified by the ReDump project"));
+				tvVerified_->SetText(ga->T("ISO OK according to the Redump project"));
 				tvVerified_->SetLevel(NoticeLevel::SUCCESS);
 			} else {
-				tvVerified_->SetText(ga->T("CRC does not match, bad or modified ISO"));
+				tvVerified_->SetText(ga->T("CRC checksum does not match, bad or modified ISO"));
 				tvVerified_->SetLevel(NoticeLevel::ERROR);
 			}
 		} else {
-			tvVerified_->SetText(ga->T("Game ID not in database"));
+			tvVerified_->SetText(ga->T("Game ID unknown - not in the Redump database"));
 			tvVerified_->SetVisibility(UI::V_VISIBLE);
 			tvVerified_->SetLevel(NoticeLevel::WARN);
 		}
@@ -339,7 +339,7 @@ void GameScreen::render() {
 		if (tvVerified_) {
 			std::vector<GameDBInfo> dbInfos;
 			if (!g_gameDB.GetGameInfos(info->id_version, &dbInfos)) {
-				tvVerified_->SetText(ga->T("Game ID not in database"));
+				tvVerified_->SetText(ga->T("Game ID unknown - not in the ReDump database"));
 				tvVerified_->SetVisibility(UI::V_VISIBLE);
 				tvVerified_->SetLevel(NoticeLevel::WARN);
 			} else if (info->gameSizeUncompressed != 0) {  // don't do this check if info still pending

diff --git a/UI/GameScreen.h b/UI/GameScreen.h
@@ -88,5 +88,5 @@ class GameScreen : public UIDialogScreenWithGameBackground {
 	std::vector<Path> saveDirs;
 	std::string CRC32string;
 
-	bool isHomebrew_;
+	bool isHomebrew_ = false;
 };
diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini
@@ -524,18 +524,23 @@ ZIP file detected (Require WINRAR) = File is compressed (ZIP).\nPlease decompres
 [Game]
 Asia = Asia
 Calculate CRC = Calculate CRC
+Click "Calculate CRC" to verify ISO = Click "Calculate CRC" to verify ISO
 ConfirmDelete = Delete
+CRC checksum does not match, bad or modified ISO = CRC checksum does not match, bad or modified ISO
 Create Game Config = Create game config
 Create Shortcut = Create shortcut
 Delete Game = Delete game
 Delete Game Config = Delete game config
 Delete Save Data = Delete savedata
 Europe = Europe
+File size incorrect, bad or modified ISO = File size incorrect, bad or modified ISO
 Game = Game
+Game ID unknown - not in the ReDump database = Game ID unknown - not in the ReDump database
 Game Settings = Game settings
 Homebrew = Homebrew
 Hong Kong = Hong Kong
 InstallData = Data install
+ISO OK according to the ReDump project = ISO OK according to the ReDump project
 Japan = Japan
 Korea = Korea
 MB = MB