diff options
| author | 2021-06-08 19:36:44 -0700 | |
|---|---|---|
| committer | 2021-06-08 19:36:44 -0700 | |
| commit | f9c3e2e872fd35c5056c07c6fd7341bbafe1ba89 (patch) | |
| tree | 574757ad1e06ca032b71248b9cb6b5e45f4361a1 | |
| parent | Merge pull request #6428 from bunnei/service-thread-crash-fix (diff) | |
| parent | configure_ui: Add translation context for file-scope strings (diff) | |
| download | yuzu-f9c3e2e872fd35c5056c07c6fd7341bbafe1ba89.tar.gz yuzu-f9c3e2e872fd35c5056c07c6fd7341bbafe1ba89.tar.xz yuzu-f9c3e2e872fd35c5056c07c6fd7341bbafe1ba89.zip | |
Merge pull request #6434 from lioncash/tcontext
configure_ui: Add translation context for file-scope strings
| -rw-r--r-- | src/yuzu/configuration/configure_ui.cpp | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/src/yuzu/configuration/configure_ui.cpp b/src/yuzu/configuration/configure_ui.cpp index 0a28c87c0..9674119e1 100644 --- a/src/yuzu/configuration/configure_ui.cpp +++ b/src/yuzu/configuration/configure_ui.cpp | |||
| @@ -17,17 +17,30 @@ | |||
| 17 | 17 | ||
| 18 | namespace { | 18 | namespace { |
| 19 | constexpr std::array default_icon_sizes{ | 19 | constexpr std::array default_icon_sizes{ |
| 20 | std::make_pair(0, QT_TR_NOOP("None")), | 20 | std::make_pair(0, QT_TRANSLATE_NOOP("ConfigureUI", "None")), |
| 21 | std::make_pair(32, QT_TR_NOOP("Small (32x32)")), | 21 | std::make_pair(32, QT_TRANSLATE_NOOP("ConfigureUI", "Small (32x32)")), |
| 22 | std::make_pair(64, QT_TR_NOOP("Standard (64x64)")), | 22 | std::make_pair(64, QT_TRANSLATE_NOOP("ConfigureUI", "Standard (64x64)")), |
| 23 | std::make_pair(128, QT_TR_NOOP("Large (128x128)")), | 23 | std::make_pair(128, QT_TRANSLATE_NOOP("ConfigureUI", "Large (128x128)")), |
| 24 | std::make_pair(256, QT_TR_NOOP("Full Size (256x256)")), | 24 | std::make_pair(256, QT_TRANSLATE_NOOP("ConfigureUI", "Full Size (256x256)")), |
| 25 | }; | 25 | }; |
| 26 | 26 | ||
| 27 | // clang-format off | ||
| 27 | constexpr std::array row_text_names{ | 28 | constexpr std::array row_text_names{ |
| 28 | QT_TR_NOOP("Filename"), QT_TR_NOOP("Filetype"), QT_TR_NOOP("Title ID"), | 29 | QT_TRANSLATE_NOOP("ConfigureUI", "Filename"), |
| 29 | QT_TR_NOOP("Title Name"), QT_TR_NOOP("None"), | 30 | QT_TRANSLATE_NOOP("ConfigureUI", "Filetype"), |
| 31 | QT_TRANSLATE_NOOP("ConfigureUI", "Title ID"), | ||
| 32 | QT_TRANSLATE_NOOP("ConfigureUI", "Title Name"), | ||
| 33 | QT_TRANSLATE_NOOP("ConfigureUI", "None"), | ||
| 30 | }; | 34 | }; |
| 35 | // clang-format on | ||
| 36 | |||
| 37 | QString GetTranslatedIconSize(size_t index) { | ||
| 38 | return QCoreApplication::translate("ConfigureUI", default_icon_sizes[index].second); | ||
| 39 | } | ||
| 40 | |||
| 41 | QString GetTranslatedRowTextName(size_t index) { | ||
| 42 | return QCoreApplication::translate("ConfigureUI", row_text_names[index]); | ||
| 43 | } | ||
| 31 | } // Anonymous namespace | 44 | } // Anonymous namespace |
| 32 | 45 | ||
| 33 | ConfigureUi::ConfigureUi(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureUi) { | 46 | ConfigureUi::ConfigureUi(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureUi) { |
| @@ -121,11 +134,11 @@ void ConfigureUi::RetranslateUI() { | |||
| 121 | ui->retranslateUi(this); | 134 | ui->retranslateUi(this); |
| 122 | 135 | ||
| 123 | for (int i = 0; i < ui->icon_size_combobox->count(); i++) { | 136 | for (int i = 0; i < ui->icon_size_combobox->count(); i++) { |
| 124 | ui->icon_size_combobox->setItemText(i, tr(default_icon_sizes[i].second)); | 137 | ui->icon_size_combobox->setItemText(i, GetTranslatedIconSize(static_cast<size_t>(i))); |
| 125 | } | 138 | } |
| 126 | 139 | ||
| 127 | for (int i = 0; i < ui->row_1_text_combobox->count(); i++) { | 140 | for (int i = 0; i < ui->row_1_text_combobox->count(); i++) { |
| 128 | const QString name = tr(row_text_names[i]); | 141 | const QString name = GetTranslatedRowTextName(static_cast<size_t>(i)); |
| 129 | 142 | ||
| 130 | ui->row_1_text_combobox->setItemText(i, name); | 143 | ui->row_1_text_combobox->setItemText(i, name); |
| 131 | ui->row_2_text_combobox->setItemText(i, name); | 144 | ui->row_2_text_combobox->setItemText(i, name); |
| @@ -152,8 +165,9 @@ void ConfigureUi::InitializeLanguageComboBox() { | |||
| 152 | } | 165 | } |
| 153 | 166 | ||
| 154 | void ConfigureUi::InitializeIconSizeComboBox() { | 167 | void ConfigureUi::InitializeIconSizeComboBox() { |
| 155 | for (const auto& size : default_icon_sizes) { | 168 | for (size_t i = 0; i < default_icon_sizes.size(); i++) { |
| 156 | ui->icon_size_combobox->addItem(QString::fromUtf8(size.second), size.first); | 169 | const auto size = default_icon_sizes[i].first; |
| 170 | ui->icon_size_combobox->addItem(GetTranslatedIconSize(i), size); | ||
| 157 | } | 171 | } |
| 158 | } | 172 | } |
| 159 | 173 | ||
| @@ -170,7 +184,7 @@ void ConfigureUi::UpdateFirstRowComboBox(bool init) { | |||
| 170 | ui->row_1_text_combobox->clear(); | 184 | ui->row_1_text_combobox->clear(); |
| 171 | 185 | ||
| 172 | for (std::size_t i = 0; i < row_text_names.size(); i++) { | 186 | for (std::size_t i = 0; i < row_text_names.size(); i++) { |
| 173 | const QString row_text_name = QString::fromUtf8(row_text_names[i]); | 187 | const QString row_text_name = GetTranslatedRowTextName(i); |
| 174 | ui->row_1_text_combobox->addItem(row_text_name, QVariant::fromValue(i)); | 188 | ui->row_1_text_combobox->addItem(row_text_name, QVariant::fromValue(i)); |
| 175 | } | 189 | } |
| 176 | 190 | ||
| @@ -189,7 +203,7 @@ void ConfigureUi::UpdateSecondRowComboBox(bool init) { | |||
| 189 | ui->row_2_text_combobox->clear(); | 203 | ui->row_2_text_combobox->clear(); |
| 190 | 204 | ||
| 191 | for (std::size_t i = 0; i < row_text_names.size(); ++i) { | 205 | for (std::size_t i = 0; i < row_text_names.size(); ++i) { |
| 192 | const QString row_text_name = QString::fromUtf8(row_text_names[i]); | 206 | const QString row_text_name = GetTranslatedRowTextName(i); |
| 193 | ui->row_2_text_combobox->addItem(row_text_name, QVariant::fromValue(i)); | 207 | ui->row_2_text_combobox->addItem(row_text_name, QVariant::fromValue(i)); |
| 194 | } | 208 | } |
| 195 | 209 | ||