ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9253 from JosJuice/positional-arguments 

Use positional arguments in all translatable fmt strings
This commit is contained in:
Léo Lam 2020-11-17 18:02:39 +01:00 committed by GitHub
parent 4c9b226bd6 9a01c3fb9f
commit 07be82d64f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp
View File

@ -560,8 +560,8 @@ bool BluetoothReal::OpenDevice(libusb_device* device)
const int ret = libusb_open(m_device, &m_handle); const int ret = libusb_open(m_device, &m_handle);
if (ret != 0) if (ret != 0)
{ {
m_last_open_error = fmt::format(Common::GetStringT("Failed to open Bluetooth device: {}"), m_last_open_error =
libusb_error_name(ret)); Common::FmtFormatT("Failed to open Bluetooth device: {0}", libusb_error_name(ret));
return false; return false;
} }
@ -574,9 +574,8 @@ bool BluetoothReal::OpenDevice(libusb_device* device)
result = libusb_detach_kernel_driver(m_handle, INTERFACE); result = libusb_detach_kernel_driver(m_handle, INTERFACE);
if (result < 0 && result != LIBUSB_ERROR_NOT_FOUND && result != LIBUSB_ERROR_NOT_SUPPORTED) if (result < 0 && result != LIBUSB_ERROR_NOT_FOUND && result != LIBUSB_ERROR_NOT_SUPPORTED)
{ {
m_last_open_error = m_last_open_error = Common::FmtFormatT(
fmt::format(Common::GetStringT("Failed to detach kernel driver for BT passthrough: {}"), "Failed to detach kernel driver for BT passthrough: {0}", libusb_error_name(result));
libusb_error_name(result));
return false; return false;
} }
} }

6
Source/Core/Core/NetPlayServer.cpp
View File

@ -1071,8 +1071,7 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, Client& player)
case SYNC_SAVE_DATA_FAILURE: case SYNC_SAVE_DATA_FAILURE:
{ {
m_dialog->AppendChat( m_dialog->AppendChat(Common::FmtFormatT("{0} failed to synchronize.", player.name));
fmt::format(Common::GetStringT("{} failed to synchronize."), player.name));
m_dialog->OnGameStartAborted(); m_dialog->OnGameStartAborted();
ChunkedDataAbort(); ChunkedDataAbort();
m_start_pending = false; m_start_pending = false;
@ -1115,8 +1114,7 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, Client& player)
case SYNC_CODES_FAILURE: case SYNC_CODES_FAILURE:
{ {
m_dialog->AppendChat( m_dialog->AppendChat(Common::FmtFormatT("{0} failed to synchronize codes.", player.name));
fmt::format(Common::GetStringT("{} failed to synchronize codes."), player.name));
m_dialog->OnGameStartAborted(); m_dialog->OnGameStartAborted();
m_start_pending = false; m_start_pending = false;
} }

13
Source/Core/DiscIO/CompressedBlob.cpp
View File

@ -107,7 +107,8 @@ bool CompressedBlobReader::GetBlock(u64 block_num, u8* out_ptr)
m_file.Seek(offset, SEEK_SET); m_file.Seek(offset, SEEK_SET);
if (!m_file.ReadBytes(m_zlib_buffer.data(), comp_block_size)) if (!m_file.ReadBytes(m_zlib_buffer.data(), comp_block_size))
{ {
PanicAlertFmtT("The disc image \"{}\" is truncated, some of the data is missing.", m_file_name); PanicAlertFmtT("The disc image \"{0}\" is truncated, some of the data is missing.",
m_file_name);
m_file.Clear(); m_file.Clear();
return false; return false;
} }
@ -116,8 +117,8 @@ bool CompressedBlobReader::GetBlock(u64 block_num, u8* out_ptr)
const u32 block_hash = Common::HashAdler32(m_zlib_buffer.data(), comp_block_size); const u32 block_hash = Common::HashAdler32(m_zlib_buffer.data(), comp_block_size);
if (block_hash != m_hashes[block_num]) if (block_hash != m_hashes[block_num])
{ {
PanicAlertFmtT("The disc image \"{}\" is corrupt.\n" PanicAlertFmtT("The disc image \"{0}\" is corrupt.\n"
"Hash of block {} is {:08x} instead of {:08x}.", "Hash of block {1} is {2:08x} instead of {3:08x}.",
m_file_name, block_num, block_hash, m_hashes[block_num]); m_file_name, block_num, block_hash, m_hashes[block_num]);
} }
@ -277,7 +278,7 @@ bool ConvertToGCZ(BlobReader* infile, const std::string& infile_path,
if (!outfile) if (!outfile)
{ {
PanicAlertFmtT( PanicAlertFmtT(
"Failed to open the output file \"{}\".\n" "Failed to open the output file \"{0}\".\n"
"Check that you have permissions to write the target folder and that the media can " "Check that you have permissions to write the target folder and that the media can "
"be written.", "be written.",
outfile_path); outfile_path);
@ -368,11 +369,11 @@ bool ConvertToGCZ(BlobReader* infile, const std::string& infile_path,
} }
if (result == ConversionResultCode::ReadFailed) if (result == ConversionResultCode::ReadFailed)
PanicAlertFmtT("Failed to read from the input file \"{}\".", infile_path); PanicAlertFmtT("Failed to read from the input file \"{0}\".", infile_path);
if (result == ConversionResultCode::WriteFailed) if (result == ConversionResultCode::WriteFailed)
{ {
PanicAlertFmtT("Failed to write the output file \"{}\".\n" PanicAlertFmtT("Failed to write the output file \"{0}\".\n"
"Check that you have enough space available on the target drive.", "Check that you have enough space available on the target drive.",
outfile_path); outfile_path);
} }

6
Source/Core/DiscIO/FileBlob.cpp
View File

@ -50,7 +50,7 @@ bool ConvertToPlain(BlobReader* infile, const std::string& infile_path,
if (!outfile) if (!outfile)
{ {
PanicAlertFmtT( PanicAlertFmtT(
"Failed to open the output file \"{}\".\n" "Failed to open the output file \"{0}\".\n"
"Check that you have permissions to write the target folder and that the media can " "Check that you have permissions to write the target folder and that the media can "
"be written.", "be written.",
outfile_path); outfile_path);
@ -90,13 +90,13 @@ bool ConvertToPlain(BlobReader* infile, const std::string& infile_path,
const u64 sz = std::min(buffer_size, infile->GetDataSize() - inpos); const u64 sz = std::min(buffer_size, infile->GetDataSize() - inpos);
if (!infile->Read(inpos, sz, buffer.data())) if (!infile->Read(inpos, sz, buffer.data()))
{ {
PanicAlertFmtT("Failed to read from the input file \"{}\".", infile_path); PanicAlertFmtT("Failed to read from the input file \"{0}\".", infile_path);
success = false; success = false;
break; break;
} }
if (!outfile.WriteBytes(buffer.data(), sz)) if (!outfile.WriteBytes(buffer.data(), sz))
{ {
PanicAlertFmtT("Failed to write the output file \"{}\".\n" PanicAlertFmtT("Failed to write the output file \"{0}\".\n"
"Check that you have enough space available on the target drive.", "Check that you have enough space available on the target drive.",
outfile_path); outfile_path);
success = false; success = false;

2
Source/Core/DiscIO/NANDImporter.cpp
View File

@ -272,6 +272,6 @@ void NANDImporter::ExportKeys(const std::string& nand_root)
const std::string file_path = nand_root + "/keys.bin"; const std::string file_path = nand_root + "/keys.bin";
File::IOFile file(file_path, "wb"); File::IOFile file(file_path, "wb");
if (!file.WriteBytes(m_nand_keys.data(), NAND_KEYS_SIZE)) if (!file.WriteBytes(m_nand_keys.data(), NAND_KEYS_SIZE))
PanicAlertFmtT("Unable to write to file {}", file_path); PanicAlertFmtT("Unable to write to file {0}", file_path);
} }
} // namespace DiscIO } // namespace DiscIO

10
Source/Core/DiscIO/VolumeVerifier.cpp
View File

@ -312,11 +312,11 @@ std::vector<RedumpVerifier::PotentialMatch> RedumpVerifier::ScanDatfile(const st
// so show a panic alert rather than just using ERROR_LOG // so show a panic alert rather than just using ERROR_LOG
// i18n: "Serial" refers to serial numbers, e.g. RVL-RSBE-USA // i18n: "Serial" refers to serial numbers, e.g. RVL-RSBE-USA
PanicAlertFmtT("Serial and/or version data is missing from {}\n" PanicAlertFmtT(
"Please append \"{}\" (without the quotes) to the datfile URL when downloading\n" "Serial and/or version data is missing from {0}\n"
"Example: {}", "Please append \"{1}\" (without the quotes) to the datfile URL when downloading\n"
GetPathForSystem(system), "serial,version", "Example: {2}",
"http://redump.org/datfile/gc/serial,version"); GetPathForSystem(system), "serial,version", "http://redump.org/datfile/gc/serial,version");
m_result = {Status::Error, Common::GetStringT("Failed to parse Redump.org data")}; m_result = {Status::Error, Common::GetStringT("Failed to parse Redump.org data")};
return {}; return {};
} }

6
Source/Core/DiscIO/WIABlob.cpp
View File

@ -2033,7 +2033,7 @@ bool ConvertToWIAOrRVZ(BlobReader* infile, const std::string& infile_path,
if (!outfile) if (!outfile)
{ {
PanicAlertFmtT( PanicAlertFmtT(
"Failed to open the output file \"{}\".\n" "Failed to open the output file \"{0}\".\n"
"Check that you have permissions to write the target folder and that the media can " "Check that you have permissions to write the target folder and that the media can "
"be written.", "be written.",
outfile_path); outfile_path);
@ -2048,11 +2048,11 @@ bool ConvertToWIAOrRVZ(BlobReader* infile, const std::string& infile_path,
chunk_size, callback); chunk_size, callback);
if (result == ConversionResultCode::ReadFailed) if (result == ConversionResultCode::ReadFailed)
PanicAlertFmtT("Failed to read from the input file \"{}\".", infile_path); PanicAlertFmtT("Failed to read from the input file \"{0}\".", infile_path);
if (result == ConversionResultCode::WriteFailed) if (result == ConversionResultCode::WriteFailed)
{ {
PanicAlertFmtT("Failed to write the output file \"{}\".\n" PanicAlertFmtT("Failed to write the output file \"{0}\".\n"
"Check that you have enough space available on the target drive.", "Check that you have enough space available on the target drive.",
outfile_path); outfile_path);
} }

2
Source/Core/InputCommon/InputConfig.cpp
View File

@ -73,7 +73,7 @@ bool InputConfig::LoadConfig(bool isGC)
if (profiles.empty()) if (profiles.empty())
{ {
// TODO: PanicAlert shouldn't be used for this. // TODO: PanicAlert shouldn't be used for this.
PanicAlertFmtT("No profiles found for game setting '{}'", profile_setting); PanicAlertFmtT("No profiles found for game setting '{0}'", profile_setting);
continue; continue;
} }