acq.js contains many examples: var answer=confirm(_("Are you sure you want to close this basketgroup?")); The syntax would be correct if this were a template, but the translator script won't process this file so the messages need to be moved to the template.
Created attachment 19580 [details] [review] Bug 7598 - Acquisitions JavaScript contains untranslatable English strings English strings in acq.js cannot be processed by the translation script. This patch moves the strings to the templates to be set as JS variables for use by the script. To test: - On the uncertain prices page, enter an invalid price and click save. You should see a JavaScript alert pointing this out. - When adding a fund to an existing budget, enter an amount which exceeds the amount in the parent budget. You should see a JavaScript alert pointing this out. There is a similar function which has been corrected, checkBudgetParent(), but I don't know how to trigger it for testing. The closebasketgroup function has been updated but as far as I can tell it's not actually in use.
Created attachment 19686 [details] [review] [SIGNED-OFF] Bug 7598 - Acquisitions JavaScript contains untranslatable English strings English strings in acq.js cannot be processed by the translation script. This patch moves the strings to the templates to be set as JS variables for use by the script. To test: - On the uncertain prices page, enter an invalid price and click save. You should see a JavaScript alert pointing this out. - When adding a fund to an existing budget, enter an amount which exceeds the amount in the parent budget. You should see a JavaScript alert pointing this out. There is a similar function which has been corrected, checkBudgetParent(), but I don't know how to trigger it for testing. The closebasketgroup function has been updated but as far as I can tell it's not actually in use. Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Owen, I suspect you did not see the difference between these 2 lines: - return _("- Budget total exceeds parent allocation\n"); + return MSG_BUDGET_PARENT_ALLOCATION; } else if (result == '2') { - return _("- Budget total exceeds period allocation\n"); + return MSG_BUDGET_PARENT_ALLOCATION; => parent vs period. Marked as Failed QA.
Created attachment 19772 [details] [review] Bug 7598 [Follow-up] Acquisitions JavaScript contains untranslatable English strings This follow-up addresses QA comments and moves punctuation and line breaks out of the string to be translated.
QA comment: Works as expected, all strings are in the po file. It is a pity not to have js file translatable. Marked as Passed QA.
second patch does not need a signoff.
Created attachment 19785 [details] [review] Bug 7598 - Acquisitions JavaScript contains untranslatable English strings English strings in acq.js cannot be processed by the translation script. This patch moves the strings to the templates to be set as JS variables for use by the script. To test: - On the uncertain prices page, enter an invalid price and click save. You should see a JavaScript alert pointing this out. - When adding a fund to an existing budget, enter an amount which exceeds the amount in the parent budget. You should see a JavaScript alert pointing this out. There is a similar function which has been corrected, checkBudgetParent(), but I don't know how to trigger it for testing. The closebasketgroup function has been updated but as far as I can tell it's not actually in use. Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Created attachment 19786 [details] [review] Bug 7598 [Follow-up] Acquisitions JavaScript contains untranslatable English strings This follow-up addresses QA comments and moves punctuation and line breaks out of the string to be translated. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Pushed to master. Thanks, Owen!
This patch has been pushed to 3.12.x, will be in 3.12.4. Thanks Owen!
Pushed to 3.10.x, will be in 3.10.11
Pushed to 3.8.x, will be in 3.8.18