Skip to content

Translations: Use substitutions instead of concatenations #2646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ann0see merged 1 commit into from
Jun 14, 2022
Merged

Translations: Use substitutions instead of concatenations #2646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/audiomixerboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@ void CAudioMixerBoard::UpdateTitle()

if ( eRecorderState == RS_RECORDING )
{
strTitlePrefix = "[" + tr ( "RECORDING ACTIVE" ) + "] ";
strTitlePrefix = QString ( "[%1] " ).arg ( tr ( "RECORDING ACTIVE" ) );
}

// replace & signs with && (See Qt documentation for QLabel)
Expand All @@ -1183,7 +1183,7 @@ void CAudioMixerBoard::UpdateTitle()
QString strEscServerName = strServerName;
strEscServerName.replace ( "&", "&&" );

setTitle ( strTitlePrefix + tr ( "Personal Mix at: " ) + strEscServerName );
setTitle ( strTitlePrefix + tr ( "Personal Mix at: %1" ).arg ( strEscServerName ) );
Copy link
Copy Markdown
Collaborator

@pljones pljones Jun 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why isn't strTitlePrefix a substitution, too? And, indeed, why isn't line 1176 amended to use substitution?

Copy link
Copy Markdown
Member Author

@ann0see ann0see Jun 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would look a bit strange:
tr ( "%1Personal Mix at: %2") (note the missing space)

The RECORDING ACTIVE can be changed of course

Copy link
Copy Markdown
Collaborator

@pljones pljones Jun 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would look a bit strange:

That's not really much of an argument. And the change at 1176 also wasn't what I meant.

Maybe the title of the PR is wrong and this isn't about using substitutions instead of concatenations but something else?

Copy link
Copy Markdown
Member Author

@ann0see ann0see Jun 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you give a suggestion on what should be done? This PR is to make translations easier – as noted in the linked issue. If a change is not worth it – or even the whole PR, we can close the issue and PR

Copy link
Copy Markdown
Collaborator

@pljones pljones Jun 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like you said:

Suggested change
setTitle ( strTitlePrefix + tr ( "Personal Mix at: %1" ).arg ( strEscServerName ) );
setTitle ( tr ( "%1Personal Mix at: %2" ).arg ( strTitlePrefix ).arg ( strEscServerName ) );

But only if using substitutions instead of concatenations is the goal.

Copy link
Copy Markdown
Member Author

@ann0see ann0see Jun 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally, I don’t like this at all @BLumia @hoffie what do you think?

setAccessibleName ( title() );
}

Expand Down
8 changes: 4 additions & 4 deletions src/translation/translation_de_DE.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,8 @@
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="1181"/>
<source>Personal Mix at: </source>
<translation>Eigener Mix am Server: </translation>
<source>Personal Mix at: %1</source>
<translation>Eigener Mix am Server: %1</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -4485,8 +4485,8 @@ Wir haben Deinen Kanal stummgeschaltet und die Funktion &apos;Stummschalten&apos
<name>QCoreApplication</name>
<message>
<location filename="../../util.cpp" line="1926"/>
<source>, Version </source>
<translation>, Version </translation>
<source>%1, Version %2</source>
<translation>%1, Version %2</translation>
</message>
<message>
<location filename="../../util.cpp" line="1939"/>
Expand Down
8 changes: 4 additions & 4 deletions src/translation/translation_es_ES.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="1181"/>
<source>Personal Mix at: </source>
<translation>Mezcla Personal en el Servidor: </translation>
<source>Personal Mix at: %1</source>
<translation>Mezcla Personal en el Servidor: %1</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -4541,8 +4541,8 @@ Hemos silenciado tu canal y activado &apos;Silenciarme Yo&apos;. Por favor resue
<name>QCoreApplication</name>
<message>
<location filename="../../util.cpp" line="1926"/>
<source>, Version </source>
<translation>, Versión </translation>
<source>%1, Version %2</source>
<translation>%1, Versión %2</translation>
</message>
<message>
<location filename="../../util.cpp" line="1939"/>
Expand Down
8 changes: 4 additions & 4 deletions src/translation/translation_fr_FR.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="1181"/>
<source>Personal Mix at: </source>
<translation>Mixage personnel à : </translation>
<source>Personal Mix at: %1</source>
<translation>Mixage personnel à : %1</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -3921,8 +3921,8 @@ Nous avons coupé votre canal et activé &quot;Me silencer&quot;. Veuillez d&apo
<name>QCoreApplication</name>
<message>
<location filename="../../util.cpp" line="1926"/>
<source>, Version </source>
<translation>, version </translation>
<source>%1, Version %2</source>
<translation>%1, version %2</translation>
</message>
<message>
<location filename="../../util.cpp" line="1939"/>
Expand Down
8 changes: 4 additions & 4 deletions src/translation/translation_it_IT.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="1181"/>
<source>Personal Mix at: </source>
<translation>Mixer personale sul Server: </translation>
<source>Personal Mix at: %1</source>
<translation>Mixer personale sul Server: %1</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -4482,8 +4482,8 @@ E&apos; stato disattivato l&apos;audio del tuo canale ed inserito il &quot;Disat
<name>QCoreApplication</name>
<message>
<location filename="../../util.cpp" line="1926"/>
<source>, Version </source>
<translation>Versione, Versione </translation>
<source>%1, Version %2</source>
<translation>%1 Versione, Versione %2</translation>
</message>
<message>
<location filename="../../util.cpp" line="1939"/>
Expand Down
8 changes: 4 additions & 4 deletions src/translation/translation_nl_NL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="1181"/>
<source>Personal Mix at: </source>
<translation>Eigen mix op: </translation>
<source>Personal Mix at: %1</source>
<translation>Eigen mix op: %1</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -4489,8 +4489,8 @@ We hebben uw kanaal gedempt en &apos;Demp mijzelf&apos; geactiveerd. Los eerst h
<name>QCoreApplication</name>
<message>
<location filename="../../util.cpp" line="1926"/>
<source>, Version </source>
<translation>, Versie </translation>
<source>%1, Version %2</source>
<translation>%1, Versie %2</translation>
</message>
<message>
<location filename="../../util.cpp" line="1939"/>
Expand Down
8 changes: 4 additions & 4 deletions src/translation/translation_pl_PL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="1181"/>
<source>Personal Mix at: </source>
<translation>Własny miks na: </translation>
<source>Personal Mix at: %1</source>
<translation>Własny miks na: %1</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -3976,8 +3976,8 @@ Twój kanał został wyciszony i włączono „Wycisz mnie”. Napraw przyczynę
<name>QCoreApplication</name>
<message>
<location filename="../../util.cpp" line="1926"/>
<source>, Version </source>
<translation>, Wersja </translation>
<source>%1, Version %2</source>
<translation>%1, Wersja %2</translation>
</message>
<message>
<location filename="../../util.cpp" line="1939"/>
Expand Down
8 changes: 4 additions & 4 deletions src/translation/translation_pt_BR.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,8 @@
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="1181"/>
<source>Personal Mix at: </source>
<translation>Mixagem Pessoal em: </translation>
<source>Personal Mix at: %1</source>
<translation>Mixagem Pessoal em: %1</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -4519,8 +4519,8 @@ Silenciamos seu canal e ativamos &apos;Silenciar-me&apos;. Resolva o problema de
<name>QCoreApplication</name>
<message>
<location filename="../../util.cpp" line="1926"/>
<source>, Version </source>
<translation>, Versão </translation>
<source>%1, Version %2</source>
<translation>%1, Versão %2</translation>
</message>
<message>
<location filename="../../util.cpp" line="1939"/>
Expand Down
8 changes: 4 additions & 4 deletions src/translation/translation_pt_PT.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="1181"/>
<source>Personal Mix at: </source>
<translation>Mistura Pessoal no Servidor: </translation>
<source>Personal Mix at: %1</source>
<translation>Mistura Pessoal no Servidor: %1</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -4477,8 +4477,8 @@ O seu canal foi silenciado e foi activada a função &apos;Silenciar-me&apos;. P
<name>QCoreApplication</name>
<message>
<location filename="../../util.cpp" line="1926"/>
<source>, Version </source>
<translation>, Versão </translation>
<source>%1, Version %2</source>
<translation>%1, Versão %2</translation>
</message>
<message>
<location filename="../../util.cpp" line="1939"/>
Expand Down
8 changes: 4 additions & 4 deletions src/translation/translation_sk_SK.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="1181"/>
<source>Personal Mix at: </source>
<translation>Osobný mix na: </translation>
<source>Personal Mix at: %1</source>
<translation>Osobný mix na: %1</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -3769,8 +3769,8 @@ Stíšili sme váš kanál a aktivovali nastavenia &apos;Stíšiť ma&apos;. Pro
<name>QCoreApplication</name>
<message>
<location filename="../../util.cpp" line="1926"/>
<source>, Version </source>
<translation>, Verzia </translation>
<source>%1, Version %2</source>
<translation>%1, Verzia %2</translation>
</message>
<message>
<location filename="../../util.cpp" line="1939"/>
Expand Down
8 changes: 4 additions & 4 deletions src/translation/translation_sv_SE.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="1181"/>
<source>Personal Mix at: </source>
<translation>Personlig mix på: </translation>
<source>Personal Mix at: %1</source>
<translation>Personlig mix på: %1</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -4116,8 +4116,8 @@ Vi stängde av din kanal och aktiverade &apos;Tysta mig själv&apos;. Vänligen
<name>QCoreApplication</name>
<message>
<location filename="../../util.cpp" line="1926"/>
<source>, Version </source>
<translation>, Version </translation>
<source>%1, Version %2</source>
<translation>%1, Version %2</translation>
</message>
<message>
<location filename="../../util.cpp" line="1939"/>
Expand Down
8 changes: 4 additions & 4 deletions src/translation/translation_zh_CN.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="1181"/>
<source>Personal Mix at: </source>
<translation>个人混音室: </translation>
<source>Personal Mix at: %1</source>
<translation>个人混音室: %1</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -3288,8 +3288,8 @@ We muted your channel and activated &apos;Mute Myself&apos;. Please solve the fe
<name>QCoreApplication</name>
<message>
<location filename="../../util.cpp" line="1926"/>
<source>, Version </source>
<translation>，版本 </translation>
<source>%1, Version %2</source>
<translation>%1，版本 %2</translation>
</message>
<message>
<location filename="../../util.cpp" line="1939"/>
Expand Down
2 changes: 1 addition & 1 deletion src/util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,7 @@ QString GetVersionAndNameStr ( const bool bDisplayInGui )
strVersionText += " *** ";
}

strVersionText += APP_NAME + QCoreApplication::tr ( ", Version " ) + VERSION;
strVersionText += QCoreApplication::tr ( "%1, Version %2", "%1 is app name, %2 is version number" ).arg ( APP_NAME ).arg ( VERSION );

if ( bDisplayInGui )
{
Expand Down