Ricordisamoa has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/341985 )
Change subject: Fix some typos
......................................................................
Fix some typos
The names of two private methods have been changed.
Change-Id: I966930bdf44190c3b5262ddaf13b9ed46a478735
---
M LoginNotify.hooks.php
M LoginNotify_body.php
M i18n/qqq.json
3 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/85/341985/1
diff --git a/LoginNotify.hooks.php b/LoginNotify.hooks.php
index f560f0e..dff1ffb 100644
--- a/LoginNotify.hooks.php
+++ b/LoginNotify.hooks.php
@@ -98,7 +98,7 @@
/**
* Hook for login auditing post 1.27
*
- * @param $ret AuthenticationResponse Is login succesful?
+ * @param $ret AuthenticationResponse Is login successful?
* @param $user User|null User object on successful auth
* @param $username String Username for failed attempts.
*/
@@ -171,7 +171,7 @@
* Hook for loading options.
*
* This is a bit hacky. Used to be able to set a different
- * default for admins then other users
+ * default for admins than other users
*
* @param $user User
* @param &$options array
@@ -183,12 +183,12 @@
return true;
}
- if ( !self::isUserOptionOverriden( $user ) ) {
+ if ( !self::isUserOptionOverridden( $user ) ) {
return true;
}
$defaultOpts = User::getDefaultOptions();
- $optionsToCheck = self::getOverridenOptions();
+ $optionsToCheck = self::getOverriddenOptions();
foreach ( $optionsToCheck as $opt ) {
if ( $options[$opt] === self::OPTIONS_FAKE_FALSE ) {
@@ -208,7 +208,7 @@
* Hook for saving options.
*
* This is a bit hacky. Used to be able to set a different
- * default for admins then other users. Since admins are higher value
+ * default for admins than other users. Since admins are higher value
* targets, it may make sense to have notices enabled by default for
* them, but disabled for normal users.
*
@@ -220,9 +220,9 @@
* @return bool
*/
public static function onUserSaveOptions( User $user, array &$options )
{
- $optionsToCheck = self::getOverridenOptions();
+ $optionsToCheck = self::getOverriddenOptions();
$defaultOpts = User::getDefaultOptions();
- if ( !self::isUserOptionOverriden( $user ) ) {
+ if ( !self::isUserOptionOverridden( $user ) ) {
return true;
}
foreach ( $optionsToCheck as $opt ) {
@@ -252,7 +252,7 @@
*
* @return array Which option keys to check
*/
- private static function getOverridenOptions() {
+ private static function getOverriddenOptions() {
// For login-success, it makes most sense to email
// people about it, but auto-subscribing people to email
// is a bit icky as nobody likes to be spammed.
@@ -262,7 +262,7 @@
];
}
- private static function isUserOptionOverriden( User $user ) {
+ private static function isUserOptionOverridden( User $user ) {
global $wgLoginNotifyEnableForPriv;
// Note: isAllowedAny calls into session for per-session
restrictions,
// which we do not want to take into account, and more
importantly
diff --git a/LoginNotify_body.php b/LoginNotify_body.php
index 8abe5f2..21e46e0 100644
--- a/LoginNotify_body.php
+++ b/LoginNotify_body.php
@@ -245,7 +245,7 @@
* Actually do the query of the check user table.
*
* @note This catches and ignores database errors.
- * @param $userId int User id number (Not neccesarily for the local
wiki)
+ * @param $userId int User id number (Not necessarily for the local
wiki)
* @param $ipFragment string Prefix to match against cuc_ip (from
$this->getIPNetwork())
* @param $dbr Database A database connection (possibly foreign)
* @return boolean If $ipFragment is in check user db
@@ -607,7 +607,7 @@
/**
* Clear attempt counter for user.
*
- * When a user succesfully logs in, we start back from 0, as
+ * When a user successfully logs in, we start back from 0, as
* otherwise a mistake here and there will trigger the warning.
*
* @param $user User
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b6fe6f9..d606ee2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -17,5 +17,5 @@
"notification-header-login-success": "Text of notification for when
someone successfully logs in as the current account from a computer that has
not been previously used by that account. This is shown in the user's echo
notifications, and is possibly emailed to the user.\n* $1 = Username for
account, formatted for display\n* $2 = Username for account, unformatted for
use in GENDER",
"notification-loginnotify-login-fail-new-emailbatch": "Body of email
notification that someone from a computer not previously used by the user has
attempted and failed to log into the user's account. Subject of Message is
{{msg-mw|notification-loginnotify-login-fail-email-subject}}. $1 is account
name. $2 is the number of attempts",
"notification-loginnotify-login-fail-known-emailbatch": "Body of email
notification that someone from a computer which has been previously used by the
user has attempted and failed to log into the user's account. Subject of
Message is {{msg-mw|notification-loginnotify-login-fail-email-subject}}. $1 is
account name. $2 is the number of attempts",
- "notification-loginnotify-login-success-emailbatch": "Body of email
notification that someone from a computer not previously used by the user has
succesfully logged into the user's account. Subject of Message is
{{msg-mw|notification-loginnotify-login-success-email-subject}}. $1 is account
name."
+ "notification-loginnotify-login-success-emailbatch": "Body of email
notification that someone from a computer not previously used by the user has
successfully logged into the user's account. Subject of Message is
{{msg-mw|notification-loginnotify-login-success-email-subject}}. $1 is account
name."
}
--
To view, visit https://gerrit.wikimedia.org/r/341985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I966930bdf44190c3b5262ddaf13b9ed46a478735
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa <ricordisa...@openmailbox.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
