starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-14 18:34:32 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

Qt: Fix singular form in a few translatable strings (#3681)

Browse Source
This commit is contained in:
Davide Pesavento
2026-01-12 21:55:59 -05:00
committed by GitHub
parent 671751f980
commit f7083f9635
5 changed files with 79 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/fullscreenui_achievements.cpp
View File

@@ -2355,14 +2355,14 @@ SmallString FullscreenUI::FormatRelativeTimestamp(time_t timestamp, time_t curre
if (diff < HOUR)
{
const s64 minutes = diff / MINUTE;
return TRANSLATE_PLURAL_SSTR("Achievements", "%n minutes ago", "Relative time", static_cast<int>(minutes));
const int minutes = static_cast<int>(diff / MINUTE);
return TRANSLATE_PLURAL_SSTR("Achievements", "%n minutes ago", "Relative time", minutes);
}
if (diff < DAY)
{
const s64 hours = diff / HOUR;
return TRANSLATE_PLURAL_SSTR("Achievements", "%n hours ago", "Relative time", static_cast<int>(hours));
const int hours = static_cast<int>(diff / HOUR);
return TRANSLATE_PLURAL_SSTR("Achievements", "%n hours ago", "Relative time", hours);
}
if (diff < DAY * 2)
@@ -2380,8 +2380,8 @@ SmallString FullscreenUI::FormatRelativeTimestamp(time_t timestamp, time_t curre
if (diff < WEEK)
{
const s64 days = diff / DAY;
return TRANSLATE_PLURAL_SSTR("Achievements", "%n days ago", "Relative time", static_cast<int>(days));
const int days = static_cast<int>(diff / DAY);
return TRANSLATE_PLURAL_SSTR("Achievements", "%n days ago", "Relative time", days);
}
const std::optional<std::tm> timestamp_tm = Common::LocalTime(timestamp);
@@ -2395,8 +2395,8 @@ SmallString FullscreenUI::FormatRelativeTimestamp(time_t timestamp, time_t curre
if (total_months == 0)
{
// Less than a month - use weeks
const s64 weeks = diff / WEEK;
return TRANSLATE_PLURAL_SSTR("Achievements", "%n weeks ago", "Relative time", static_cast<int>(weeks));
const int weeks = static_cast<int>(diff / WEEK);
return TRANSLATE_PLURAL_SSTR("Achievements", "%n weeks ago", "Relative time", weeks);
}
if (total_months < 12)

2
src/duckstation-qt/controllerbindingwidgets.cpp
View File

@@ -673,7 +673,7 @@ void ControllerMacroEditWidget::updateFrequencyText()
if (m_frequency == 0)
m_ui.frequencyText->setText(tr("Macro will not repeat."));
else
m_ui.frequencyText->setText(tr("Macro will toggle buttons every %1 frames.").arg(m_frequency));
m_ui.frequencyText->setText(tr("Macro will toggle buttons every %n frame(s).", nullptr, m_frequency));
}
void ControllerMacroEditWidget::updateBinds()

7
src/duckstation-qt/gamesummarywidget.cpp
View File

@@ -164,7 +164,7 @@ void GameSummaryWidget::populateUi(const GameList::Entry* entry)
if (dbentry->min_players != dbentry->max_players)
release_info.append(tr("%1-%2 players").arg(dbentry->min_players).arg(dbentry->max_players));
else
release_info.append(tr("%1 players").arg(dbentry->min_players));
release_info.append(tr("%n player(s)", nullptr, dbentry->min_players));
}
if (dbentry->min_blocks != 0)
{
@@ -173,7 +173,7 @@ void GameSummaryWidget::populateUi(const GameList::Entry* entry)
if (dbentry->min_blocks != dbentry->max_blocks)
release_info.append(tr("%1-%2 memory card blocks").arg(dbentry->min_blocks).arg(dbentry->max_blocks));
else
release_info.append(tr("%1 memory card blocks").arg(dbentry->min_blocks));
release_info.append(tr("%n memory card block(s)", nullptr, dbentry->min_blocks));
}
if (!release_info.isEmpty())
m_ui.releaseInfo->setText(release_info);
@@ -326,8 +326,7 @@ void GameSummaryWidget::populateTracksInfo()
if (!image)
return;
m_ui.revision->setText(tr("%1 tracks covering %2 MB (%3 MB on disk)")
.arg(image->GetTrackCount())
m_ui.revision->setText(tr("%n track(s) covering %1 MB (%2 MB on disk)", nullptr, image->GetTrackCount())
.arg(((image->GetLBACount() * CDImage::RAW_SECTOR_SIZE) + 1048575) / 1048576)
.arg((image->GetSizeOnDisk() + 1048575) / 1048576));

2
src/duckstation-qt/inputbindingwidgets.cpp
View File

@@ -99,7 +99,7 @@ void InputBindingWidget::updateTextAndToolTip()
else if (m_bindings.size() > 1)
{
m_full_text.clear();
setText(tr("%n bindings", "", static_cast<int>(m_bindings.size())));
setText(tr("%n bindings", nullptr, static_cast<int>(m_bindings.size())));
// keep the full thing for the tooltip
const QString qss = QString::fromStdString(StringUtil::JoinString(m_bindings.begin(), m_bindings.end(), "\n"));

91
src/duckstation-qt/translations/duckstation-qt_en.ts
View File

@@ -4,8 +4,8 @@
<context>
<name>AchievementSettingsWidget</name>
<message numerus="yes">
<location filename="../achievementsettingswidget.cpp" line="197"/>
<location filename="../achievementsettingswidget.cpp" line="204"/>
<location filename="../achievementsettingswidget.cpp" line="208"/>
<location filename="../achievementsettingswidget.cpp" line="215"/>
<source>%n seconds</source>
<translation>
<numerusform>%n second</numerusform>
@@ -16,7 +16,7 @@
<context>
<name>Achievements</name>
<message numerus="yes">
<location filename="../../core/achievements.cpp" line="1296"/>
<location filename="../../core/achievements.cpp" line="1278"/>
<source>You have unlocked {} of %n achievements</source>
<comment>Achievement popup</comment>
<translation>
@@ -25,7 +25,7 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/achievements.cpp" line="1299"/>
<location filename="../../core/achievements.cpp" line="1281"/>
<source>and earned {} of %n points</source>
<comment>Achievement popup</comment>
<translation>
@@ -34,7 +34,7 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/achievements.cpp" line="1329"/>
<location filename="../../core/achievements.cpp" line="1311"/>
<source>%n achievements are not supported by DuckStation.</source>
<comment>Achievement popup</comment>
<translation>
@@ -43,8 +43,8 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/achievements.cpp" line="1403"/>
<location filename="../../core/achievements.cpp" line="1425"/>
<location filename="../../core/achievements.cpp" line="1385"/>
<location filename="../../core/achievements.cpp" line="1407"/>
<source>%n achievements</source>
<comment>Mastery popup</comment>
<translation>
@@ -53,9 +53,9 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/achievements.cpp" line="1405"/>
<location filename="../../core/achievements.cpp" line="1427"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="1315"/>
<location filename="../../core/achievements.cpp" line="1387"/>
<location filename="../../core/achievements.cpp" line="1409"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="1788"/>
<source>%n points</source>
<comment>Achievement points</comment>
<translation>
@@ -64,7 +64,7 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/fullscreenui_achievements.cpp" line="358"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="830"/>
<source>%n unlocks have not been confirmed by the server.</source>
<comment>Pause Menu</comment>
<translation>
@@ -73,7 +73,7 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/fullscreenui_achievements.cpp" line="919"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="1392"/>
<source>You have unlocked all achievements and earned %n points!</source>
<comment>Point count</comment>
<translation>
@@ -82,7 +82,7 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/fullscreenui_achievements.cpp" line="946"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="1419"/>
<source>%n achievements are not supported by DuckStation and cannot be unlocked.</source>
<comment>Unsupported achievement count</comment>
<translation>
@@ -91,7 +91,7 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/fullscreenui_achievements.cpp" line="1467"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="1940"/>
<source>This game has %n leaderboards.</source>
<comment>Leaderboard count</comment>
<translation>
@@ -100,7 +100,7 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/fullscreenui_achievements.cpp" line="1469"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="1942"/>
<source>This subset has %n leaderboards.</source>
<comment>Leaderboard count</comment>
<translation>
@@ -109,7 +109,7 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/fullscreenui_achievements.cpp" line="1886"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="2359"/>
<source>%n minutes ago</source>
<comment>Relative time</comment>
<translation>
@@ -118,7 +118,7 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/fullscreenui_achievements.cpp" line="1892"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="2365"/>
<source>%n hours ago</source>
<comment>Relative time</comment>
<translation>
@@ -127,7 +127,7 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/fullscreenui_achievements.cpp" line="1911"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="2384"/>
<source>%n days ago</source>
<comment>Relative time</comment>
<translation>
@@ -136,7 +136,7 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/fullscreenui_achievements.cpp" line="1928"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="2399"/>
<source>%n weeks ago</source>
<comment>Relative time</comment>
<translation>
@@ -145,8 +145,8 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/fullscreenui_achievements.cpp" line="1932"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="1944"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="2403"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="2415"/>
<source>%n months ago</source>
<comment>Relative time</comment>
<translation>
@@ -155,7 +155,7 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/fullscreenui_achievements.cpp" line="1946"/>
<location filename="../../core/fullscreenui_achievements.cpp" line="2417"/>
<source>%n years ago</source>
<comment>Relative time</comment>
<translation>
@@ -203,6 +203,17 @@
</translation>
</message>
</context>
<context>
<name>ControllerMacroEditWidget</name>
<message numerus="yes">
<location filename="../controllerbindingwidgets.cpp" line="676"/>
<source>Macro will toggle buttons every %n frame(s).</source>
<translation>
<numerusform>Macro will toggle buttons every %n frame.</numerusform>
<numerusform>Macro will toggle buttons every %n frames.</numerusform>
</translation>
</message>
</context>
<context>
<name>EmulationSettingsWidget</name>
<message numerus="yes">
@@ -225,7 +236,7 @@
<context>
<name>FullscreenUI</name>
<message numerus="yes">
<location filename="../../core/fullscreenui_widgets.cpp" line="4740"/>
<location filename="../../core/fullscreenui_widgets.cpp" line="5013"/>
<source>%n seconds remaining</source>
<comment>Loading time</comment>
<translation>
@@ -234,7 +245,7 @@
</translation>
</message>
<message numerus="yes">
<location filename="../../core/fullscreenui_widgets.cpp" line="4745"/>
<location filename="../../core/fullscreenui_widgets.cpp" line="5018"/>
<source>%n minutes remaining</source>
<comment>Loading time</comment>
<translation>
@@ -259,6 +270,7 @@
<name>GameList</name>
<message numerus="yes">
<location filename="../../core/game_list.cpp" line="1648"/>
<location filename="../gamelistwidget.cpp" line="2423"/>
<source>%n seconds</source>
<translation>
<numerusform>%n second</numerusform>
@@ -267,6 +279,7 @@
</message>
<message numerus="yes">
<location filename="../../core/game_list.cpp" line="1644"/>
<location filename="../gamelistwidget.cpp" line="2425"/>
<source>%n hours</source>
<translation>
<numerusform>%n hour</numerusform>
@@ -275,6 +288,7 @@
</message>
<message numerus="yes">
<location filename="../../core/game_list.cpp" line="1646"/>
<location filename="../gamelistwidget.cpp" line="2424"/>
<source>%n minutes</source>
<translation>
<numerusform>%n minute</numerusform>
@@ -282,6 +296,33 @@
</translation>
</message>
</context>
<context>
<name>GameSummaryWidget</name>
<message numerus="yes">
<location filename="../gamesummarywidget.cpp" line="167"/>
<source>%n player(s)</source>
<translation>
<numerusform>%n player</numerusform>
<numerusform>%n players</numerusform>
</translation>
</message>
<message numerus="yes">
<location filename="../gamesummarywidget.cpp" line="176"/>
<source>%n memory card block(s)</source>
<translation>
<numerusform>%n memory card block</numerusform>
<numerusform>%n memory card blocks</numerusform>
</translation>
</message>
<message numerus="yes">
<location filename="../gamesummarywidget.cpp" line="329"/>
<source>%n track(s) covering %1 MB (%2 MB on disk)</source>
<translation>
<numerusform>%n track covering %1 MB (%2 MB on disk)</numerusform>
<numerusform>%n tracks covering %1 MB (%2 MB on disk)</numerusform>
</translation>
</message>
</context>
<context>
<name>InputBindingWidget</name>
<message numerus="yes">
@@ -307,7 +348,7 @@
<context>
<name>System</name>
<message numerus="yes">
<location filename="../../core/system.cpp" line="1701"/>
<location filename="../../core/system.cpp" line="1710"/>
<source>You cannot pause until another %n second(s) have passed.</source>
<translation>
<numerusform>You cannot pause until another %n second has passed.</numerusform>