jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI,mac-avcapture: Use consistent variables in locales

master
Vainock 2022-06-27 01:33:39 +02:00 committed by Matt Gajownik
parent e612a6bd66
commit e053f9dd26
8 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UI/data/locale/en-US.ini
View File

@ -356,7 +356,7 @@ ConfirmExit.Text="OBS is currently active. All streams/recordings will be shut d
# confirm delete dialog box # confirm delete dialog box
ConfirmRemove.Title="Confirm Remove" ConfirmRemove.Title="Confirm Remove"
ConfirmRemove.Text="Are you sure you wish to remove '$1'?" ConfirmRemove.Text="Are you sure you wish to remove '%1'?"
ConfirmRemove.TextMultiple="Are you sure you wish to remove %1 items?" ConfirmRemove.TextMultiple="Are you sure you wish to remove %1 items?"
# output start messages # output start messages
@ -437,7 +437,7 @@ MissingFiles.MissingFile="Missing File"
MissingFiles.NewFile="New File" MissingFiles.NewFile="New File"
MissingFiles.HelpText="Some files are missing since you last used OBS." MissingFiles.HelpText="Some files are missing since you last used OBS."
MissingFiles.Clear="<cleared>" MissingFiles.Clear="<cleared>"
MissingFiles.NumFound="Found $1 of $2" MissingFiles.NumFound="Found %1 of %2"
MissingFiles.Search="Search Directory..." MissingFiles.Search="Search Directory..."
MissingFiles.SelectFile="Select file..." MissingFiles.SelectFile="Select file..."
MissingFiles.SelectDir="Select Folder to Search in" MissingFiles.SelectDir="Select Folder to Search in"

3
UI/window-basic-filters.cpp
View File

@ -799,8 +799,7 @@ static bool QueryRemove(QWidget *parent, obs_source_t *source)
{ {
const char *name = obs_source_get_name(source); const char *name = obs_source_get_name(source);
QString text = QTStr("ConfirmRemove.Text"); QString text = QTStr("ConfirmRemove.Text").arg(QT_UTF8(name));
text.replace("$1", QT_UTF8(name));
QMessageBox remove_source(parent); QMessageBox remove_source(parent);
remove_source.setText(text); remove_source.setText(text);

4
UI/window-basic-main-profiles.cpp
View File

@ -563,8 +563,8 @@ void OBSBasic::on_actionRemoveProfile_triggered(bool skipConfirmation)
return; return;
if (!skipConfirmation) { if (!skipConfirmation) {
QString text = QTStr("ConfirmRemove.Text"); QString text = QTStr("ConfirmRemove.Text")
text.replace("$1", QT_UTF8(oldName.c_str())); .arg(QT_UTF8(oldName.c_str()));
QMessageBox::StandardButton button = OBSMessageBox::question( QMessageBox::StandardButton button = OBSMessageBox::question(
this, QTStr("ConfirmRemove.Title"), text); this, QTStr("ConfirmRemove.Title"), text);

4
UI/window-basic-main-scene-collections.cpp
View File

@ -320,8 +320,8 @@ void OBSBasic::on_actionRemoveSceneCollection_triggered()
if (newPath.empty()) if (newPath.empty())
return; return;
QString text = QTStr("ConfirmRemove.Text"); QString text =
text.replace("$1", QT_UTF8(oldName.c_str())); QTStr("ConfirmRemove.Text").arg(QT_UTF8(oldName.c_str()));
QMessageBox::StandardButton button = OBSMessageBox::question( QMessageBox::StandardButton button = OBSMessageBox::question(
this, QTStr("ConfirmRemove.Title"), text); this, QTStr("ConfirmRemove.Title"), text);

3
UI/window-basic-main.cpp
View File

@ -3632,8 +3632,7 @@ bool OBSBasic::QueryRemoveSource(obs_source_t *source)
const char *name = obs_source_get_name(source); const char *name = obs_source_get_name(source);
QString text = QTStr("ConfirmRemove.Text"); QString text = QTStr("ConfirmRemove.Text").arg(QT_UTF8(name));
text.replace("$1", QT_UTF8(name));
QMessageBox remove_source(this); QMessageBox remove_source(this);
remove_source.setText(text); remove_source.setText(text);

15
UI/window-missing-files.cpp
View File

@ -493,9 +493,10 @@ OBSMissingFiles::OBSMissingFiles(obs_missing_files_t *files, QWidget *parent)
addMissingFile(oldPath, name); addMissingFile(oldPath, name);
} }
QString found = QTStr("MissingFiles.NumFound"); QString found =
found.replace("$1", "0"); QTStr("MissingFiles.NumFound")
found.replace("$2", QString::number(obs_missing_files_count(files))); .arg("0",
QString::number(obs_missing_files_count(files)));
ui->found->setText(found); ui->found->setText(found);
@ -573,10 +574,10 @@ void OBSMissingFiles::browseFolders()
void OBSMissingFiles::dataChanged() void OBSMissingFiles::dataChanged()
{ {
QString found = QTStr("MissingFiles.NumFound"); QString found = QTStr("MissingFiles.NumFound")
found.replace("$1", QString::number(filesModel->found())); .arg(QString::number(filesModel->found()),
found.replace("$2", QString::number(obs_missing_files_count(
QString::number(obs_missing_files_count(fileStore))); fileStore)));
ui->found->setText(found); ui->found->setText(found);

2
plugins/mac-avcapture/av-capture.mm
View File

@ -1940,7 +1940,7 @@ static bool update_int_list_property(obs_property_t *p, const int *val,
DStr buf, label; DStr buf, label;
dstr_printf(buf, "%d", *val); dstr_printf(buf, "%d", *val);
dstr_init_copy(label, obs_module_text(localization_name)); dstr_init_copy(label, obs_module_text(localization_name));
dstr_replace(label, "$1", buf->array); dstr_replace(label, "%1", buf->array);
size_t idx = obs_property_list_add_int(p, label->array, *val); size_t idx = obs_property_list_add_int(p, label->array, *val);
obs_property_list_item_disable(p, idx, true); obs_property_list_item_disable(p, idx, true);

2
plugins/mac-avcapture/data/locale/en-US.ini
View File

@ -10,5 +10,5 @@ VideoRange="Video range"
VideoRange.Partial="Partial" VideoRange.Partial="Partial"
VideoRange.Full="Full" VideoRange.Full="Full"
Auto="Auto" Auto="Auto"
Unknown="Unknown ($1)" Unknown="Unknown (%1)"
EnableAudio="Enable audio if supported by device" EnableAudio="Enable audio if supported by device"