aiden
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Host: Fix broken relative time plurals

Browse Source
pull/3788/head
Stenzek 1 month ago
parent 535154dcbe
commit 9d05a87567
No known key found for this signature in database
5 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
src/duckstation-qt/translations/create-update-and-edit-language.bat
Unescape Escape View File

@ -66,7 +66,7 @@ REM A good .ts file has been passed
ECHO Updating %filename%...
ECHO.
SET "linguist=..\..\..\dep\prebuilt\windows-x64\bin"
SET "context=.././ ../../core/ ../../util/ -tr-function-alias QT_TRANSLATE_NOOP+=TRANSLATE,QT_TRANSLATE_NOOP+=TRANSLATE_SV,QT_TRANSLATE_NOOP+=TRANSLATE_STR,QT_TRANSLATE_NOOP+=TRANSLATE_FS,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_SV,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_STR,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_FS,QT_TRANSLATE_N_NOOP3+=TRANSLATE_FMT,QT_TRANSLATE_NOOP+=TRANSLATE_NOOP,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_NOOP,translate+=TRANSLATE_PLURAL_STR,translate+=TRANSLATE_PLURAL_SSTR,translate+=TRANSLATE_PLURAL_FS"
SET "context=.././ ../../core/ ../../util/ -tr-function-alias QT_TRANSLATE_NOOP+=TRANSLATE,QT_TRANSLATE_NOOP+=TRANSLATE_SV,QT_TRANSLATE_NOOP+=TRANSLATE_STR,QT_TRANSLATE_NOOP+=TRANSLATE_FS,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_SV,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_STR,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_FS,QT_TRANSLATE_N_NOOP3+=TRANSLATE_PLURAL_NOOP,QT_TRANSLATE_NOOP+=TRANSLATE_NOOP,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_NOOP,translate+=TRANSLATE_PLURAL_STR,translate+=TRANSLATE_PLURAL_SSTR,translate+=TRANSLATE_PLURAL_FS"
"%linguist%\lupdate.exe" %context% -ts %filename%
ECHO.

32
src/duckstation-qt/translations/duckstation-qt_en.ts
Unescape Escape View File

@ -280,6 +280,38 @@
</context>
<context>
<name>Host</name>
<message numerus="yes">
<source>%n days ago</source>
<comment>Date difference</comment>
<translation>
<numerusform>%n day ago</numerusform>
<numerusform>%n days ago</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n seconds ago</source>
<comment>Time difference</comment>
<translation>
<numerusform>%n second ago</numerusform>
<numerusform>%n seconds ago</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n minutes ago</source>
<comment>Time difference</comment>
<translation>
<numerusform>%n minute ago</numerusform>
<numerusform>%n minutes ago</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n hours ago</source>
<comment>Time difference</comment>
<translation>
<numerusform>%n hour ago</numerusform>
<numerusform>%n hours ago</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n seconds</source>
<translation>

2
src/duckstation-qt/translations/update-and-edit-english.bat
Unescape Escape View File

@ -1,7 +1,7 @@
@echo off
SET "linguist=..\..\..\dep\prebuilt\windows-x64\bin"
SET "context=.././ ../../core/ ../../util/ -tr-function-alias QT_TRANSLATE_NOOP+=TRANSLATE,QT_TRANSLATE_NOOP+=TRANSLATE_SV,QT_TRANSLATE_NOOP+=TRANSLATE_STR,QT_TRANSLATE_NOOP+=TRANSLATE_FS,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_SV,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_STR,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_FS,QT_TRANSLATE_N_NOOP3+=TRANSLATE_FMT,QT_TRANSLATE_NOOP+=TRANSLATE_NOOP,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_NOOP,translate+=TRANSLATE_PLURAL_STR,translate+=TRANSLATE_PLURAL_SSTR,translate+=TRANSLATE_PLURAL_FS -pluralonly -no-obsolete"
SET "context=.././ ../../core/ ../../util/ -tr-function-alias QT_TRANSLATE_NOOP+=TRANSLATE,QT_TRANSLATE_NOOP+=TRANSLATE_SV,QT_TRANSLATE_NOOP+=TRANSLATE_STR,QT_TRANSLATE_NOOP+=TRANSLATE_FS,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_SV,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_STR,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_FS,QT_TRANSLATE_N_NOOP3+=TRANSLATE_PLURAL_NOOP,QT_TRANSLATE_NOOP+=TRANSLATE_NOOP,QT_TRANSLATE_NOOP3+=TRANSLATE_DISAMBIG_NOOP,translate+=TRANSLATE_PLURAL_STR,translate+=TRANSLATE_PLURAL_SSTR,translate+=TRANSLATE_PLURAL_FS -pluralonly -no-obsolete"
"%linguist%\lupdate.exe" %context% -ts duckstation-qt_en.ts
pause

8
src/util/translation.cpp
Unescape Escape View File

@ -178,7 +178,7 @@ TinyString Host::FormatRelativeDate(std::time_t timestamp, bool long_format /* =
}
else if (delta < 7 * 24 * 60 * 60)
{
return TranslatePluralToTinyString("Host", TRANSLATE_DISAMBIG_NOOP("Host", "%n days ago", "Date difference"),
return TranslatePluralToTinyString("Host", TRANSLATE_PLURAL_NOOP("Host", "%n days ago", "Date difference"),
"Date difference", static_cast<int>(delta) / (24 * 60 * 60));
}
}
@ -205,17 +205,17 @@ TinyString Host::FormatRelativeDateTime(std::time_t timestamp, bool long_format
}
else if (delta < 60)
{
return TranslatePluralToTinyString("Host", TRANSLATE_DISAMBIG_NOOP("Host", "%n seconds ago", "Time difference"),
return TranslatePluralToTinyString("Host", TRANSLATE_PLURAL_NOOP("Host", "%n seconds ago", "Time difference"),
"Time difference", static_cast<int>(delta));
}
else if (delta < 60 * 60)
{
return TranslatePluralToTinyString("Host", TRANSLATE_DISAMBIG_NOOP("Host", "%n minutes ago", "Time difference"),
return TranslatePluralToTinyString("Host", TRANSLATE_PLURAL_NOOP("Host", "%n minutes ago", "Time difference"),
"Time difference", static_cast<int>(delta) / 60);
}
else if (delta < 12 * 60 * 60)
{
return TranslatePluralToTinyString("Host", TRANSLATE_DISAMBIG_NOOP("Host", "%n hours ago", "Time difference"),
return TranslatePluralToTinyString("Host", TRANSLATE_PLURAL_NOOP("Host", "%n hours ago", "Time difference"),
"Time difference", static_cast<int>(delta) / (60 * 60));
}

1
src/util/translation.h
Unescape Escape View File

@ -75,3 +75,4 @@ s32 GetTranslatedStringImpl(std::string_view context, std::string_view msg, std:
// Does not translate the string at runtime, but allows the UI to in its own way.
#define TRANSLATE_NOOP(context, msg) msg
#define TRANSLATE_DISAMBIG_NOOP(context, msg, disambiguation) msg
#define TRANSLATE_PLURAL_NOOP(context, msg, disambiguation) msg

Write Preview
Loading…
Cancel
Save