thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: U32: Fix unused u32format where translations are used.

Browse source 
- Misc: Remove incorrect space.
This commit is contained in:
aryanrawlani28 2020-08-20 01:02:51 +05:30 • committed by Eugene Sandulenko
parent 1e8cb29a54
commit 8c5611c3ca
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gui/downloaddialog.cpp
View file

@ -212,14 +212,14 @@ Common::U32String DownloadDialog::getSizeLabelText() {
Common::String downloaded, downloadedUnits, total, totalUnits; Common::String downloaded, downloadedUnits, total, totalUnits;
downloaded = getHumanReadableBytes(CloudMan.getDownloadBytesNumber(), downloadedUnits); downloaded = getHumanReadableBytes(CloudMan.getDownloadBytesNumber(), downloadedUnits);
total = getHumanReadableBytes(CloudMan.getDownloadTotalBytesNumber(), totalUnits); total = getHumanReadableBytes(CloudMan.getDownloadTotalBytesNumber(), totalUnits);
return Common::U32String::format(_("Downloaded %s %s / %s %s"), downloaded.c_str(), _(downloadedUnits.c_str()).encode().c_str(), total.c_str(), _(totalUnits.c_str()).encode().c_str()); return Common::U32String::format(_("Downloaded %s %S / %s %S"), downloaded.c_str(), _(downloadedUnits).c_str(), total.c_str(), _(totalUnits).c_str());
} }
Common::U32String DownloadDialog::getSpeedLabelText() { Common::U32String DownloadDialog::getSpeedLabelText() {
Common::String speed, speedUnits; Common::String speed, speedUnits;
speed = getHumanReadableBytes(CloudMan.getDownloadSpeed(), speedUnits); speed = getHumanReadableBytes(CloudMan.getDownloadSpeed(), speedUnits);
speedUnits += "/s"; speedUnits += "/s";
return Common::U32String::format(_("Download speed: %s %s"), speed.c_str(), _(speedUnits).encode().c_str()); return Common::U32String::format(_("Download speed: %s %S"), speed.c_str(), _(speedUnits).c_str());
} }
void DownloadDialog::refreshWidgets() { void DownloadDialog::refreshWidgets() {

2
gui/editrecorddialog.cpp
View file

@ -55,7 +55,7 @@ EditRecordDialog::~EditRecordDialog() {
} }
EditRecordDialog::EditRecordDialog(const Common::U32String author, const Common::String name, const Common::String notes) : Dialog("EditRecordDialog") { EditRecordDialog::EditRecordDialog(const Common::U32String author, const Common::String name, const Common::String notes) : Dialog("EditRecordDialog") {
new StaticTextWidget(this, "EditRecordDialog.AuthorLabel" , _("Author:")); new StaticTextWidget(this, "EditRecordDialog.AuthorLabel", _("Author:"));
new StaticTextWidget(this, "EditRecordDialog.NameLabel", _("Name:")); new StaticTextWidget(this, "EditRecordDialog.NameLabel", _("Name:"));
new StaticTextWidget(this, "EditRecordDialog.NotesLabel", _("Notes:")); new StaticTextWidget(this, "EditRecordDialog.NotesLabel", _("Notes:"));
_authorEdit = new EditTextWidget(this, "EditRecordDialog.AuthorEdit", Common::U32String("")); _authorEdit = new EditTextWidget(this, "EditRecordDialog.AuthorEdit", Common::U32String(""));

2
gui/options.cpp
View file

@ -2805,7 +2805,7 @@ void GlobalOptionsDialog::setupCloudTab() {
uint64 usedSpace = CloudMan.getStorageUsedSpace(_selectedStorageIndex); uint64 usedSpace = CloudMan.getStorageUsedSpace(_selectedStorageIndex);
Common::String usedSpaceNumber, usedSpaceUnits; Common::String usedSpaceNumber, usedSpaceUnits;
usedSpaceNumber = Common::getHumanReadableBytes(usedSpace, usedSpaceUnits); usedSpaceNumber = Common::getHumanReadableBytes(usedSpace, usedSpaceUnits);
_storageUsedSpace->setLabel(Common::String::format("%s %s", usedSpaceNumber.c_str(), _(usedSpaceUnits.c_str()).encode().c_str())); _storageUsedSpace->setLabel(Common::U32String::format(Common::U32String("%s %S"), usedSpaceNumber.c_str(), _(usedSpaceUnits).c_str()));
_storageUsedSpace->setVisible(shownConnectedInfo); _storageUsedSpace->setVisible(shownConnectedInfo);
} }
if (_storageSyncHint) { if (_storageSyncHint) {