Skip to content
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.

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

Updated translations based on English changes from core 22789 #22834

Merged
merged 3 commits into from
Jan 12, 2024

Conversation

jrafanie
Copy link
Member

@jrafanie jrafanie commented Jan 10, 2024

#22789

UI translations json files are in ManageIQ/manageiq-ui-classic#9015

@@ -10601,9 +10604,15 @@ msgstr "ConfigurationScript-Basis|Ausgabe"
msgid "ConfigurationScriptBase|Payload"
msgstr "ConfigurationScript-Basis|Nutzdaten"

msgid "ConfigurationScriptBase|Payload error"
msgstr "ConfigurationScript-Basis | Fehler bei Nutzdaten"
Copy link
Member

Choose a reason for hiding this comment

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

I think the spaces here might be incorrect. The | is not part of the string, but is a parsing separator.

Copy link
Member

Choose a reason for hiding this comment

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

Also the model name should not be translated. So, in total this should be

Suggested change
msgstr "ConfigurationScript-Basis | Fehler bei Nutzdaten"
msgstr "ConfigurationScriptBase|Fehler bei Nutzdaten"

Copy link
Member

Choose a reason for hiding this comment

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

It should be trivial to add specs that check this, so I'm wondering if we should do that.

Copy link
Member

Choose a reason for hiding this comment

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

FWIW in gettext terminology this prefix thing is called a "context". See here for an example of it in the gettext ruby gem README: https://github.com/ruby-gettext/gettext#sp_-or-spgettext-context-aware-pluralized

Another link: https://www.gnu.org/software/gettext/manual/html_node/Contexts.html

Comment on lines +26836 to +26837
msgid "Invalid button action!"
msgstr "Ungültige Schaltflächenaktion!"
Copy link
Member

Choose a reason for hiding this comment

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

This string was removed, so is this just from an old run?

Copy link
Member Author

Choose a reason for hiding this comment

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

yes

@@ -26895,6 +26901,9 @@ msgstr "Identifiants d'authentification non valides"
msgid "Invalid button action"
msgstr "Action de bouton non valide"

msgid "Invalid button action!"
msgstr "Action de bouton non valide !"
Copy link
Member

Choose a reason for hiding this comment

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

Space before the !? (doesn't matter cause this should go away, I'm just surprised)

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed anyway

msgid "ConfigurationScriptBase|Payload type"
msgstr "ConfigurationScript ベース | ペイロード・タイプ"

msgid "ConfigurationScriptBase|Payload valid"
msgstr "ConfigurationScriptベース | ペイロード有効"
Copy link
Member Author

Choose a reason for hiding this comment

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

Looks like base was translated here too. 😢

Copy link
Member Author

Choose a reason for hiding this comment

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

and space around pipe

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

@@ -25389,6 +25395,9 @@ msgstr "无效验证证书"
msgid "Invalid button action"
msgstr "无效的按钮操作"

msgid "Invalid button action!"
msgstr "按钮操作无效!"
Copy link
Member Author

Choose a reason for hiding this comment

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

ugh, space after !

Copy link
Member Author

Choose a reason for hiding this comment

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

lol, https://www.codetable.net/decimal/65281

That's a unicode ! with a deceptively large amount of visual space after it. Keeping it even if my 👀 don't like the extra space.

msgid "ConfigurationScriptBase|Payload type"
msgstr "ConfigurationScriptBase | 有效内容类型"

msgid "ConfigurationScriptBase|Payload valid"
msgstr "ConfigurationScriptBase | 有效内容"
Copy link
Member Author

Choose a reason for hiding this comment

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

ugh, looks like we had spaces after base in the existing translations... probably why they did the same here.

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

msgid "ConfigurationScriptBase|Payload type"
msgstr "ConfigurationScriptBase | Tipo de carga útil"

msgid "ConfigurationScriptBase|Payload valid"
msgstr "ConfigurationScriptBase | Carga útil válida"
Copy link
Member Author

Choose a reason for hiding this comment

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

Same as others, space was after Base in the existing translations, so they did it again.

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

@@ -26929,6 +26935,9 @@ msgstr "Credenciales de autenticación no válidas"
msgid "Invalid button action"
msgstr "Acción de botón no válida"

msgid "Invalid button action!"
msgstr "Acción de botón no válida."
Copy link
Member

Choose a reason for hiding this comment

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

Just noticed this is missing the ! (and since it's Spanish, the leading ¡). Again, doesn't matter cause it's going to go away.

msgid "ConfigurationScriptBase|Payload type"
msgstr "ConfigurationScriptBase|페이로드 유형"

msgid "ConfigurationScriptBase|Payload valid"
msgstr "ConfigurationScriptBase | 페이로드 유효"
Copy link
Member Author

Choose a reason for hiding this comment

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

Space around pipe 😢

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

msgid "ConfigurationScriptBase|Payload type"
msgstr "ConfigurationScriptBase|Tipo de carga útil"

msgid "ConfigurationScriptBase|Payload valid"
msgstr "ConfigurationScriptBase | Carga útil válida"
Copy link
Member Author

Choose a reason for hiding this comment

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

space around pipe

Copy link
Member Author

Choose a reason for hiding this comment

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

will need to make sure the translators get this change we did manually, along with the others.

@miq-bot
Copy link
Member

miq-bot commented Jan 11, 2024

Checked commits jrafanie/manageiq@f59757b~...0b0f665 with ruby 2.7.8, rubocop 1.56.3, haml-lint 0.51.0, and yamllint
0 files checked, 0 offenses detected
Everything looks fine. 🍰

@@ -25397,6 +25403,9 @@ msgstr "鑑別認證無效"
msgid "Invalid button action"
msgstr "按鈕動作無效"

msgid "Invalid button action!"
msgstr "按鈕動作無效!"
Copy link
Member Author

Choose a reason for hiding this comment

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

unicode 65281 again 🤣

@Fryguy
Copy link
Member

Fryguy commented Jan 11, 2024

@jrafanie What do you think about adding some automated specs for checking these cases? (Not for this PR, just in general)

@jrafanie
Copy link
Member Author

jrafanie commented Jan 11, 2024

@jrafanie What do you think about adding some automated specs for checking these cases? (Not for this PR, just in general)

I think we need to better understand if the msgstr should have the leading context Model at all. I'm not sure if I'm understanding it correctly, but it seems like the context should be prefixed in the msgid or in the msgctxt although I think we only use msgid format with Model|column syntax. Either way, I think the msgstr should be just the translated string in that context. 🤷 We should discuss.

https://www.gnu.org/software/gettext/manual/html_node/Contexts.html

@jrafanie
Copy link
Member Author

FYI, ManageIQ/manageiq-ui-classic#9015 has been updated with the latest changes from here. Note, my fixes are to all translations (8) but english and italian and only the json files for the 8 locales are updated in my subsequent commit there. So, I think they're both ready to go.

@Fryguy Fryguy merged commit 140e666 into ManageIQ:master Jan 12, 2024
6 checks passed
@Fryguy
Copy link
Member

Fryguy commented Jan 12, 2024

Backported to quinteros in commit b62cde7.

commit b62cde79c3df899235fcd278e803db59a300312c
Author: Jason Frey <[email protected]>
Date:   Fri Jan 12 09:21:21 2024 -0500

    Merge pull request #22834 from jrafanie/updated_translations_based_on_22789
    
    Updated translations based on English changes from core 22789
    
    (cherry picked from commit 140e6660189b665526e9d7a588b9433d0aaf59e7)

Fryguy added a commit that referenced this pull request Jan 12, 2024
…_22789

Updated translations based on English changes from core 22789

(cherry picked from commit 140e666)
@jrafanie jrafanie deleted the updated_translations_based_on_22789 branch January 16, 2024 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants