Siebrand has submitted this change and it was merged. Change subject: Add full stops to error messages, and add comments for grep ......................................................................
Add full stops to error messages, and add comments for grep Change-Id: I6cee9c92f8b741d12dddd428977a1013a2602463 --- M Configure.i18n.php M specials/ConfigurationPage.php 2 files changed, 12 insertions(+), 5 deletions(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/Configure.i18n.php b/Configure.i18n.php index 30d83b3..8c074b2 100644 --- a/Configure.i18n.php +++ b/Configure.i18n.php @@ -41,7 +41,7 @@ 'configure-directory-not-writable' => 'The directory used to store the settings, <code>$1</code>, is not writable. Please make it writable by PHP to use this extension.', 'configure-edit-old' => "'''Warning:''' you are editing an <strong>old</strong> version of the configuration (as at $1).", - 'configure-error' => 'The configuration could not be saved', + 'configure-error' => 'The configuration could not be saved.', 'configure-js-add' => 'Add a new entry', 'configure-js-group-exists' => 'Error: the group already exists.', 'configure-js-prompt-group' => 'Enter the name of the new group:', @@ -61,14 +61,14 @@ Please create it or change it to use this extension.', 'configure-no-old' => 'No old version of the configuration available.', 'configure-no-setup' => 'You have to call <code>efConfigureSetup()</code> explicitly in your LocalSettings.php file to use this extension.', - 'configure-no-transwiki' => 'You are not allowed to change settings in other wikis', + 'configure-no-transwiki' => 'You are not allowed to change settings in other wikis.', 'configure-old' => 'Old versions', 'configure-old-versions' => 'List of old versions of the configuration:', - 'configure-old-not-available' => 'The old version of the settings you requested, $1, is not available', + 'configure-old-not-available' => 'The old version of the settings you requested, $1, is not available.', 'configure-old-changes' => 'changes', 'configure-old-summary' => '$1 by $2 $4 $3', 'configure-old-summary-datetime' => '$1', - 'configure-saved' => 'The configuration has been saved', + 'configure-saved' => 'The configuration has been saved.', 'configure-backlink' => 'Return to form', 'configure-image-url-explanation' => 'Enter the URL to an image, or the name of an image on this wiki (without the namespace). A preview will be displayed when you leave the field.', 'configure-section-robots' => 'Web crawlers', @@ -148,7 +148,7 @@ 'configure-view' => 'View', 'configure-view-all-versions' => 'Full list of versions', 'configure-view-default' => 'Default settings', - 'configure-view-not-allowed' => 'You are not allowed to see this setting', + 'configure-view-not-allowed' => 'You are not allowed to see this setting.', 'configure-viewconfig-line' => '$1 $2 by $3 $5: $4', 'extensions' => 'Configure the extensions', 'right-configure' => 'Configure the wiki', diff --git a/specials/ConfigurationPage.php b/specials/ConfigurationPage.php index fe455fe..0d9f389 100644 --- a/specials/ConfigurationPage.php +++ b/specials/ConfigurationPage.php @@ -1379,6 +1379,9 @@ if ( $curOpt == $opt ) { $opts['checked'] = 'checked'; } + // Give grep a chance to find the usages: + // configure-condition-operator-or, configure-condition-operator-and, + // configure-condition-operator-xor, configure-condition-operator-not $row .= Html::input( $encId.'-opt-'.$desc, $desc, 'radio', $opts ) . ' ' . Html::element( 'label', array( 'for' => $encId.'-opt-'.$desc ), wfMessage( 'configure-condition-operator-'.$desc )->text() ); } @@ -1408,6 +1411,10 @@ $row .= Html::rawElement( 'tr', array(), Html::element( 'th', array(), wfMessage( 'configure-condition-name' )->text() ) . Html::element( 'th', array(), wfMessage( 'configure-condition-requirement' )->text() ) )."\n"; foreach ( $conds as $condName => $condType ) { + // Give grep a chance to find the usages: + // configure-condition-name-1, configure-condition-name-2, configure-condition-name-3, + // configure-condition-name-4, configure-condition-name-5, configure-condition-name-6, + // configure-condition-name-7 $desc = wfMessage( 'configure-condition-name-' . $condName )->text(); $row .= Html::openElement( 'tr' ) . Html::rawElement( 'td', array(), Html::element( 'label', array( 'for' => "{$encId}-cond-{$condName}" ), $desc ) ) . Html::openElement( 'td' ); -- To view, visit https://gerrit.wikimedia.org/r/59038 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6cee9c92f8b741d12dddd428977a1013a2602463 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Configure Gerrit-Branch: master Gerrit-Owner: Shirayuki <shirayuk...@gmail.com> Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org> Gerrit-Reviewer: Waldir <wal...@email.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits