Locales: Fix placeholder inconsistencies #25291

fnetX · 2023-06-15T15:47:19Z

This fixes all placeholder inconsistencies in translations that I have found, some of them probably don't change anything visible, but they're inconsistent nevertheless.

I do not know how RTL text and placeholders work together, so these strings are left to check:

options/locale/locale_tr-TR.ini check how rtl and strings correlate
options/locale/locale_fa-IR.ini:delete_tag=برچسب %[2] از <a href="%[1]s">%[3]</a> حذف شدند
options/locale/locale_fa-IR.ini:delete_branch=شاخه %[2] از <a href="%[1]s">%[3]</a> حذف شدند
options/locale/locale_fa-IR.ini:issues.ref_reopening_from=`<a href="%[3]s"> تقاضای واکشی ارجاع شده %[4] که مسائله بازگشایی خواهد کرد</a> <a id="%[1]s" href="#%[1]s">%[2] </a>`
options/locale/locale_fa-IR.ini:issues.ref_from=`از %[1]`
options/locale/locale_fa-IR.ini:monitor.queue.settings.maxnumberworkers.placeholder=در حال حاضر %[1]v
options/locale/locale_fa-IR.ini:issue_assigned.pull=@%[1]s به شما برای درخواست pull %[2]s در ریپازیتوری %[3] محول شده.
options/locale/locale_fa-IR.ini:delete_tag=برچسب %[2] از <a href="%[1]s">%[3]</a> حذف شدند
options/locale/locale_fa-IR.ini:delete_branch=شاخه %[2] از <a href="%[1]s">%[3]</a> حذف شدند
options/locale/locale_fa-IR.ini:issues.ref_issue_from=`<a href="%[3]s"> ارجاعات این مسائله %[4]</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
options/locale/locale_fa-IR.ini:issues.ref_pull_from=`<a href="%[3]s"> ارجاعات این تقاضای ادغام %[4]</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
options/locale/locale_fa-IR.ini:issues.ref_closing_from=`<a href="%[3]s"> ارجاعات این تقاضای واکشی %[4]</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
options/locale/locale_fa-IR.ini:issues.ref_reopening_from=`<a href="%[3]s"> تقاضای واکشی ارجاع شده %[4] که مسائله بازگشایی خواهد کرد</a> <a id="%[1]s" href="#%[1]s">%[2] </a>`
options/locale/locale_fa-IR.ini:issues.ref_closed_from=`<a href="%[3]s"> بسته شده این مسائله %[4]</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
options/locale/locale_fa-IR.ini:issues.ref_reopened_from=`<a href="%[3]s"> بازگشایی این مسائله %[4]</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`

Also, in options/locale/locale_pt-BR.ini:

issues.due_date_remove=removeu a data limite %s %s

I do not know if this works as intended. I suppose it does, but other languages do it differently.

I still recommend that a proper QA for translation placeholders is implemented, especially checking that all placeholders are there. AFAIK, Weblate does this, it is Free Software. I have no experience with the proprietary Crowdin platform.

Also check out the corresponding @forgejo issue at https://codeberg.org/forgejo/forgejo/issues/863 - maybe there are some helpful discussions, too. I'll probably rather interact there.

lunny · 2023-06-16T00:01:37Z

Thank you for your contribution, but we cannot merge this changes into translation files otherwise they may conflict with daily update from crowdin. But we can change them in crowdin follow your PR.

wxiaoguang · 2023-06-16T01:19:08Z

At the moment, the fixes could be done on Crowdin side.

After the INI package refactoring, I think there could be some tools to help to figure out/fix translation errors.

Let's keep it open until these translations get fixed.

lunny · 2023-07-03T09:05:36Z

Fixed in crowdin:

cs-CZ

de-DE

https://crowdin.com/translate/gitea/68/enus-de?filter=basic&value=0#q=monitor.queue.settings.maxnumberworkers.placeholder

el-GR

fa-IR

https://crowdin.com/translate/gitea/68/enus-fa?filter=basic&value=0#q=issue_assigned.pull

is-IS

https://crowdin.com/translate/gitea/68/enus-is?filter=basic&value=0#q=issues.opened_by_fake

lv-LV

https://crowdin.com/translate/gitea/68/enus-lv?filter=basic&value=0#q=team_invite.text_1

nl-NL

pl-PL

https://crowdin.com/translate/gitea/68/enus-pl?filter=basic&value=0#q=monitor.queue.settings.maxnumberworkers.placeholder

pt-BR

ru-RU

https://crowdin.com/translate/gitea/68/enus-ru?filter=basic&value=0#q=team_invite.subject

si-LK

sk-SK

tr-TR

uk-UA

And one key should be changed from all translation files.

dashboard.cron.cancelled

wxiaoguang · 2023-07-03T09:28:02Z

Made another change, because it's RTL.

https://crowdin.com/translate/gitea/68/enus-fa?filter=basic&value=0#q=issue_assigned.pull

6543 · 2023-07-03T14:23:51Z

I'll merge main into this untill diff = 0 :)

partially fix #25291 --------- Co-authored-by: Lauris BH <lauris@nix.lv>

wxiaoguang · 2023-07-04T03:38:47Z

The crowdin fixes are in main now

The backport needs manually checking because some 1.21 strings might not be right for 1.20 This backport also includes most fixes from #25291 (comment) (thanks to lunny's manual fix on Crowdin side) Close #25638

6543 · 2023-07-04T12:00:08Z

5 things are missing ...

wxiaoguang · 2023-07-04T12:15:46Z

Only one is missing dashboard.task.unknown

Others are right (not wrong) on main branch.

options/locale/locale_si-LK.ini

6543 · 2023-07-04T12:21:26Z

https://crowdin.com/translate/gitea/68/enus-el?filter=basic&value=0#q=dashboard.task.unknown

wxiaoguang · 2023-07-04T12:24:56Z

I have made some changes:

el-GR: dashboard.task.unknown : https://crowdin.com/translate/gitea/68/enus-el?filter=basic&value=0#q=dashboard.task.unknown
si-LK: dashboard.cron.cancelled : https://crowdin.com/translate/gitea/68/enus-silk?filter=basic&value=0#q=dashboard.cron.cancelled
- I think this change will not take affect because the newly synchronized key from en-US will discard the out-dated translations soon. But it's fine to make a change to close this issue.

Locales: Fix placeholder inconsistencies

668daa7

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 15, 2023

pull-request-size bot added the size/M label Jun 15, 2023

lunny closed this Jun 16, 2023

wxiaoguang reopened this Jun 16, 2023

wxiaoguang mentioned this pull request Jul 3, 2023

Broken translations #25638

Closed

lunny mentioned this pull request Jul 3, 2023

Correct translation wrong format #25643

Merged

Merge branch 'main' into fnetx/2023-06/translations

ec58843

silverwind closed this in #25643 Jul 3, 2023

silverwind pushed a commit that referenced this pull request Jul 3, 2023

Correct translation wrong format (#25643)

63622f8

partially fix #25291 --------- Co-authored-by: Lauris BH <lauris@nix.lv>

6543 reopened this Jul 3, 2023

wxiaoguang mentioned this pull request Jul 4, 2023

Manual backport of locale for 1.20 (2nd) #25668

Merged

6543 added 2 commits July 4, 2023 13:53

Merge branch 'main' into fnetx/2023-06/translations

7902555

clean out

96427e6

pull-request-size bot added size/S and removed size/M labels Jul 4, 2023

6543 reviewed Jul 4, 2023

View reviewed changes

options/locale/locale_si-LK.ini Show resolved Hide resolved

6543 closed this Jul 4, 2023

go-gitea locked as resolved and limited conversation to collaborators Oct 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Locales: Fix placeholder inconsistencies #25291

Locales: Fix placeholder inconsistencies #25291

fnetX commented Jun 15, 2023

lunny commented Jun 16, 2023

wxiaoguang commented Jun 16, 2023 •

edited

Loading

lunny commented Jul 3, 2023 •

edited

Loading

wxiaoguang commented Jul 3, 2023

6543 commented Jul 3, 2023

wxiaoguang commented Jul 4, 2023

6543 commented Jul 4, 2023

wxiaoguang commented Jul 4, 2023

6543 commented Jul 4, 2023

wxiaoguang commented Jul 4, 2023

Locales: Fix placeholder inconsistencies #25291

Locales: Fix placeholder inconsistencies #25291

Conversation

fnetX commented Jun 15, 2023

lunny commented Jun 16, 2023

wxiaoguang commented Jun 16, 2023 • edited Loading

lunny commented Jul 3, 2023 • edited Loading

wxiaoguang commented Jul 3, 2023

6543 commented Jul 3, 2023

wxiaoguang commented Jul 4, 2023

6543 commented Jul 4, 2023

wxiaoguang commented Jul 4, 2023

6543 commented Jul 4, 2023

wxiaoguang commented Jul 4, 2023

wxiaoguang commented Jun 16, 2023 •

edited

Loading

lunny commented Jul 3, 2023 •

edited

Loading