Siebrand has submitted this change and it was merged.
Change subject: Replace "an" by "a" in the message
"configure-setting-wgUserEmailConfirmationTokenExpiry", etc.
......................................................................
Replace "an" by "a" in the message
"configure-setting-wgUserEmailConfirmationTokenExpiry", etc.
Change-Id: Ie0cc75bef6ccb484df880a77c3484b43b8b04919
---
M CHANGELOG
M load_txt_def/TxtDef.php
M load_txt_def/load_txt_def.c
M settings/Settings.i18n.php
M specials/ConfigurationPage.php
5 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/CHANGELOG b/CHANGELOG
index 404f02f..855ba3e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -452,7 +452,7 @@
0.11.10 - 17 January 2009
Fixed "You are not allowed to read this setting" error for all settings on
- Special:Extensions when $wgConfigureEditableSettings is an non-empty array.
+ Special:Extensions when $wgConfigureEditableSettings is a non-empty array.
0.11.9 - 16 January 2009
Added support for $wgNewPasswordExpiry.
diff --git a/load_txt_def/TxtDef.php b/load_txt_def/TxtDef.php
index a69fb57..687ada0 100644
--- a/load_txt_def/TxtDef.php
+++ b/load_txt_def/TxtDef.php
@@ -36,7 +36,7 @@
$out[$head] = array();
continue;
} elseif( $head === false ) {
- trigger_error( "There must be an header before
any data in {$file}", E_USER_WARNING );
+ trigger_error( "There must be a header before
any data in {$file}", E_USER_WARNING );
return false;
}
diff --git a/load_txt_def/load_txt_def.c b/load_txt_def/load_txt_def.c
index 403bf09..dcfb72d 100644
--- a/load_txt_def/load_txt_def.c
+++ b/load_txt_def/load_txt_def.c
@@ -242,7 +242,7 @@
if ( delim != NULL ) {
if ( !head ) {
/* eek, we need an initialized header */
- php_error( E_WARNING, "There must be an
header before any data in '%s' on line %i", filename, i + 1 );
+ php_error( E_WARNING, "There must be a
header before any data in '%s' on line %i", filename, i + 1 );
retval = FAILURE;
break;
}
diff --git a/settings/Settings.i18n.php b/settings/Settings.i18n.php
index d5a55a7..4b1aae9 100644
--- a/settings/Settings.i18n.php
+++ b/settings/Settings.i18n.php
@@ -207,7 +207,7 @@
'configure-setting-wgAdditionalMailParams' => 'Additional email
parameters, will be passed as the last argument to mail() PHP function call',
'configure-setting-wgSMTP' => 'SMTP server',
'configure-setting-wgUserEmailUseReplyTo' => 'Use Reply-To instead of
From',
- 'configure-setting-wgUserEmailConfirmationTokenExpiry' => 'The time in
seconds until an confirmation code sent by email expires',
+ 'configure-setting-wgUserEmailConfirmationTokenExpiry' => 'The time in
seconds until a confirmation code sent by email expires',
'configure-setting-wgAPIRequestLog' => 'Log file for API requests',
'configure-setting-wgDebugComments' => 'Include portions of log output
in page HTML comment',
'configure-setting-wgDebugDumpSql' => 'Dump SQL queries to debug
output',
diff --git a/specials/ConfigurationPage.php b/specials/ConfigurationPage.php
index 175e4de..fe455fe 100644
--- a/specials/ConfigurationPage.php
+++ b/specials/ConfigurationPage.php
@@ -207,7 +207,7 @@
}
/**
- * Get an 3D array of all settings
+ * Get a 3D array of all settings
*
* @return array
*/
--
To view, visit https://gerrit.wikimedia.org/r/58286
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0cc75bef6ccb484df880a77c3484b43b8b04919
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Configure
Gerrit-Branch: master
Gerrit-Owner: Shirayuki <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Waldir <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
