jenkins-bot has submitted this change and it was merged.
Change subject: Make {{ a parameter in the error message in the editor dialog
......................................................................
Make {{ a parameter in the error message in the editor dialog
Translatewiki warns of an unbalanced parenthesis problem in the
translation string. Turning the {{ into a parameter solves this issue.
Change-Id: I2fd69b3e901175dad22d285aa2373916acd4f208
---
M TemplateData.i18n.php
M modules/ext.templateDataGenerator.core.js
2 files changed, 3 insertions(+), 4 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TemplateData.i18n.php b/TemplateData.i18n.php
index c057ce5..68da8bf 100644
--- a/TemplateData.i18n.php
+++ b/TemplateData.i18n.php
@@ -41,7 +41,7 @@
'templatedata-modal-button-cancel' => 'Cancel',
'templatedata-modal-button-delparam' => 'Delete parameter',
'templatedata-modal-button-importParams' => 'Import parameters',
- 'templatedata-modal-errormsg' => 'Errors found. Please make sure there
are no empty or duplicate parameter names, and that the parameter name does not
include "|", "=" or "}}".',
+ 'templatedata-modal-errormsg' => 'Errors found. Please make sure there
are no empty or duplicate parameter names, and that the parameter name does not
include "|", "=" or "$1".',
'templatedata-modal-errormsg-import-noparams' => 'No new parameters
found during import.',
'templatedata-modal-notice-import-numparams' => '$1 new
{{PLURAL:$1|parameter was|parameters were}} imported.',
'templatedata-modal-table-param-actions' => 'Actions',
@@ -131,8 +131,7 @@
'templatedata-modal-button-delparam' => 'Button to delete a parameter',
'templatedata-modal-button-importParams' => 'Label of the import
button',
'templatedata-modal-errormsg' => 'Error message that appears in the
TemplateData generator GUI in case there are empty, duplicate or invalid
parameter names
-
-To avoid errors, it may be necessary to escape some of the characters with
<nowiki><nowiki></nowiki></nowiki> or HTML entity codes.',
+* $1 - double curly brackets, supplied as a parameter to avoid parsing errors
in translation strings.',
'templatedata-modal-errormsg-import-noparams' => 'message that appears
in the TemplateData generator GUI in case no template parameters were found
during the import attempt.',
'templatedata-modal-notice-import-numparams' => 'message that appears
in the TemplateData generator GUI showing how many new parameters were imported
into the GUI from an existing template.',
'templatedata-modal-table-param-actions' => 'Label for a table heading:
Parameter actions in the table',
diff --git a/modules/ext.templateDataGenerator.core.js
b/modules/ext.templateDataGenerator.core.js
index d2e8fe6..58581f7 100644
--- a/modules/ext.templateDataGenerator.core.js
+++ b/modules/ext.templateDataGenerator.core.js
@@ -482,7 +482,7 @@
// Validate
if ( !doNotCheckForm ) {
if ( !isFormValid() ) {
- showErrorModal( mw.msg(
'templatedata-modal-errormsg' ) );
+ showErrorModal( mw.msg(
'templatedata-modal-errormsg', '}}' ) );
return;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/110913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2fd69b3e901175dad22d285aa2373916acd4f208
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Mooeypoo <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
