i18n - extracting new, pulling from tx #10325

ColeHiggins2 · 2024-09-17T20:13:39Z

No description provided.

ekohl

Can you cherry pick #10326 and rebase on top of that? I'd expect it to pull all translations then.

The Ruby gettext library wants the .po.time_stamp file to be at least as new as the .po file. If it doesn't exist or is older, it will remove the .edit.po file and then copy the .po file to .edit.po. In practice the Makefile doesn't guarantee this, causing translations to be ignored. A more concrete example what ends up happening: make -C locale tx-pull # updates $domain.edit.po # This all assumes $domain.po exists if [ ! -f $domain.po.time_stamp ] -o [ $domain.po -nt $domain.po.time_stamp ] ; then rm -f $domain.edit.po fi if [ ! -f $domain.edit.po ] ; then cp $domain.po $domain.edit.po # Merge in the new messages from the template msgmerge --update --sort-by-file --no-wrap $domain.edit.po $domain.pot if [ -f $domain.po ] -a [ $domain.po -nt $domain.edit.po ] ; then msgmerge --output $domain.edit.po --sort-by-file --no-wrap --no-obsolete-entries $domain.po $domain.edit.po fi fi This ensures that $domain.po.time_stamp is always the same mtime as $domain.po which prevents the gettext library from removing the updated $domain.edit.po file. It means there is no message merging and we rely on Transifex for doing that part for us.

ekohl · 2024-09-18T17:05:45Z

I had one small bug that only affected this repo (ekohl/transync@2e9bf74):

Uploading foreman in fr
  243 created; 0 updated
Uploading foreman in ja
  289 created; 0 updated
Uploading foreman in ko
  112 created; 50 updated
Uploading foreman in zh_CN
  288 created; 268 updated

Please pull again.

ekohl

I think the notes on French can be summarized as lots of spacing errors.

For Korean I saw a lot of Context|value being filled in as literal. I haven't flagged all of them because it'd be too much work.

I do see that a lot of string interpolation issues (especially in Chinese) were fixed, so that's good.

What I really don't know the escaping of slashes. It looks really inconsistent and I wonder how that ends up working at runtime, but I don't have time to investigate that before my PTO.

For now I lean to merging this to get the 3.12 release train rolling and address the issues in a patch release. Overall it's probably still an improvement.

ekohl · 2024-09-18T17:13:05Z

locale/fr/foreman.po

@@ -435,7 +437,7 @@ msgid "A Smart Proxy with an External IPAM feature enabled must be selected in t
 msgstr "Un Smart Proxy avec une fonctionnalité IPAM externe activée doit être sélectionné dans l'onglet Proxies."

 msgid "A class representing %s object"
-msgstr ""
+msgstr "Une classe représentant%s objet"


Suggested change

msgstr "Une classe représentant%s objet"

msgstr "Une classe représentant %s objet"

ekohl · 2024-09-18T17:14:19Z

locale/fr/foreman.po


 msgid "Change the host group of {hosts}. Some hosts may already be in your chosen host group."
-msgstr ""
+msgstr "Changer le groupe d’hôtes de{hosts} Certains hôtes peuvent déjà faire partie du groupe d'hôtes que vous avez choisi."


Suggested change

msgstr "Changer le groupe d’hôtes de{hosts} Certains hôtes peuvent déjà faire partie du groupe d'hôtes que vous avez choisi."

msgstr "Changer le groupe d’hôtes de {hosts}. Certains hôtes peuvent déjà faire partie du groupe d'hôtes que vous avez choisi."

ekohl · 2024-09-18T17:14:30Z

locale/fr/foreman.po

@@ -1574,10 +1577,10 @@ msgid "Choose a server type"
 msgstr "Sélectionner un type de serveur"

 msgid "Choose an action that will be performed on {hosts}."
-msgstr ""
+msgstr "Choisissez une action qui sera effectuée sur{hosts} ."


Suggested change

msgstr "Choisissez une action qui sera effectuée sur{hosts} ."

msgstr "Choisissez une action qui sera effectuée sur {hosts}."

ekohl · 2024-09-18T17:15:47Z

locale/fr/foreman.po


 msgid "Delete report for %s?"
 msgstr "Supprimer les rapports concernant %s ?"

 msgid "Delete report?"
-msgstr ""
+msgstr "Souhaitez-vous supprimer le rapport ?"


Suggested change

msgstr "Souhaitez-vous supprimer le rapport ?"

msgstr "Souhaitez-vous supprimer le rapport?"

ekohl · 2024-09-18T17:15:53Z

locale/fr/foreman.po

@@ -2624,13 +2627,13 @@ msgid "Delete realm entry for %s"
 msgstr "Supprimer l'entrée du domaine %s"

 msgid "Delete report"
-msgstr ""
+msgstr "Supprimer le rapport"

 msgid "Delete report for %s?"
 msgstr "Supprimer les rapports concernant %s ?"


Suggested change

msgstr "Supprimer les rapports concernant %s ?"

msgstr "Supprimer les rapports concernant %s?"

ekohl · 2024-09-18T17:51:32Z

locale/zh_CN/foreman.po


 msgid "Please contact your administrator, the request id for finding the logs: \"%s\""
-msgstr "请与管理员联系，以找到日志的请求ID：“%s”"
+msgstr "请与管理员联系，以找到日志的请求ID：\"%s\""


Like earlier, I wonder if this shouldn't be

Suggested change

msgstr "请与管理员联系，以找到日志的请求ID：\"%s\""

msgstr "请与管理员联系，以找到日志的请求ID：\\\"%s\\\""

ekohl · 2024-09-18T17:51:45Z

locale/zh_CN/foreman.po

@@ -7862,7 +7854,7 @@ msgstr[0] "提示：<strong>选择了一个主机 </strong>"

 msgid "Reminder: <strong> One host is selected </strong> for query filter %{query}"
 msgid_plural "Reminder: <strong> All %{count} hosts are selected </strong> for query filter %{query}"
-msgstr[0] "提示：<strong>选择了一个主机</strong>用于查询过滤器 %{query}"
+msgstr[0] "提示：<strong>选择了一个主机</strong>用于查询过滤器%{query}"


Suggested change

msgstr[0] "提示：<strong>选择了一个主机</strong>用于查询过滤器%{query}"

msgstr[0] "提示：<strong>选择了一个主机</strong>用于查询过滤器 %{query}"

ekohl · 2024-09-18T17:52:08Z

locale/zh_CN/foreman.po

@@ -7933,7 +7924,7 @@ msgid "Rendering failed, no input with name \"%{s}\" for input macro found"
 msgstr "处理失败，输入宏没有找到名为 \"%{s}\" 的输入"

 msgid "Rendering failed, one or more unknown columns specified for ordering - \"%{unknown}\""
-msgstr "呈现失败，指定了一个或多个用于排序的未知列 - “%{unknown}”"
+msgstr "呈现失败，指定了一个或多个用于排序的未知列 - \"%{unknown}\""


Same quoting question here

Suggested change

msgstr "呈现失败，指定了一个或多个用于排序的未知列 - \"%{unknown}\""

msgstr "呈现失败，指定了一个或多个用于排序的未知列 - \\\"%{unknown}\\\""

ekohl · 2024-09-18T17:53:29Z

locale/zh_CN/foreman.po


 msgid "Total hosts count"
 msgstr "总主机数"

 msgid "Total of one host"
 msgid_plural "Total of %{hosts} hosts"
-msgstr[0] "总共 %{hosts} 台主机"
+msgstr[0] "总共一个主机"


This loses the interpolation string which I think can break at runtime.

ekohl · 2024-09-18T18:00:28Z

locale/zh_CN/foreman.po

@@ -10490,7 +10481,7 @@ msgid "Unknown status: %s"
 msgstr "未知状态：%s"

 msgid "Unkown '%{klass}' resource class"


Well, there's a typo here as well: #10329

i18n - extracting new, pulling from tx

081abe5

ColeHiggins2 self-assigned this Sep 17, 2024

pr-processor bot added Not yet reviewed Stable branch PRs that are opened against a stable branch. Usually a cherry pick Waiting on contributor labels Sep 17, 2024

github-actions bot added the Legacy JS PRs making changes in the legacy Javascript stack label Sep 17, 2024

ekohl requested changes Sep 18, 2024

View reviewed changes

pr-processor bot removed the Not yet reviewed label Sep 18, 2024

ekohl and others added 2 commits September 18, 2024 09:54

i18n - extracting new, pulling from tx

7d4b5ee

pr-processor bot added the Needs re-review label Sep 18, 2024

ColeHiggins2 requested a review from ekohl September 18, 2024 13:57

i18n - extracting new, pulling from tx

e10e8d7

ekohl approved these changes Sep 18, 2024

View reviewed changes

pr-processor bot removed the Needs re-review label Sep 18, 2024

ekohl merged commit e3a6481 into theforeman:3.12-stable Sep 18, 2024
50 of 52 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

i18n - extracting new, pulling from tx #10325

i18n - extracting new, pulling from tx #10325

ColeHiggins2 commented Sep 17, 2024

ekohl left a comment

ekohl commented Sep 18, 2024

ekohl left a comment

ekohl Sep 18, 2024

ekohl Sep 18, 2024

ekohl Sep 18, 2024

ekohl Sep 18, 2024

ekohl Sep 18, 2024

ekohl Sep 18, 2024

ekohl Sep 18, 2024

ekohl Sep 18, 2024

ekohl Sep 18, 2024

ekohl Sep 18, 2024

	msgstr "Une classe représentant%s objet"
	msgstr "Une classe représentant %s objet"

	msgstr "Changer le groupe d’hôtes de{hosts} Certains hôtes peuvent déjà faire partie du groupe d'hôtes que vous avez choisi."
	msgstr "Changer le groupe d’hôtes de {hosts}. Certains hôtes peuvent déjà faire partie du groupe d'hôtes que vous avez choisi."

	msgstr "Choisissez une action qui sera effectuée sur{hosts} ."
	msgstr "Choisissez une action qui sera effectuée sur {hosts}."

	msgstr "Souhaitez-vous supprimer le rapport ?"
	msgstr "Souhaitez-vous supprimer le rapport?"

	msgstr "Supprimer les rapports concernant %s ?"
	msgstr "Supprimer les rapports concernant %s?"

	msgstr "请与管理员联系，以找到日志的请求ID：\"%s\""
	msgstr "请与管理员联系，以找到日志的请求ID：\\\"%s\\\""

	msgstr[0] "提示：<strong>选择了一个主机</strong>用于查询过滤器%{query}"
	msgstr[0] "提示：<strong>选择了一个主机</strong>用于查询过滤器 %{query}"

	msgstr "呈现失败，指定了一个或多个用于排序的未知列 - \"%{unknown}\""
	msgstr "呈现失败，指定了一个或多个用于排序的未知列 - \\\"%{unknown}\\\""

		@@ -10490,7 +10481,7 @@ msgid "Unknown status: %s"
		msgstr "未知状态：%s"

		msgid "Unkown '%{klass}' resource class"

i18n - extracting new, pulling from tx #10325

i18n - extracting new, pulling from tx #10325

Conversation

ColeHiggins2 commented Sep 17, 2024

ekohl left a comment

Choose a reason for hiding this comment

ekohl commented Sep 18, 2024

ekohl left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment