[MediaWiki-commits] [Gerrit] Numerous symlinks... - change (operations/mediawiki-config)
Reedy has submitted this change and it was merged. Change subject: Numerous symlinks... .. Numerous symlinks... Change-Id: If0180116b70e7cc6c125afeaa25e106db6cfeaec --- A docroot/bits/static-1.21wmf1/extensions A docroot/bits/static-1.21wmf1/resources A docroot/bits/static-1.21wmf1/skins A docroot/bits/static-1.21wmf2/extensions A docroot/bits/static-1.21wmf2/resources A docroot/bits/static-1.21wmf2/skins A docroot/bits/static-1.21wmf3/extensions A docroot/bits/static-1.21wmf3/resources A docroot/bits/static-1.21wmf3/skins A docroot/bits/static-1.21wmf5/extensions A docroot/bits/static-1.21wmf5/resources A docroot/bits/static-1.21wmf5/skins A live-1.5/static-1.21wmf1/extensions A live-1.5/static-1.21wmf1/resources A live-1.5/static-1.21wmf1/skins A live-1.5/static-1.21wmf2/extensions A live-1.5/static-1.21wmf2/resources A live-1.5/static-1.21wmf2/skins A live-1.5/static-1.21wmf3/extensions A live-1.5/static-1.21wmf3/resources A live-1.5/static-1.21wmf3/skins A live-1.5/static-1.21wmf5/extensions A live-1.5/static-1.21wmf5/resources A live-1.5/static-1.21wmf5/skins 24 files changed, 24 insertions(+), 0 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/docroot/bits/static-1.21wmf1/extensions b/docroot/bits/static-1.21wmf1/extensions new file mode 12 index 000..c73a990 --- /dev/null +++ b/docroot/bits/static-1.21wmf1/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf1/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf1/resources b/docroot/bits/static-1.21wmf1/resources new file mode 12 index 000..b50d25c --- /dev/null +++ b/docroot/bits/static-1.21wmf1/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf1/resources \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf1/skins b/docroot/bits/static-1.21wmf1/skins new file mode 12 index 000..be9c784 --- /dev/null +++ b/docroot/bits/static-1.21wmf1/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf1/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf2/extensions b/docroot/bits/static-1.21wmf2/extensions new file mode 12 index 000..6bb4129 --- /dev/null +++ b/docroot/bits/static-1.21wmf2/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf2/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf2/resources b/docroot/bits/static-1.21wmf2/resources new file mode 12 index 000..8eebb22 --- /dev/null +++ b/docroot/bits/static-1.21wmf2/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf2/resources \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf2/skins b/docroot/bits/static-1.21wmf2/skins new file mode 12 index 000..73bf90e --- /dev/null +++ b/docroot/bits/static-1.21wmf2/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf2/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf3/extensions b/docroot/bits/static-1.21wmf3/extensions new file mode 12 index 000..93fc00f --- /dev/null +++ b/docroot/bits/static-1.21wmf3/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf3/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf3/resources b/docroot/bits/static-1.21wmf3/resources new file mode 12 index 000..4c943d5 --- /dev/null +++ b/docroot/bits/static-1.21wmf3/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf3/resources \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf3/skins b/docroot/bits/static-1.21wmf3/skins new file mode 12 index 000..6a9ae9f --- /dev/null +++ b/docroot/bits/static-1.21wmf3/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf3/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf5/extensions b/docroot/bits/static-1.21wmf5/extensions new file mode 12 index 000..a7048f2 --- /dev/null +++ b/docroot/bits/static-1.21wmf5/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf5/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf5/resources b/docroot/bits/static-1.21wmf5/resources new file mode 12 index 000..fe32424 --- /dev/null +++ b/docroot/bits/static-1.21wmf5/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf5/resources \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf5/skins b/docroot/bits/static-1.21wmf5/skins new file mode 12 index 000..170bb1b --- /dev/null +++ b/docroot/bits/static-1.21wmf5/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf5/skins/ \ No newline at end of file diff --git a/live-1.5/static-1.21wmf1/extensions b/live-1.5/static-1.21wmf1/extensions new file mode 12 index 000..c73a990 --- /dev/null +++ b/live-1.5/static-1.21wmf1/extensions @@ -0,0 +1 @@
[MediaWiki-commits] [Gerrit] Add wmf4 - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/51114 Change subject: Add wmf4 .. Add wmf4 Change-Id: I168b7d4dc79e38c80c541dff66b59e7d5cd3e337 --- A docroot/bits/static-1.21wmf4/extensions A docroot/bits/static-1.21wmf4/resources A docroot/bits/static-1.21wmf4/skins A live-1.5/static-1.21wmf4/extensions A live-1.5/static-1.21wmf4/resources A live-1.5/static-1.21wmf4/skins 6 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/14/51114/1 diff --git a/docroot/bits/static-1.21wmf4/extensions b/docroot/bits/static-1.21wmf4/extensions new file mode 12 index 000..b01c47e --- /dev/null +++ b/docroot/bits/static-1.21wmf4/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf4/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf4/resources b/docroot/bits/static-1.21wmf4/resources new file mode 12 index 000..3c7c41d --- /dev/null +++ b/docroot/bits/static-1.21wmf4/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf4/resources \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf4/skins b/docroot/bits/static-1.21wmf4/skins new file mode 12 index 000..dec66b3 --- /dev/null +++ b/docroot/bits/static-1.21wmf4/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf4/skins/ \ No newline at end of file diff --git a/live-1.5/static-1.21wmf4/extensions b/live-1.5/static-1.21wmf4/extensions new file mode 12 index 000..b01c47e --- /dev/null +++ b/live-1.5/static-1.21wmf4/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf4/extensions \ No newline at end of file diff --git a/live-1.5/static-1.21wmf4/resources b/live-1.5/static-1.21wmf4/resources new file mode 12 index 000..3c7c41d --- /dev/null +++ b/live-1.5/static-1.21wmf4/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf4/resources \ No newline at end of file diff --git a/live-1.5/static-1.21wmf4/skins b/live-1.5/static-1.21wmf4/skins new file mode 12 index 000..05e59f2 --- /dev/null +++ b/live-1.5/static-1.21wmf4/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf4/skins \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/51114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I168b7d4dc79e38c80c541dff66b59e7d5cd3e337 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add wmf4 - change (operations/mediawiki-config)
Reedy has submitted this change and it was merged. Change subject: Add wmf4 .. Add wmf4 Change-Id: I168b7d4dc79e38c80c541dff66b59e7d5cd3e337 --- A docroot/bits/static-1.21wmf4/extensions A docroot/bits/static-1.21wmf4/resources A docroot/bits/static-1.21wmf4/skins A live-1.5/static-1.21wmf4/extensions A live-1.5/static-1.21wmf4/resources A live-1.5/static-1.21wmf4/skins 6 files changed, 6 insertions(+), 0 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/docroot/bits/static-1.21wmf4/extensions b/docroot/bits/static-1.21wmf4/extensions new file mode 12 index 000..b01c47e --- /dev/null +++ b/docroot/bits/static-1.21wmf4/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf4/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf4/resources b/docroot/bits/static-1.21wmf4/resources new file mode 12 index 000..3c7c41d --- /dev/null +++ b/docroot/bits/static-1.21wmf4/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf4/resources \ No newline at end of file diff --git a/docroot/bits/static-1.21wmf4/skins b/docroot/bits/static-1.21wmf4/skins new file mode 12 index 000..dec66b3 --- /dev/null +++ b/docroot/bits/static-1.21wmf4/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf4/skins/ \ No newline at end of file diff --git a/live-1.5/static-1.21wmf4/extensions b/live-1.5/static-1.21wmf4/extensions new file mode 12 index 000..b01c47e --- /dev/null +++ b/live-1.5/static-1.21wmf4/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf4/extensions \ No newline at end of file diff --git a/live-1.5/static-1.21wmf4/resources b/live-1.5/static-1.21wmf4/resources new file mode 12 index 000..3c7c41d --- /dev/null +++ b/live-1.5/static-1.21wmf4/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf4/resources \ No newline at end of file diff --git a/live-1.5/static-1.21wmf4/skins b/live-1.5/static-1.21wmf4/skins new file mode 12 index 000..05e59f2 --- /dev/null +++ b/live-1.5/static-1.21wmf4/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.21wmf4/skins \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/51114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I168b7d4dc79e38c80c541dff66b59e7d5cd3e337 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing namespace renaming aftermath - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51115
Change subject: Fixing namespace renaming aftermath
..
Fixing namespace renaming aftermath
Renaming done in change Id5aca089151063022dd0468e37589b54f78c7e3e obviously
skipped some
integer parts of the code.
Change-Id: I2a2850177f7768fc83d88aa22d78902287254e2e
---
M repo/includes/api/ApiWikibase.php
M repo/includes/api/EditEntity.php
M repo/includes/api/GetEntities.php
M repo/includes/api/SearchEntities.php
4 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/15/51115/1
diff --git a/repo/includes/api/ApiWikibase.php
b/repo/includes/api/ApiWikibase.php
index 163e387..a65a720 100644
--- a/repo/includes/api/ApiWikibase.php
+++ b/repo/includes/api/ApiWikibase.php
@@ -153,8 +153,8 @@
$siteLinks,
function( $a, $b ) {
/**
-* @var SiteLink $a
-* @var SiteLink $b
+* @var
\Wikibase\SiteLink $a
+* @var
\Wikibase\SiteLink $b
*/
return strcmp(
$a-getSite()-getGlobalId(), $b-getSite()-getGlobalId() );
}
@@ -164,8 +164,8 @@
$siteLinks,
function( $a, $b ) {
/**
-* @var SiteLink $a
-* @var SiteLink $b
+* @var
\Wikibase\SiteLink $a
+* @var
\Wikibase\SiteLink $b
*/
return strcmp(
$b-getSite()-getGlobalId(), $a-getSite()-getGlobalId() );
}
diff --git a/repo/includes/api/EditEntity.php b/repo/includes/api/EditEntity.php
index 4188c52..8570616 100644
--- a/repo/includes/api/EditEntity.php
+++ b/repo/includes/api/EditEntity.php
@@ -89,9 +89,9 @@
case 'item':
return ItemContent::newEmpty();
case 'property':
- return PropertyContent::newEmpty();
+ return
\Wikibase\PropertyContent::newEmpty();
case 'query':
- return QueryContent::newEmpty();
+ return
\Wikibase\QueryContent::newEmpty();
default:
$this-dieUsage( $this-msg(
'wikibase-api-no-such-entity' )-text(), 'no-such-entity' );
}
@@ -166,7 +166,7 @@
}
break;
case 'ns':
- // not completly convinced that we can
use title to get the namespace in this case
+ // not completely convinced that we can
use title to get the namespace in this case
if ( isset( $data[$props] ) (
is_object( $title ) ? $title-getNamespace() !== $data[$props] : true ) ) {
wfProfileOut( __METHOD__ );
$this-dieUsage( $this-msg(
'wikibase-api-illegal-field', 'namespace' )-text(), 'illegal-field' );
diff --git a/repo/includes/api/GetEntities.php
b/repo/includes/api/GetEntities.php
index 3511648..2432d17 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -146,7 +146,7 @@
// as long as getWikiPageForId only returns ids
for legal items this holds
/**
-* @var $entityContent EntityContent
+* @var $entityContent \Wikibase\EntityContent
*/
$entityContent = $page-getContent();
diff --git a/repo/includes/api/SearchEntities.php
b/repo/includes/api/SearchEntities.php
index 2103fd3..2da7df9 100644
--- a/repo/includes/api/SearchEntities.php
+++
[MediaWiki-commits] [Gerrit] (bug 45345) Add Language to gettext file header - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: (bug 45345) Add Language to gettext file header .. (bug 45345) Add Language to gettext file header Change-Id: Id125a06815e47ad3e09a6269191e43132e265b10 --- M ffs/GettextFFS.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/ffs/GettextFFS.php b/ffs/GettextFFS.php index 8441a75..f865fc1 100644 --- a/ffs/GettextFFS.php +++ b/ffs/GettextFFS.php @@ -405,6 +405,7 @@ } $specs['Content-Type'] = 'text/plain; charset=UTF-8'; $specs['Content-Transfer-Encoding'] = '8bit'; + $specs['Language'] = $this-group-mapCode( $code ); wfRunHooks( 'Translate:GettextFFS:headerFields', array( $specs, $this-group, $code ) ); $specs['X-Generator'] = $this-getGenerator(); -- To view, visit https://gerrit.wikimedia.org/r/50897 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id125a06815e47ad3e09a6269191e43132e265b10 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix whitespace of I2dc613b73 - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51116
Change subject: Fix whitespace of I2dc613b73
..
Fix whitespace of I2dc613b73
Change-Id: I5fa1d25072be652c4fe1474db002cc3246fc
---
M resources/css/ext.translate.proofread.css
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/16/51116/1
diff --git a/resources/css/ext.translate.proofread.css
b/resources/css/ext.translate.proofread.css
index eabaf3d..3bd09e5 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -17,7 +17,7 @@
.tux-message-proofread.open .tux-proofread-source,
.tux-message-proofread.open .tux-proofread-translation,
.tux-message-proofread.open .tux-proofread-action-block {
- display:none;
+ display: none;
}
.tux-proofread-source {
--
To view, visit https://gerrit.wikimedia.org/r/51116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5fa1d25072be652c4fe1474db002cc3246fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] When using the age parameter, expire everything before now -... - change (mediawiki/core)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51117
Change subject: When using the age parameter, expire everything before now - age
..
When using the age parameter, expire everything before now - age
Change-Id: Ib6c7bfe4272a9e6f83c563233e41b85e520c72a8
---
M maintenance/purgeParserCache.php
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/17/51117/1
diff --git a/maintenance/purgeParserCache.php b/maintenance/purgeParserCache.php
index f067dc6..31e049d 100644
--- a/maintenance/purgeParserCache.php
+++ b/maintenance/purgeParserCache.php
@@ -49,8 +49,7 @@
if ( $inputDate !== null ) {
$date = wfTimestamp( TS_MW, strtotime( $inputDate ) );
} elseif ( $inputAge !== null ) {
- global $wgParserCacheExpireTime;
- $date = wfTimestamp( TS_MW, time() +
$wgParserCacheExpireTime - intval( $inputAge ) );
+ $date = wfTimestamp( TS_MW, time() - intval( $inputAge
) );
} else {
echo Must specify either --expiredate or --age\n;
exit( 1 );
--
To view, visit https://gerrit.wikimedia.org/r/51117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6c7bfe4272a9e6f83c563233e41b85e520c72a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Docs, typofix, additional testcase for I7be51e - change (mediawiki/core)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51118
Change subject: Docs, typofix, additional testcase for I7be51e
..
Docs, typofix, additional testcase for I7be51e
Change-Id: I0ab17cb749c23b666e0bb1ee61fe7d424e717fde
---
M tests/phpunit/languages/LanguageTest.php
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/18/51118/1
diff --git a/tests/phpunit/languages/LanguageTest.php
b/tests/phpunit/languages/LanguageTest.php
index 9de6722..dd90d31 100644
--- a/tests/phpunit/languages/LanguageTest.php
+++ b/tests/phpunit/languages/LanguageTest.php
@@ -1226,6 +1226,7 @@
}
function providePluralData() {
+ // Params are: [expected text, number given, [the plural forms]]
return array(
array( 'plural', 0, array(
'singular', 'plural'
@@ -1242,8 +1243,8 @@
array( 'plural', 3, array(
'0=explicit zero', '1=explicit one',
'singular', 'plural'
) ),
- array( 'explicit elevan', 11, array(
- 'singular', 'plural', '11=explicit elevan',
+ array( 'explicit eleven', 11, array(
+ 'singular', 'plural', '11=explicit eleven',
) ),
array( 'plural', 12, array(
'singular', 'plural', '11=explicit twelve',
@@ -1251,6 +1252,9 @@
array( 'plural', 12, array(
'singular', 'plural', '=explicit form',
) ),
+ array( 'other', 2, array(
+ 'kissa=kala', '1=2=3', 'other',
+ ) ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/51118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ab17cb749c23b666e0bb1ee61fe7d424e717fde
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Docs, typofix, additional testcase for I7be51e - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Docs, typofix, additional testcase for I7be51e
..
Docs, typofix, additional testcase for I7be51e
Change-Id: I0ab17cb749c23b666e0bb1ee61fe7d424e717fde
---
M tests/phpunit/languages/LanguageTest.php
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/languages/LanguageTest.php
b/tests/phpunit/languages/LanguageTest.php
index 9de6722..dd90d31 100644
--- a/tests/phpunit/languages/LanguageTest.php
+++ b/tests/phpunit/languages/LanguageTest.php
@@ -1226,6 +1226,7 @@
}
function providePluralData() {
+ // Params are: [expected text, number given, [the plural forms]]
return array(
array( 'plural', 0, array(
'singular', 'plural'
@@ -1242,8 +1243,8 @@
array( 'plural', 3, array(
'0=explicit zero', '1=explicit one',
'singular', 'plural'
) ),
- array( 'explicit elevan', 11, array(
- 'singular', 'plural', '11=explicit elevan',
+ array( 'explicit eleven', 11, array(
+ 'singular', 'plural', '11=explicit eleven',
) ),
array( 'plural', 12, array(
'singular', 'plural', '11=explicit twelve',
@@ -1251,6 +1252,9 @@
array( 'plural', 12, array(
'singular', 'plural', '=explicit form',
) ),
+ array( 'other', 2, array(
+ 'kissa=kala', '1=2=3', 'other',
+ ) ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/51118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ab17cb749c23b666e0bb1ee61fe7d424e717fde
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Proper enter key handling for entity selector's more link - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51119
Change subject: Proper enter key handling for entity selector's more link
..
Proper enter key handling for entity selector's more link
Implemented proper enter key handling for suggester widget's custom items.
Additionally,
event propagation is prevented for the entity selector's more link since it
would cause
unrelated action. Furthermore, no string auto-completion is performed when
fetching more
results since the replace operation would trigger another API call.
Setting proper focus will be done in another change set.
Change-Id: I3e7f3929c7cdf4c698553ea90f8be14e2117
---
M lib/resources/jquery.ui/jquery.ui.suggester.js
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
2 files changed, 28 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/19/51119/1
diff --git a/lib/resources/jquery.ui/jquery.ui.suggester.js
b/lib/resources/jquery.ui/jquery.ui.suggester.js
index 1618ac3..404dc97 100644
--- a/lib/resources/jquery.ui/jquery.ui.suggester.js
+++ b/lib/resources/jquery.ui/jquery.ui.suggester.js
@@ -64,7 +64,8 @@
* For custom styling, the css class 'ui-suggester-custom' is assigned
to the li/ node.
* @option customListItem.action {Function} The action to perform when
selecting the additional
* list item.
- * Parameters: (1) Reference to the entity selector widget
+ * Parameters: (1) {jQuery.Event} Event that has triggered the custom
action
+ * (2) {$.ui.suggester} Reference to the suggester widget
* @option customListItem.cssClass {String} (optional) Additional css
class(es) to assign to the custom
* item's li/ node.
*
@@ -152,6 +153,18 @@
}
} )
.on( 'keydown.' + this.widgetName, function( event ) {
+ if ( event.keyCode === $.ui.keyCode.ENTER ) {
+ if ( self.menu.active ) {
+ var item =
self.menu.active.data( 'item.autocomplete' );
+ if ( item.isCustom
item.customAction ) {
+ // Custom actions are
supposed to be suggester-specific. If, for some
+ // reason, they should
interact with external components, the action(s)
+ // may trigger custom
events.
+ item.customAction(
event, self );
+ return;
+ }
+ }
+ }
self._lastKeyDown = event.keyCode;
} );
@@ -164,7 +177,7 @@
if ( !item.isCustom ) {
fnNativeMenuSelected( event, ui );
} else if ( $.isFunction( item.customAction ) )
{
- item.customAction( self );
+ item.customAction( event, self );
}
} );
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index bf12508..802cbc3 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -359,9 +359,15 @@
this._updateValue();
- // auto-complete input box text
(because of the API call lag, this is
- // avoided when hitting backspace,
since the value would be reset too slow)
- if ( this._lastKeyDown !== 8
response.search.length 0 ) {
+ // Auto-complete input box text.
+ if (
+ response.search.length 0
+ // Do not auto-complete when
hitting backspace due to API lag.
+this._lastKeyDown !==
$.ui.keyCode.BACKSPACE
+ // Do not auto-complete when
fetching more results since it would trigger
+ // another API call.
+this.offset === 0
+ ) {
[MediaWiki-commits] [Gerrit] Add missing parameter in handleWriteError call - change (mediawiki/core)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51120
Change subject: Add missing parameter in handleWriteError call
..
Add missing parameter in handleWriteError call
Change-Id: If3ebf6f77d66121bac8e11d43582f1dbb3e88e12
---
M includes/objectcache/SqlBagOStuff.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/20/51120/1
diff --git a/includes/objectcache/SqlBagOStuff.php
b/includes/objectcache/SqlBagOStuff.php
index 5cc02d3..2404703 100644
--- a/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@ -359,7 +359,7 @@
);
$db-commit( __METHOD__ );
} catch ( DBQueryError $e ) {
- $this-handleWriteError( $e );
+ $this-handleWriteError( $e, $serverIndex );
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/51120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3ebf6f77d66121bac8e11d43582f1dbb3e88e12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moving entitysearch to experimental features - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51121
Change subject: Moving entitysearch to experimental features
..
Moving entitysearch to experimental features
Replacing the native search box with the entity selector requires some
adjustments
to be done in the entity selector widget. Until these are not done, the entity
selector should not replace the search box since it will behave very different
than
a regular search box.
Change-Id: I37786e885f48f0d4f80025a8835f10512ff0a7f4
---
M repo/Wikibase.hooks.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/21/51121/1
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index b8213f3..4fa3afe 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -46,7 +46,9 @@
* @return boolean
*/
public static function onBeforePageDisplay( \OutputPage $out, \Skin
$skin ) {
- $out-addModules( 'wikibase.ui.entitysearch' );
+ if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
+ $out-addModules( 'wikibase.ui.entitysearch' );
+ }
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/51121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37786e885f48f0d4f80025a8835f10512ff0a7f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing parameter in handleWriteError call - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add missing parameter in handleWriteError call
..
Add missing parameter in handleWriteError call
Change-Id: If3ebf6f77d66121bac8e11d43582f1dbb3e88e12
---
M includes/objectcache/SqlBagOStuff.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
IAlex: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/objectcache/SqlBagOStuff.php
b/includes/objectcache/SqlBagOStuff.php
index 5cc02d3..2404703 100644
--- a/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@ -359,7 +359,7 @@
);
$db-commit( __METHOD__ );
} catch ( DBQueryError $e ) {
- $this-handleWriteError( $e );
+ $this-handleWriteError( $e, $serverIndex );
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/51120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If3ebf6f77d66121bac8e11d43582f1dbb3e88e12
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Demon ch...@wikimedia.org
Gerrit-Reviewer: IAlex ialex.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing namespace renaming aftermath - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: Fixing namespace renaming aftermath
..
Fixing namespace renaming aftermath
Renaming done in change Id5aca089151063022dd0468e37589b54f78c7e3e obviously
skipped some
integer parts of the code.
Change-Id: I2a2850177f7768fc83d88aa22d78902287254e2e
---
M repo/includes/api/ApiWikibase.php
M repo/includes/api/EditEntity.php
M repo/includes/api/GetEntities.php
M repo/includes/api/SearchEntities.php
4 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/repo/includes/api/ApiWikibase.php
b/repo/includes/api/ApiWikibase.php
index 163e387..a65a720 100644
--- a/repo/includes/api/ApiWikibase.php
+++ b/repo/includes/api/ApiWikibase.php
@@ -153,8 +153,8 @@
$siteLinks,
function( $a, $b ) {
/**
-* @var SiteLink $a
-* @var SiteLink $b
+* @var
\Wikibase\SiteLink $a
+* @var
\Wikibase\SiteLink $b
*/
return strcmp(
$a-getSite()-getGlobalId(), $b-getSite()-getGlobalId() );
}
@@ -164,8 +164,8 @@
$siteLinks,
function( $a, $b ) {
/**
-* @var SiteLink $a
-* @var SiteLink $b
+* @var
\Wikibase\SiteLink $a
+* @var
\Wikibase\SiteLink $b
*/
return strcmp(
$b-getSite()-getGlobalId(), $a-getSite()-getGlobalId() );
}
diff --git a/repo/includes/api/EditEntity.php b/repo/includes/api/EditEntity.php
index 4188c52..8570616 100644
--- a/repo/includes/api/EditEntity.php
+++ b/repo/includes/api/EditEntity.php
@@ -89,9 +89,9 @@
case 'item':
return ItemContent::newEmpty();
case 'property':
- return PropertyContent::newEmpty();
+ return
\Wikibase\PropertyContent::newEmpty();
case 'query':
- return QueryContent::newEmpty();
+ return
\Wikibase\QueryContent::newEmpty();
default:
$this-dieUsage( $this-msg(
'wikibase-api-no-such-entity' )-text(), 'no-such-entity' );
}
@@ -166,7 +166,7 @@
}
break;
case 'ns':
- // not completly convinced that we can
use title to get the namespace in this case
+ // not completely convinced that we can
use title to get the namespace in this case
if ( isset( $data[$props] ) (
is_object( $title ) ? $title-getNamespace() !== $data[$props] : true ) ) {
wfProfileOut( __METHOD__ );
$this-dieUsage( $this-msg(
'wikibase-api-illegal-field', 'namespace' )-text(), 'illegal-field' );
diff --git a/repo/includes/api/GetEntities.php
b/repo/includes/api/GetEntities.php
index 3511648..2432d17 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -146,7 +146,7 @@
// as long as getWikiPageForId only returns ids
for legal items this holds
/**
-* @var $entityContent EntityContent
+* @var $entityContent \Wikibase\EntityContent
*/
$entityContent = $page-getContent();
diff --git a/repo/includes/api/SearchEntities.php
b/repo/includes/api/SearchEntities.php
index 2103fd3..2da7df9 100644
--- a/repo/includes/api/SearchEntities.php
+++ b/repo/includes/api/SearchEntities.php
@@ -51,13 +51,13 @@
$ids =
[MediaWiki-commits] [Gerrit] Consistency fixes - change (mediawiki/core)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/51122 Change subject: Consistency fixes .. Consistency fixes Spotted by Shirayuki. Change-Id: I0e016caacaa7c1f00c966cc50eaa2f6982085e5b --- M languages/messages/MessagesEn.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/22/51122/1 diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 73f09ce..68d5968 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -3854,7 +3854,7 @@ 'nextdiff' = 'Newer edit →', # Media information -'mediawarning'= '''Warning''': This file type may contain malicious code. +'mediawarning'= '''Warning:''' This file type may contain malicious code. By executing it, your system may be compromised., 'imagemaxsize'= Image size limit:br /''(for file description pages)'', 'thumbsize' = 'Thumbnail size:', @@ -4513,7 +4513,7 @@ 'scarytranscludetoolong' = '[URL is too long]', # Delete conflict -'deletedwhileediting' = '''Warning''': This page was deleted after you started editing!, +'deletedwhileediting' = '''Warning:''' This page was deleted after you started editing!, 'confirmrecreate' = User [[User:$1|$1]] ([[User talk:$1|talk]]) deleted this page after you started editing with reason: : ''$2'' Please confirm that you really want to recreate this page., -- To view, visit https://gerrit.wikimedia.org/r/51122 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e016caacaa7c1f00c966cc50eaa2f6982085e5b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consistency fixes - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Consistency fixes .. Consistency fixes Spotted by Shirayuki. Change-Id: I0e016caacaa7c1f00c966cc50eaa2f6982085e5b --- M languages/messages/MessagesEn.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 73f09ce..68d5968 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -3854,7 +3854,7 @@ 'nextdiff' = 'Newer edit →', # Media information -'mediawarning'= '''Warning''': This file type may contain malicious code. +'mediawarning'= '''Warning:''' This file type may contain malicious code. By executing it, your system may be compromised., 'imagemaxsize'= Image size limit:br /''(for file description pages)'', 'thumbsize' = 'Thumbnail size:', @@ -4513,7 +4513,7 @@ 'scarytranscludetoolong' = '[URL is too long]', # Delete conflict -'deletedwhileediting' = '''Warning''': This page was deleted after you started editing!, +'deletedwhileediting' = '''Warning:''' This page was deleted after you started editing!, 'confirmrecreate' = User [[User:$1|$1]] ([[User talk:$1|talk]]) deleted this page after you started editing with reason: : ''$2'' Please confirm that you really want to recreate this page., -- To view, visit https://gerrit.wikimedia.org/r/51122 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e016caacaa7c1f00c966cc50eaa2f6982085e5b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki/core)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51123
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Iae47a24127b4bdd4ef308bdbd5be865217eb14f1
---
M languages/messages/MessagesEn.php
1 file changed, 115 insertions(+), 115 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/23/51123/1
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 68d5968..9ea15cd 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -660,10 +660,10 @@
'tog-previewontop'= 'Show preview before edit box',
'tog-previewonfirst' = 'Show preview on first edit',
'tog-nocache' = 'Disable browser page caching',
-'tog-enotifwatchlistpages'= 'E-mail me when a page or file on my
watchlist is changed',
-'tog-enotifusertalkpages' = 'E-mail me when my user talk page is changed',
-'tog-enotifminoredits'= 'E-mail me also for minor edits of pages and
files',
-'tog-enotifrevealaddr'= 'Reveal my e-mail address in notification
e-mails',
+'tog-enotifwatchlistpages'= 'Email me when a page or file on my watchlist
is changed',
+'tog-enotifusertalkpages' = 'Email me when my user talk page is changed',
+'tog-enotifminoredits'= 'Email me also for minor edits of pages and
files',
+'tog-enotifrevealaddr'= 'Reveal my email address in notification
emails',
'tog-shownumberswatching' = 'Show the number of watching users',
'tog-oldsig' = 'Existing signature:',
'tog-fancysig'= 'Treat signature as wikitext (without an
automatic link)',
@@ -678,7 +678,7 @@
'tog-watchlisthideliu'= 'Hide edits by logged in users from the
watchlist',
'tog-watchlisthideanons' = 'Hide edits by anonymous users from the
watchlist',
'tog-watchlisthidepatrolled' = 'Hide patrolled edits from the watchlist',
-'tog-ccmeonemails'= 'Send me copies of e-mails I send to other
users',
+'tog-ccmeonemails'= 'Send me copies of emails I send to other
users',
'tog-diffonly'= 'Do not show page content below diffs',
'tog-showhiddencats' = 'Show hidden categories',
'tog-noconvertlink' = 'Disable link title conversion', # only
translate this message to other languages if you have to change it
@@ -1097,7 +1097,7 @@
'gotaccount' = 'Already have an account? $1.',
'gotaccountlink' = 'Log in',
'userlogin-resetlink'= 'Forgotten your login details?',
-'createaccountmail' = 'Use a temporary random password and send it
to the e-mail address specified below',
+'createaccountmail' = 'Use a temporary random password and send it
to the email address specified below',
'createaccountreason'= 'Reason:',
'badretype' = 'The passwords you entered do not match.',
'userexists' = 'Username entered already in use.
@@ -1131,7 +1131,7 @@
'passwordtooshort' = 'Passwords must be at least {{PLURAL:$1|1
character|$1 characters}}.',
'password-name-match'= 'Your password must be different from your
username.',
'password-login-forbidden' = 'The use of this username and password has
been forbidden.',
-'mailmypassword' = 'E-mail new password',
+'mailmypassword' = 'Email new password',
'passwordremindertitle' = 'New temporary password for {{SITENAME}}',
'passwordremindertext' = 'Someone (probably you, from IP address $1)
requested a new
password for {{SITENAME}} ($4). A temporary password for user
@@ -1142,13 +1142,13 @@
If someone else made this request, or if you have remembered your password,
and you no longer wish to change it, you may ignore this message and
continue using your old password.',
-'noemail'= 'There is no e-mail address recorded for user
$1.',
-'noemailcreate' = 'You need to provide a valid e-mail address',
-'passwordsent' = 'A new password has been sent to the e-mail
address registered for $1.
+'noemail'= 'There is no email address recorded for user
$1.',
+'noemailcreate' = 'You need to provide a valid email address',
+'passwordsent' = 'A new password has been sent to the email
address registered for $1.
Please log in again after you receive it.',
'blocked-mailpassword' = 'Your IP address is blocked from editing, and
so is not allowed to use the password recovery function to prevent abuse.',
-'eauthentsent' = 'A confirmation e-mail has been sent to the
nominated e-mail address.
-Before any other e-mail is sent to the account, you will have to follow the
instructions in the e-mail, to confirm that the account is actually yours.',
+'eauthentsent'
[MediaWiki-commits] [Gerrit] Detect fractional numbers where they shouldn't be in coordin... - change (mediawiki...GeoData)
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51124
Change subject: Detect fractional numbers where they shouldn't be in coordinates
..
Detect fractional numbers where they shouldn't be in coordinates
Change-Id: Idc3a4480ec20fb5b4551654c9350648351162126
---
M GeoData.body.php
M tests/ParseCoordTest.php
2 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GeoData
refs/changes/24/51124/1
diff --git a/GeoData.body.php b/GeoData.body.php
index f5c1fb2..79e5804 100644
--- a/GeoData.body.php
+++ b/GeoData.body.php
@@ -96,8 +96,13 @@
$count = count( $parts );
$multiplier = 1;
$value = 0;
+ $alreadyFractional = false;
for ( $i = 0; $i $count; $i++ ) {
+ // 20° 15.5' 20 is wrong
+ if ( $alreadyFractional ) {
+ return false;
+ }
$part = $parts[$i];
if ( $i 0 $i == $count - 1 ) {
$suffix = self::parseSuffix( $part, $coordInfo
);
@@ -119,6 +124,7 @@
|| $part $max ) {
return false;
}
+ $alreadyFractional = $part != intval( $part );
$value += $part * $multiplier * GeoDataMath::sign(
$value );
$multiplier /= 60;
}
diff --git a/tests/ParseCoordTest.php b/tests/ParseCoordTest.php
index 007e89e..9efc087 100644
--- a/tests/ParseCoordTest.php
+++ b/tests/ParseCoordTest.php
@@ -58,6 +58,12 @@
array( array( 1, 2, 3, 'N', 'E' ), false ),
array( array( 1, 2, 3, 'N', 1, 'E' ), false ),
array( array( 1, 2, 3, 'N', 1, 2, 'E' ), false ),
+ // Fractional numbers inconsistency
+ array( array( 1, 2.1, 3, 1, 2, 3 ), false ),
+ array( array( 1, 2.1, 3.2, 1, 2, 3 ), false ),
+ array( array( 1.0001, 2.1, 3.2, 1, 2, 3 ), false ),
+ array( array( 1.0001, 2.1, 3, 1, 2, 3 ), false ),
+ array( array( 1.0001, 2, 3, 1, 2, 3 ), false ),
// coordinate validation (Earth)
array( array( -90, 180 ), new Coord( -90, 180 ) ),
array( array( 90.001, -180.0001 ), false ),
--
To view, visit https://gerrit.wikimedia.org/r/51124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc3a4480ec20fb5b4551654c9350648351162126
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ArticleFeedback)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51125
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Ica47671266b424eb00ce9f7cb5004d46690d8ad6
---
M ArticleFeedback.i18n.php
1 file changed, 4 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedback
refs/changes/25/51125/1
diff --git a/ArticleFeedback.i18n.php b/ArticleFeedback.i18n.php
index 676bda6..0317559 100644
--- a/ArticleFeedback.i18n.php
+++ b/ArticleFeedback.i18n.php
@@ -23,8 +23,8 @@
'articlefeedback-form-panel-expertise-profession' = 'It is part of my
profession',
'articlefeedback-form-panel-expertise-hobby' = 'It is a deep personal
passion',
'articlefeedback-form-panel-expertise-other' = 'The source of my
knowledge is not listed here',
- 'articlefeedback-form-panel-helpimprove' = 'I would like to help
improve Wikipedia, send me an e-mail (optional)',
- 'articlefeedback-form-panel-helpimprove-note' = 'We will send you a
confirmation e-mail. We will not share your e-mail address with outside parties
as per our $1.',
+ 'articlefeedback-form-panel-helpimprove' = 'I would like to help
improve Wikipedia, send me an email (optional)',
+ 'articlefeedback-form-panel-helpimprove-note' = 'We will send you a
confirmation email. We will not share your email address with outside parties
as per our $1.',
'articlefeedback-form-panel-helpimprove-email-placeholder' =
'em...@example.org', // Optional
'articlefeedback-form-panel-helpimprove-privacy' = 'feedback privacy
statement',
'articlefeedback-form-panel-submit' = 'Submit ratings',
@@ -96,7 +96,7 @@
Thank you for expressing interest in helping to improve {{SITENAME}}.
-Please take a moment to confirm your e-mail by clicking on the link below:
+Please take a moment to confirm your email address by clicking on the link
below:
$1
@@ -110,7 +110,7 @@
We will be in touch shortly with how you can help improve {{SITENAME}}.
-If you did not initiate this request, please ignore this e-mail and we will
not send you anything else.
+If you did not initiate this request, please ignore this email and we will not
send you anything else.
Best wishes, and thank you,
The {{SITENAME}} team',
--
To view, visit https://gerrit.wikimedia.org/r/51125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica47671266b424eb00ce9f7cb5004d46690d8ad6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedback
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ArticleFeedbackv5)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51126
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I86403875e690de6b4cac3b91245e2960a9ffd8b8
---
M ArticleFeedbackv5.i18n.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/26/51126/1
diff --git a/ArticleFeedbackv5.i18n.php b/ArticleFeedbackv5.i18n.php
index e264bd8..e271141 100644
--- a/ArticleFeedbackv5.i18n.php
+++ b/ArticleFeedbackv5.i18n.php
@@ -334,7 +334,7 @@
'articlefeedbackv5-noteflyover-requestoversight-description' = 'Before
requesting oversight, please check that this post
includes one of these issues:
* phone numbers
-* e-mail addresses
+* email addresses
* pornographic links
* defamatory/libelous comments about a person
* [//en.wikipedia.org/wiki/Wikipedia:Oversight#Policy other criteria for
oversight]',
@@ -517,7 +517,7 @@
Thank you for expressing interest in helping to improve {{SITENAME}}.
-Please take a moment to confirm your e-mail by clicking on the link below:
+Please take a moment to confirm your email address by clicking on the link
below:
$1
@@ -531,7 +531,7 @@
We will be in touch shortly with how you can help improve {{SITENAME}}.
-If you did not initiate this request, please ignore this e-mail and we will
not send you anything else.
+If you did not initiate this request, please ignore this email and we will not
send you anything else.
Best wishes, and thank you,
The {{SITENAME}} team',
--
To view, visit https://gerrit.wikimedia.org/r/51126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86403875e690de6b4cac3b91245e2960a9ffd8b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...CentralAuth)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/51127 Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: I526595dc0e0cdcd377f3c7fcd063bc62f36937d4 --- M CentralAuth.i18n.php M CentralAuthPlugin.php M CentralAuthUser.php 3 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/27/51127/1 diff --git a/CentralAuth.i18n.php b/CentralAuth.i18n.php index 051862e..d8b9f6a 100644 --- a/CentralAuth.i18n.php +++ b/CentralAuth.i18n.php @@ -28,7 +28,7 @@ 'centralauth-merge-step1-title' = 'Begin login unification', 'centralauth-merge-step1-detail' = 'Please enter your account password. -Your password and registered e-mail address will be checked against the accounts on other wikis to confirm that they match. +Your password and registered email address will be checked against the accounts on other wikis to confirm that they match. No changes will be made until you have confirmed that things are in order.', 'centralauth-merge-step1-submit' = 'Confirm login information', @@ -84,7 +84,7 @@ // For lists of wikis/accounts: 'centralauth-list-home-title' = 'Home wiki', - 'centralauth-list-home-dryrun' = 'The password and e-mail address set at this wiki will be used for your unified account.', + 'centralauth-list-home-dryrun' = 'The password and email address set at this wiki will be used for your unified account.', 'centralauth-list-attached-title' = 'Attached accounts', 'centralauth-list-attached' = 'The account named $1 on each of the following sites has been automatically attached to the unified account:', 'centralauth-list-attached-dryrun' = 'The account named $1 on each of the following sites will be automatically attached to the unified account:', @@ -97,7 +97,7 @@ // Merge methods 'centralauth-merge-method-primary' = 'home wiki', 'centralauth-merge-method-empty'= 'no contributions', - 'centralauth-merge-method-mail' = 'confirmed by e-mail', + 'centralauth-merge-method-mail' = 'confirmed by email', 'centralauth-merge-method-password' = 'confirmed by password', 'centralauth-merge-method-admin'= 'admin-merged account', 'centralauth-merge-method-new' = 'new account', @@ -105,7 +105,7 @@ 'centralauth-merge-method-primary-desc' = 'This is the wiki at which the account was initially merged. Note that it may differ from the real home wiki of that user.', 'centralauth-merge-method-empty-desc'= 'Indicates that the local account was merged because it had no edits.', - 'centralauth-merge-method-mail-desc' = 'Indicates that the local account was merged because its email address matched the e-mail address of the main account.', + 'centralauth-merge-method-mail-desc' = 'Indicates that the local account was merged because its email address matched the email address of the main account.', 'centralauth-merge-method-password-desc' = 'Indicates that the local account was merged because user specified a valid password for it.', 'centralauth-merge-method-admin-desc'= 'Indicates that the local account was merged manually by stewards. That feature is disabled now because of security reasons.', @@ -118,7 +118,7 @@ 'centralauth-finish-text' = 'If these accounts do belong to you, you can finish the login unification process simply by typing the passwords for the other accounts here:', 'centralauth-finish-password' = 'Password:', 'centralauth-finish-login' = 'Login', - 'centralauth-finish-send-confirmation' = 'E-mail password', + 'centralauth-finish-send-confirmation' = 'Email password', 'centralauth-finish-problems' = Are you having trouble, or are you not the owner of these other accounts? [[meta:Help:Unified login problems|How to find help]]…, 'centralauth-finish-noconfirms'= 'No accounts could be confirmed using this password.', diff --git a/CentralAuthPlugin.php b/CentralAuthPlugin.php index 3e796a3..2790d15 100644 --- a/CentralAuthPlugin.php +++ b/CentralAuthPlugin.php @@ -181,7 +181,7 @@ /** * Add a user to the external authentication database. -* E-mail and real name addresses are provided by the +* Email and real name addresses are provided by the * registering user, and may or may not be accepted. * * Return true if successful. diff --git a/CentralAuthUser.php b/CentralAuthUser.php index 3a50267..3505502 100644 --- a/CentralAuthUser.php +++ b/CentralAuthUser.php @@ -662,7 +662,7 @@ * @return Array of wiki = authentication method */
[MediaWiki-commits] [Gerrit] update ms-be12 entries in dhcp, site, clean up other ms-be e... - change (operations/puppet)
ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51128
Change subject: update ms-be12 entries in dhcp, site, clean up other ms-be
entries
..
update ms-be12 entries in dhcp, site, clean up other ms-be entries
Change-Id: I0b736f0d15d6045a8cdafb8bca3ee5196c9f1527
---
M files/dhcpd/linux-host-entries.ttyS1-115200
M manifests/site.pp
2 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/51128/1
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200
b/files/dhcpd/linux-host-entries.ttyS1-115200
index 811178a..87329ef 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1511,7 +1511,7 @@
}
host ms-be12 {
- hardware ethernet 04:7D:7B:2E:2E:7A;
+ hardware ethernet 90:B1:1C:18:AA:93;
fixed-address ms-be12.pmtpa.wmnet;
}
diff --git a/manifests/site.pp b/manifests/site.pp
index c23c237..f90a5ac 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1506,7 +1506,7 @@
node /^ms-be(3|[5-8]|10)\.pmtpa\.wmnet$/ {
# the ms-be hosts that are 720xds with ssds have two more disks
- # but they show up as m and n, those get the OS
+ # but with the h310s they show up as m and n, those get the OS
$all_drives = [ '/dev/sda', '/dev/sdb', '/dev/sdc', '/dev/sdd',
'/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh', '/dev/sdi',
'/dev/sdj',
'/dev/sdk', '/dev/sdl' ]
@@ -1521,8 +1521,9 @@
swift::mount_filesystem{ '/dev/sdn3': }
}
-node /^ms-be11\.pmtpa\.wmnet$/ {
+node /^ms-be(11|12)\.pmtpa\.wmnet$/ {
# the ms-be hosts with ssds have two more disks
+ # this is the 720xds with h710 layout
$all_drives = [ '/dev/sdc', '/dev/sdd', '/dev/sde',
'/dev/sdf', '/dev/sdg', '/dev/sdh', '/dev/sdi', '/dev/sdj',
'/dev/sdk',
'/dev/sdl', '/dev/sdm', '/dev/sdn' ]
@@ -1537,8 +1538,9 @@
swift::mount_filesystem{ '/dev/sdb3': }
}
-node /^ms-be1([1-2]|[4-9])\.pmtpa\.wmnet$/ {
+node /^ms-be(1|2|4|9)\.pmtpa\.wmnet$/ {
# the ms-be hosts with ssds have two more disks
+ # these are the c2100s, to be gone soon
$all_drives = [ '/dev/sdc', '/dev/sdd', '/dev/sde',
'/dev/sdf', '/dev/sdg', '/dev/sdh', '/dev/sdi', '/dev/sdj',
'/dev/sdk',
'/dev/sdl', '/dev/sdm', '/dev/sdn' ]
--
To view, visit https://gerrit.wikimedia.org/r/51128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b736f0d15d6045a8cdafb8bca3ee5196c9f1527
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...CodeReview)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/51129 Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: I19e93cb4c4d3181b7167a486dbd7e6d92b0aaf91 --- M CodeReview.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeReview refs/changes/29/51129/1 diff --git a/CodeReview.php b/CodeReview.php index 2037215..91fc04f 100644 --- a/CodeReview.php +++ b/CodeReview.php @@ -168,18 +168,18 @@ // Leave this off by default until it works right $wgCodeReviewENotif = false; -// Set this to an e-mail list to send all comments to +// Set this to an email list to send all comments to $wgCodeReviewCommentWatcherEmail = false; -// Name to use in the To: header of e-mails to the list. Ignored if $wgCodeReviewCommentWatcherEmail isn't set +// Name to use in the To: header of emails to the list. Ignored if $wgCodeReviewCommentWatcherEmail isn't set $wgCodeReviewCommentWatcherName = CodeReview comments list; // Set this flag to true if you want to disable the automatic notifications to all // watchers of a specific revision, when a follow-up to that revision is committed. -// Useful for small repos when everyone is reading the commit e-mails anyway, +// Useful for small repos when everyone is reading the commit emails anyway, // or if you have multiple repositories which refer to one another, which result // in an unreasonable level of false positives. // Note that the new revision will still be marked as a follow-up - this setting -// just stops the e-mail being sent. +// just stops the email being sent. $wgCodeReviewDisableFollowUpNotification = false; // What images can be used for client-side side-by-side comparisons? -- To view, visit https://gerrit.wikimedia.org/r/51129 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I19e93cb4c4d3181b7167a486dbd7e6d92b0aaf91 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeReview Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...CommunityHiring)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/51130 Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: Idfb53f4cd05a81ba9f9735b4922e310c071b7f57 --- M CommunityHiring.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommunityHiring refs/changes/30/51130/1 diff --git a/CommunityHiring.i18n.php b/CommunityHiring.i18n.php index 303d490..cc80283 100644 --- a/CommunityHiring.i18n.php +++ b/CommunityHiring.i18n.php @@ -12,7 +12,7 @@ 'communityhiring-address-postal' = 'Postal Code: (Optional)', 'communityhiring-address-country' = 'Country:', 'communityhiring-phone' = 'Phone: (Optional)', - 'communityhiring-email' = 'E-mail:', + 'communityhiring-email' = 'Email address:', 'communityhiring-paragraphs' = 'Wikimedia', 'communityhiring-paragraphs-intro' = 'Please answer the next questions with a single, well thought out paragraph.', 'communityhiring-significance' = 'Tell us how you see the significance of Wikimedia communities in the world.', -- To view, visit https://gerrit.wikimedia.org/r/51130 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idfb53f4cd05a81ba9f9735b4922e310c071b7f57 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CommunityHiring Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...Configure)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51131
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Id97cc19152d8f82e2c1e7525de00be519bb1b599
---
M Configure.i18n.php
M settings/Settings.i18n.php
2 files changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Configure
refs/changes/31/51131/1
diff --git a/Configure.i18n.php b/Configure.i18n.php
index d097be4..f1ece8e 100644
--- a/Configure.i18n.php
+++ b/Configure.i18n.php
@@ -81,8 +81,8 @@
'configure-section-mysql' = 'MySQL specific',
'configure-section-postgres' = 'PostgreSQL specific',
'configure-section-sqlite'= 'SQLite specific',
- 'configure-section-email' = 'E-mail',
- 'configure-section-enotif'= 'E-mail notification',
+ 'configure-section-email' = 'Email',
+ 'configure-section-enotif'= 'Email notification',
'configure-section-localization' = 'Localisation',
'configure-section-timezone' = 'Time zone',
'configure-section-html' = 'HTML',
@@ -190,7 +190,7 @@
'configure-condition-requirement' = 'Requirement',
'configure-condition-name-1' = 'Minimal edit count',
'configure-condition-name-2' = 'Minimal age',
- 'configure-condition-name-3' = 'E-mail confirmed',
+ 'configure-condition-name-3' = 'Email confirmed',
'configure-condition-name-4' = 'In groups',
'configure-condition-name-5' = 'User\'s IP address',
'configure-condition-name-6' = 'User\'s IP address in CIDR
range',
@@ -199,7 +199,7 @@
'configure-condition-description-1' = 'Minimum edit count of $1',
'configure-condition-description-2' = 'Minimum account age of $1
{{PLURAL:$1|second|seconds}}',
- 'configure-condition-description-3' = 'E-mail confirmed',
+ 'configure-condition-description-3' = 'Email confirmed',
'configure-condition-description-4' = 'In all of the groups $1',
'configure-condition-description-5' = 'User\'s IP address is $1',
'configure-condition-description-6' = 'User\'s IP address in $1
range',
diff --git a/settings/Settings.i18n.php b/settings/Settings.i18n.php
index a6e9800..9a99f39 100644
--- a/settings/Settings.i18n.php
+++ b/settings/Settings.i18n.php
@@ -183,8 +183,8 @@
'configure-setting-wgAutoblockExpiry' = 'Number of seconds before
autoblock entries expire',
'configure-setting-wgDeleteRevisionsLimit' = Integer of how many
revisions a page must have before the ''bigdelete'' right is required to delete
it,
'configure-setting-wgDisabledActions' = 'Disabled page actions',
- 'configure-setting-wgNewPasswordExpiry' = 'The time, in seconds, when
an e-mailed temporary password expires',
- 'configure-setting-wgEmailConfirmToEdit' = 'Require users to confirm
e-mail address before they can edit',
+ 'configure-setting-wgNewPasswordExpiry' = 'The time, in seconds, when
an emailed temporary password expires',
+ 'configure-setting-wgEmailConfirmToEdit' = 'Require users to confirm
email address before they can edit',
'configure-setting-wgEnableAPI' = 'Enable API',
'configure-setting-wgEnableWriteAPI' = 'Enable Write API',
'configure-setting-wgImplicitGroups' = 'Groups which are not shown on
[[Special:ListUsers]] et al',
@@ -196,18 +196,18 @@
'configure-setting-wgSpamRegex' = 'Spam filter regular expressions',
'configure-setting-wgSummarySpamRegex' = 'Spam filter regular
expressions for edit summaries',
'configure-setting-wgWhitelistRead' = 'Pages anonymous user may see',
- 'configure-setting-wgEmailAuthentication' = 'Require authentication of
e-mail addresses for e-mail functions',
- 'configure-setting-wgEmergencyContact' = 'Site administrator e-mail
address',
- 'configure-setting-wgEnableEmail' = 'Enable e-mail features',
- 'configure-setting-wgEnableUserEmail' = 'Enable user-to-user e-mail',
- 'configure-setting-wgNoReplyAddress' = 'Dummy address which should be
accepted during e-mail send action',
- 'configure-setting-wgPasswordSender' = 'Password reminder e-mail
address',
+ 'configure-setting-wgEmailAuthentication' = 'Require authentication of
email addresses for email functions',
+ 'configure-setting-wgEmergencyContact' = 'Site administrator email
address',
+ 'configure-setting-wgEnableEmail' = 'Enable emailfeatures',
+ 'configure-setting-wgEnableUserEmail' = 'Enable user-to-user email',
+ 'configure-setting-wgNoReplyAddress' = 'Dummy address which should be
accepted during email send action',
+
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ConfirmAccount)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51132
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Ia2e037bb84566149dde0e1edd18fe6ccfc8b152d
---
M backend/ConfirmAccount.class.php
M backend/UserAccountRequest.php
M frontend/language/ConfirmAccount.i18n.php
M frontend/language/ConfirmAccountPage.i18n.php
M frontend/language/RequestAccountPage.i18n.php
M frontend/language/UserCredentialsPage.i18n.php
M frontend/specialpages/actions/RequestAccount_body.php
7 files changed, 25 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmAccount
refs/changes/32/51132/1
diff --git a/backend/ConfirmAccount.class.php b/backend/ConfirmAccount.class.php
index 208708e..70b3149 100644
--- a/backend/ConfirmAccount.class.php
+++ b/backend/ConfirmAccount.class.php
@@ -64,7 +64,7 @@
}
/**
-* Generate and store a new e-mail confirmation token, and return
+* Generate and store a new email confirmation token, and return
* the URL the user can use to confirm.
* @param string $token
* @return string
@@ -78,7 +78,7 @@
}
/**
-* Generate, store, and return a new e-mail confirmation code.
+* Generate, store, and return a new email confirmation code.
* A hash (unsalted since it's used as a key) is stored.
* @param User $user
* @param string $expiration
@@ -94,7 +94,7 @@
}
/**
-* Generate a new e-mail confirmation token and send a confirmation
+* Generate a new email confirmation token and send a confirmation
* mail to the user's given address.
*
* @param User $user
diff --git a/backend/UserAccountRequest.php b/backend/UserAccountRequest.php
index 592fae3..8e07270 100644
--- a/backend/UserAccountRequest.php
+++ b/backend/UserAccountRequest.php
@@ -431,7 +431,7 @@
}
/**
-* Try to acquire a e-mail address in the request queue for insertion
+* Try to acquire an email address in the request queue for insertion
* @return bool
*/
public static function acquireEmail( $email ) {
diff --git a/frontend/language/ConfirmAccount.i18n.php
b/frontend/language/ConfirmAccount.i18n.php
index 8f7337e..e822ce4 100644
--- a/frontend/language/ConfirmAccount.i18n.php
+++ b/frontend/language/ConfirmAccount.i18n.php
@@ -10,7 +10,7 @@
$messages['en'] = array(
# Site message for admins
- 'confirmaccount-newrequests' = '\'\'\'$1\'\'\' open e-mail confirmed
[[Special:ConfirmAccounts|account {{PLURAL:$1|request is pending|requests are
pending}}]]. \'\'\'Your attention is needed!\'\'\'',
+ 'confirmaccount-newrequests' = '\'\'\'$1\'\'\' open email confirmed
[[Special:ConfirmAccounts|account {{PLURAL:$1|request is pending|requests are
pending}}]]. \'\'\'Your attention is needed!\'\'\'',
# Add to Special:Login
'requestaccount-loginnotice' = 'To obtain a user account, you must
\'\'\'[[Special:RequestAccount|request one]]\'\'\'.',
diff --git a/frontend/language/ConfirmAccountPage.i18n.php
b/frontend/language/ConfirmAccountPage.i18n.php
index 2214249..18bb940 100644
--- a/frontend/language/ConfirmAccountPage.i18n.php
+++ b/frontend/language/ConfirmAccountPage.i18n.php
@@ -39,7 +39,7 @@
'confirmaccount-none-r' = 'There are currently no recently rejected
account requests in this list.',
'confirmaccount-none-e' = 'There are currently no expired account
requests in this list.',
'confirmaccount-real-q' = 'Name',
- 'confirmaccount-email-q' = 'E-mail',
+ 'confirmaccount-email-q' = 'Email',
'confirmaccount-bio-q'= 'Biography',
'confirmaccount-showopen' = 'open requests',
'confirmaccount-showrej' = 'rejected requests',
@@ -65,7 +65,7 @@
'confirmaccount-leg-ip' = 'IP address data',
'confirmaccount-name' = 'Username',
'confirmaccount-real' = 'Name:',
- 'confirmaccount-email'= 'E-mail:',
+ 'confirmaccount-email'= 'Email:',
'confirmaccount-reqtype' = 'Position:',
'confirmaccount-pos-0'= 'author',
'confirmaccount-pos-1'= 'editor',
@@ -85,8 +85,8 @@
'confirmaccount-create' = 'Accept (create account)',
'confirmaccount-deny' = 'Reject (delist)',
'confirmaccount-hold' = 'Hold',
- 'confirmaccount-spam' = 'Spam (do not send e-mail)',
- 'confirmaccount-reason' = 'Comment (will be included in e-mail):',
+ 'confirmaccount-spam' = 'Spam (do not send email)',
+ 'confirmaccount-reason' = 'Comment (will be included in email):',
'confirmaccount-ip' = 'IP address:',
'confirmaccount-xff' = 'X-Forwarded-For:',
'confirmaccount-agent'=
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ConfirmEdit)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/51133 Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: Ic9071861e050309523e0f143b18c815d7c136554 --- M ConfirmEdit.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit refs/changes/33/51133/1 diff --git a/ConfirmEdit.php b/ConfirmEdit.php index 87a48e0..1abd5ae 100644 --- a/ConfirmEdit.php +++ b/ConfirmEdit.php @@ -140,7 +140,7 @@ $wgCaptchaBadLoginExpiration = 5 * 60; /** - * Allow users who have confirmed their e-mail addresses to post + * Allow users who have confirmed their email addresses to post * URL links without being harassed by the captcha. */ $ceAllowConfirmedEmail = false; -- To view, visit https://gerrit.wikimedia.org/r/51133 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9071861e050309523e0f143b18c815d7c136554 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ConfirmEdit Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ContactPage)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/51134 Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: Id7868cc91c0ca1929500b4c1cfeec62281ab2bb0 --- M ContactPage.i18n.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContactPage refs/changes/34/51134/1 diff --git a/ContactPage.i18n.php b/ContactPage.i18n.php index 8022a6a..653b3bb 100644 --- a/ContactPage.i18n.php +++ b/ContactPage.i18n.php @@ -19,16 +19,16 @@ 'contactpage-desc' = '[[Special:Contact|Contact form for visitors]]', 'contactpage-title' = 'Contact', 'contactpage-pagetext' = 'Please use the form below to contact us.', - 'contactpage-legend' = 'Send e-mail', + 'contactpage-legend' = 'Send email', 'contactpage-defsubject' = 'Contact message', 'contactpage-subject-and-sender' = '$1 (from $2)', 'contactpage-subject-and-sender-withip' = '$1 (from $2 at $3)', 'contactpage-fromname' = 'Your name: *', - 'contactpage-fromaddress' = 'Your e-mail: **', + 'contactpage-fromaddress' = 'Your email address: **', 'contactpage-formfootnotes' = '* optionalbr / ** optional but needed if you want an answer', 'contactpage-fromname-required' = 'Your name:', - 'contactpage-fromaddress-required' = 'Your e-mail:', + 'contactpage-fromaddress-required' = 'Your -mail address:', 'contactpage-formfootnotes-required' = 'All fields are required.', 'contactpage-captcha' = 'To send the message, please solve the captcha ([[Special:Captcha/help|more info]])', 'contactpage-captcha-failed' = 'Captcha test failed! ([[Special:Captcha/help|more info]])', -- To view, visit https://gerrit.wikimedia.org/r/51134 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id7868cc91c0ca1929500b4c1cfeec62281ab2bb0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContactPage Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ContactPageFundraiser)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/51135 Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: Ifaedb5c515f8ac78f38d655b0d849b3f428b6d98 --- M ContactPage.i18n.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContactPageFundraiser refs/changes/35/51135/1 diff --git a/ContactPage.i18n.php b/ContactPage.i18n.php index 647303c..06664f6 100644 --- a/ContactPage.i18n.php +++ b/ContactPage.i18n.php @@ -20,11 +20,11 @@ 'contactpage-defsubject' = 'Contact Message', 'contactpage-subject-and-sender' = '$1 (from $2)', 'contactpage-fromname' = 'your name *', - 'contactpage-fromaddress' = 'your e-mail **', + 'contactpage-fromaddress' = 'your email address **', 'contactpage-formfootnotes' = '* optionalbr / ** optional but needed if you want an answer', 'contactpage-fromname-required' = 'your name', - 'contactpage-fromaddress-required' = 'your e-mail', + 'contactpage-fromaddress-required' = 'your email address', 'contactpage-formfootnotes-required' = 'All fields are required.', 'contactpage-captcha' = 'To send the message, please solve the captcha ([[Special:Captcha/help|more info]])', 'contactpage-captcha-failed' = 'Captcha test failed! ([[Special:Captcha/help|more info]])', -- To view, visit https://gerrit.wikimedia.org/r/51135 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifaedb5c515f8ac78f38d655b0d849b3f428b6d98 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContactPageFundraiser Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...Contest)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51136
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I58ea728947227b6ff82c6aa8806484077a685f56
---
M Contest.i18n.php
1 file changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Contest
refs/changes/36/51136/1
diff --git a/Contest.i18n.php b/Contest.i18n.php
index f3a3ef8..3e5f85a 100644
--- a/Contest.i18n.php
+++ b/Contest.i18n.php
@@ -103,8 +103,8 @@
'contest-edit-opportunities' = 'Opportunities page',
'contest-edit-rulespage' = 'Rules page',
'contest-edit-help' = 'Help page',
- 'contest-edit-signup' = 'Signup e-mail page',
- 'contest-edit-reminder' = 'Reminder e-mail page',
+ 'contest-edit-signup' = 'Signup email page',
+ 'contest-edit-reminder' = 'Reminder email page',
'contest-edit-end' = 'Contest end',
'contest-edit-exists-already' = 'You are editing an existing contest.',
'contest-edit-submit' = 'Submit',
@@ -132,9 +132,9 @@
'contest-signup-unknown' = 'There is no contest with the provided
name.',
'contest-signup-submit' = 'Sign up',
'contest-signup-header' = 'Please fill out the form to complete your
registration for $1.',
- 'contest-signup-email' = 'Your e-mail address',
+ 'contest-signup-email' = 'Your email address',
'contest-signup-realname' = 'Your real name',
- 'contest-signup-volunteer' = 'I am interested in receiving e-mail
about volunteer opportunities',
+ 'contest-signup-volunteer' = 'I am interested in receiving email about
volunteer opportunities',
'contest-signup-wmf' = 'I am interested in being contacted about
working for the Wikimedia Foundation',
'contest-signup-cv' = 'Link to your CV',
'contest-signup-readrules' = 'I confirm that I have read [[$1|the
contest rules]] and agree to them',
@@ -142,11 +142,11 @@
'contest-signup-finished' = 'This contest has ended. Thank you for
your participation!',
'contest-signup-draft' = 'This contest has not yet started. Please be
patient.',
'contest-signup-country' = 'Your country',
- 'contest-signup-emailwarn' = 'Warning: You are changing your accounts
e-mail address, which will require your confirming the new address.',
+ 'contest-signup-emailwarn' = 'Warning: You are changing your accounts
email address, which will require your confirming the new address.',
'contest-signup-require-rules' = 'You must agree to the contest
rules.',
'contest-signup-require-country' = 'You must provide your country of
residence.',
- 'contest-signup-invalid-email' = 'The e-mail address you provided is
not valid.',
+ 'contest-signup-invalid-email' = 'The email address you provided is
not valid.',
'contest-signup-invalid-name' = 'The name you provided is too short.',
'contest-signup-require-challenge' = 'You must select a challenge.',
'contest-signup-invalid-cv' = 'You have entered an invalid URL.',
@@ -162,8 +162,8 @@
'contest-contest-days-left' = '$1, in $2 {{PLURAL:$2|day|days}}',
'contest-contest-contestants' = 'Contestants',
'contest-contest-contestants-text' = 'Click on the entry ID in the
left column to judge an individual entry.',
- 'contest-contest-reminder-mail' = 'Reminder e-mail',
- 'contest-contest-reminder-page' = 'The content for the reminder e-mail
comes from [[$1|this page]].',
+ 'contest-contest-reminder-mail' = 'Reminder email',
+ 'contest-contest-reminder-page' = 'The content for the reminder email
comes from [[$1|this page]].',
'contest-contest-send-reminder' = 'Send reminder',
'contest-contest-go' = 'Go',
'contest-contest-clear' = 'Clear filters',
@@ -180,15 +180,15 @@
'contest-contest-filter-submission' = 'Submission',
// Special:Contest, reminder email JS
- 'contest-contest-reminder-preview' = 'Preview of the reminder e-mail:',
- 'contest-contest-reminder-title' = 'Reminder e-mail',
+ 'contest-contest-reminder-preview' = 'Preview of the reminder email:',
+ 'contest-contest-reminder-title' = 'Reminder email',
'contest-contest-reminder-send' = 'Send reminder',
'contest-contest-reminder-cancel' = 'Cancel',
'contest-contest-reminder-sending' = 'Sending...',
- 'contest-contest-reminder-success' = 'Successfully sent the reminder
e-mail to $1 {{PLURAL:$1|contestant|contestants}}',
+ 'contest-contest-reminder-success' = 'Successfully sent the reminder
email to $1 {{PLURAL:$1|contestant|contestants}}',
'contest-contest-reminder-close' = 'Close',
'contest-contest-reminder-retry' = 'Retry sending',
- 'contest-contest-reminder-failed' = 'Could not send the
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ContributionTracking)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/51137 Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: I65ac9a0c8fee1c6465fdbe7eb0cad1219d80ae79 --- M ApiContributionTracking.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContributionTracking refs/changes/37/51137/1 diff --git a/ApiContributionTracking.php b/ApiContributionTracking.php index 6dd90e4..3bdecca 100644 --- a/ApiContributionTracking.php +++ b/ApiContributionTracking.php @@ -161,7 +161,7 @@ 'utm_campaign' = 'String identifying utm_campaign', 'utm_key' = 'String identifying utm_key', 'payments_form' = 'String identifying the form on the payments cluster through which the donation was made', - 'email-opt' = 'Boolean assumed to be from a checkbox. This is actually the inverse of the E-mail opt-out checkbox.', + 'email-opt' = 'Boolean assumed to be from a checkbox. This is actually the inverse of the email opt-out checkbox.', 'language' = array( 'User language code. Messages will be translated appropriately (where possible).', 'This will also determine what Thank You page the user sees upon completion of a donation at the gateway.' ), -- To view, visit https://gerrit.wikimedia.org/r/51137 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65ac9a0c8fee1c6465fdbe7eb0cad1219d80ae79 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContributionTracking Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (wikimedia...DonationEmailUnsubscribe)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/51138 Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: Icfb8b252c5cee0ccd7ce716c9cff59171ef7a9b0 --- M FundraiserUnsubscribe.i18n.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/DonationEmailUnsubscribe refs/changes/38/51138/1 diff --git a/FundraiserUnsubscribe.i18n.php b/FundraiserUnsubscribe.i18n.php index ea18f25..9fd3f1b 100644 --- a/FundraiserUnsubscribe.i18n.php +++ b/FundraiserUnsubscribe.i18n.php @@ -13,7 +13,7 @@ 'fundraiserunsubscribe' = 'Unsubscribe from Wikimedia Fundraising Email', 'fundraiserunsubscribe-query' = Are you sure you want to unsubscribe '$1'?, - 'fundraiserunsubscribe-info' = 'This will opt you out of e-mails from the Wikimedia Foundation sent to you as a donor. You may still receive e-mails to this e-mail address if it is associated with an account on one of our projects. If you have any questions, please contact [mailto:$1 $1].', + 'fundraiserunsubscribe-info' = 'This will opt you out of emails from the Wikimedia Foundation sent to you as a donor. You may still receive emails to this email address if it is associated with an account on one of our projects. If you have any questions, please contact [mailto:$1 $1].', 'fundraiserunsubscribe-submit' = 'Unsubscribe', 'fundraiserunsubscribe-cancel' = 'Cancel', @@ -33,7 +33,7 @@ 'fundraiserunsubscribe-submit' = 'Label for button which will unsubscribe them from the fundraising email list.', 'fundraiserunsubscribe-cancel' = 'Label for button which will cancel the unsubscribe process and redirect them to the WMF homepage', - 'fundraiserunsubscribe-errormsg' = 'Text to display if the unsubscribe failed. Link to e-mail address:$1 for more support.', + 'fundraiserunsubscribe-errormsg' = 'Text to display if the unsubscribe failed. Link to email address:$1 for more support.', 'fundraiserunsubscribe-success' = 'Message indicating that everything that can be done to unsubscribe them has been done.', 'fundraiserunsubscribe-sucesswarning' = 'Notification to the user that there might be some manual operations or ongoing things that will take time to clear. Will always be shown with fundraiserunsubscribe-success. $1 is an email address for them to contact if they have further questions.', -- To view, visit https://gerrit.wikimedia.org/r/51138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icfb8b252c5cee0ccd7ce716c9cff59171ef7a9b0 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/DonationEmailUnsubscribe Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...Contest)
Jeroen De Dauw has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I58ea728947227b6ff82c6aa8806484077a685f56
---
M Contest.i18n.php
1 file changed, 13 insertions(+), 13 deletions(-)
Approvals:
Jeroen De Dauw: Verified; Looks good to me, approved
diff --git a/Contest.i18n.php b/Contest.i18n.php
index f3a3ef8..3e5f85a 100644
--- a/Contest.i18n.php
+++ b/Contest.i18n.php
@@ -103,8 +103,8 @@
'contest-edit-opportunities' = 'Opportunities page',
'contest-edit-rulespage' = 'Rules page',
'contest-edit-help' = 'Help page',
- 'contest-edit-signup' = 'Signup e-mail page',
- 'contest-edit-reminder' = 'Reminder e-mail page',
+ 'contest-edit-signup' = 'Signup email page',
+ 'contest-edit-reminder' = 'Reminder email page',
'contest-edit-end' = 'Contest end',
'contest-edit-exists-already' = 'You are editing an existing contest.',
'contest-edit-submit' = 'Submit',
@@ -132,9 +132,9 @@
'contest-signup-unknown' = 'There is no contest with the provided
name.',
'contest-signup-submit' = 'Sign up',
'contest-signup-header' = 'Please fill out the form to complete your
registration for $1.',
- 'contest-signup-email' = 'Your e-mail address',
+ 'contest-signup-email' = 'Your email address',
'contest-signup-realname' = 'Your real name',
- 'contest-signup-volunteer' = 'I am interested in receiving e-mail
about volunteer opportunities',
+ 'contest-signup-volunteer' = 'I am interested in receiving email about
volunteer opportunities',
'contest-signup-wmf' = 'I am interested in being contacted about
working for the Wikimedia Foundation',
'contest-signup-cv' = 'Link to your CV',
'contest-signup-readrules' = 'I confirm that I have read [[$1|the
contest rules]] and agree to them',
@@ -142,11 +142,11 @@
'contest-signup-finished' = 'This contest has ended. Thank you for
your participation!',
'contest-signup-draft' = 'This contest has not yet started. Please be
patient.',
'contest-signup-country' = 'Your country',
- 'contest-signup-emailwarn' = 'Warning: You are changing your accounts
e-mail address, which will require your confirming the new address.',
+ 'contest-signup-emailwarn' = 'Warning: You are changing your accounts
email address, which will require your confirming the new address.',
'contest-signup-require-rules' = 'You must agree to the contest
rules.',
'contest-signup-require-country' = 'You must provide your country of
residence.',
- 'contest-signup-invalid-email' = 'The e-mail address you provided is
not valid.',
+ 'contest-signup-invalid-email' = 'The email address you provided is
not valid.',
'contest-signup-invalid-name' = 'The name you provided is too short.',
'contest-signup-require-challenge' = 'You must select a challenge.',
'contest-signup-invalid-cv' = 'You have entered an invalid URL.',
@@ -162,8 +162,8 @@
'contest-contest-days-left' = '$1, in $2 {{PLURAL:$2|day|days}}',
'contest-contest-contestants' = 'Contestants',
'contest-contest-contestants-text' = 'Click on the entry ID in the
left column to judge an individual entry.',
- 'contest-contest-reminder-mail' = 'Reminder e-mail',
- 'contest-contest-reminder-page' = 'The content for the reminder e-mail
comes from [[$1|this page]].',
+ 'contest-contest-reminder-mail' = 'Reminder email',
+ 'contest-contest-reminder-page' = 'The content for the reminder email
comes from [[$1|this page]].',
'contest-contest-send-reminder' = 'Send reminder',
'contest-contest-go' = 'Go',
'contest-contest-clear' = 'Clear filters',
@@ -180,15 +180,15 @@
'contest-contest-filter-submission' = 'Submission',
// Special:Contest, reminder email JS
- 'contest-contest-reminder-preview' = 'Preview of the reminder e-mail:',
- 'contest-contest-reminder-title' = 'Reminder e-mail',
+ 'contest-contest-reminder-preview' = 'Preview of the reminder email:',
+ 'contest-contest-reminder-title' = 'Reminder email',
'contest-contest-reminder-send' = 'Send reminder',
'contest-contest-reminder-cancel' = 'Cancel',
'contest-contest-reminder-sending' = 'Sending...',
- 'contest-contest-reminder-success' = 'Successfully sent the reminder
e-mail to $1 {{PLURAL:$1|contestant|contestants}}',
+ 'contest-contest-reminder-success' = 'Successfully sent the reminder
email to $1 {{PLURAL:$1|contestant|contestants}}',
'contest-contest-reminder-close' = 'Close',
'contest-contest-reminder-retry' = 'Retry sending',
- 'contest-contest-reminder-failed' = 'Could not send the reminder
{{PLURAL:$1|e-mail|e-mails}}.',
+
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...DonationInterface)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51139
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I6b83393f919ed0c1cd938004693d7f3f62320ceb
---
M extras/recaptcha/recaptcha-php/recaptchalib.php
M gateway_common/interface.i18n.php
M payflowpro_gateway/payflowpro_gateway.i18n.php
3 files changed, 12 insertions(+), 12 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/39/51139/1
diff --git a/extras/recaptcha/recaptcha-php/recaptchalib.php
b/extras/recaptcha/recaptcha-php/recaptchalib.php
index 674ac12..649bd0c 100644
--- a/extras/recaptcha/recaptcha-php/recaptchalib.php
+++ b/extras/recaptcha/recaptcha-php/recaptchalib.php
@@ -373,6 +373,6 @@
$url = recaptcha_mailhide_url ( $pubkey, $privkey, $email );
return htmlentities( $emailparts[0] ) . a href=' . htmlentities (
$url ) .
- ' onclick=\window.open(' . htmlentities ( $url ) . ', '',
'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300');
return false;\ title=\Reveal this e-mail address\.../a@ . htmlentities
( $emailparts [1] );
+ ' onclick=\window.open(' . htmlentities ( $url ) . ', '',
'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300');
return false;\ title=\Reveal this email address\.../a@ . htmlentities (
$emailparts [1] );
}
diff --git a/gateway_common/interface.i18n.php
b/gateway_common/interface.i18n.php
index 499f221..f963ff2 100644
--- a/gateway_common/interface.i18n.php
+++ b/gateway_common/interface.i18n.php
@@ -21,7 +21,7 @@
'donate_interface-submit-button' = 'Donate',
'donate_interface-comment-message' = 'Have a thought to share with the
world? Put up to 200 characters here:',
'donate_interface-comment-label' = 'Comment:',
- 'donate_interface-email-agreement' = I agree to receive occasional
e-mail updates from the Wikimedia Foundation.,
+ 'donate_interface-email-agreement' = I agree to receive occasional
email updates from the Wikimedia Foundation.,
'donate_interface-comment-title' = 'Public comment',
'donate_interface-donation-description' = 'Donation to the Wikimedia
Foundation',
'donate_interface-big-amount-display' = '$100',
@@ -177,14 +177,14 @@
'donate_interface-error-msg-js' = 'Please enter your',
'donate_interface-error-msg-validation' = 'Please correct the errors
in the form.',
'donate_interface-error-msg-invalid-amount' = 'Please enter a valid
amount',
- 'donate_interface-error-msg-email' = 'Please enter a valid e-mail
address',
+ 'donate_interface-error-msg-email' = 'Please enter a valid email
address',
'donate_interface-error-msg-card-num' = 'Please enter a valid credit
card number for one of the accepted credit card types',
'donate_interface-error-msg-amex' = 'Please enter a correct card
number for American Express.',
'donate_interface-error-msg-mc' = 'Please enter a correct card number
for MasterCard.',
'donate_interface-error-msg-visa' = 'Please enter a correct card
number for Visa.',
'donate_interface-error-msg-discover' = 'Please enter a correct card
number for Discover.',
'donate_interface-error-msg-amount' = 'donation amount',
- 'donate_interface-error-msg-emailAdd' = 'e-mail address',
+ 'donate_interface-error-msg-emailAdd' = 'email address',
'donate_interface-error-msg-fname' = 'first name',
'donate_interface-error-msg-lname' = 'last name',
'donate_interface-error-msg-street' = 'street address',
@@ -265,7 +265,7 @@
'donate_interface-billing-code' = 'Billing zip',
'donate_interface-country' = 'Country',
'donate_interface-select-country' = 'Select a country',
- 'donate_interface-confirm-email' = 'Confirm e-mail',
+ 'donate_interface-confirm-email' = 'Confirm email',
'donate_interface-phone' = 'Phone',
'donate_interface-telephone' = 'Telephone',
'donate_interface-telephone-home' = 'Tel. (home)',
@@ -316,7 +316,7 @@
'donate_interface-please-complete' = 'Please complete your donation
below ...',
'donate_interface-description' = 'Description',
'donate_interface-donation' = 'Donation',
- 'donate_interface-email-receipt' = 'E-mail receipt to',
+ 'donate_interface-email-receipt' = 'Email receipt to',
'donate_interface-monthly-donation' = 'Make a monthly donation',
'donate_interface-via-paypal' = '(via PayPal)',
'donate_interface-shirt-size' = 'T-shirt size:',
@@ -401,25 +401,25 @@
// Links to translation improvement
'donate_interface-translate-bluelink' = 'Improve this translation',
'donate_interface-translate-redlink1' = 'Help translate
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...E3Experiments)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51140
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Ica2c7788a70fd8c4753358a99638130bbd481f19
---
M api/ApiAccountCreation.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/E3Experiments
refs/changes/40/51140/1
diff --git a/api/ApiAccountCreation.php b/api/ApiAccountCreation.php
index a6e6363..5b0c60a 100644
--- a/api/ApiAccountCreation.php
+++ b/api/ApiAccountCreation.php
@@ -55,7 +55,7 @@
}
- // e-mail validation
+ // email validation
if ( isset( $params[ 'email' ] ) ) {
$email = $params[ 'email' ];
$valid = User::isValidEmailAddr( $email );
--
To view, visit https://gerrit.wikimedia.org/r/51140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica2c7788a70fd8c4753358a99638130bbd481f19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/E3Experiments
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...Echo)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51141
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I452dd42a007a61d1e45dd81473a2745b86566f93
---
M Echo.i18n.php
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/41/51141/1
diff --git a/Echo.i18n.php b/Echo.i18n.php
index 683ee2a..5bc8f88 100644
--- a/Echo.i18n.php
+++ b/Echo.i18n.php
@@ -14,15 +14,15 @@
// Preferences
'prefs-echo' = 'Notifications',
'prefs-displaynotifications' = 'Display options',
- 'prefs-emailfrequency' = 'When would you like to receive e-mail
notifications?',
+ 'prefs-emailfrequency' = 'When would you like to receive email
notifications?',
'prefs-echosubscriptions' = 'Notify me when someone…',
'echo-pref-web' = 'Web',
- 'echo-pref-email' = 'E-mail',
+ 'echo-pref-email' = 'Email',
'echo-pref-subscription-edit-user-talk' = 'Posts on my talk page',
'echo-pref-subscription-article-linked' = 'Creates a link to a page I
created',
'echo-pref-subscription-reverted' = 'Reverts my edit',
'echo-pref-subscription-mention' = 'Mentions me',
- 'echo-pref-email-frequency-never' = 'Do not send me any e-mail
notifications',
+ 'echo-pref-email-frequency-never' = 'Do not send me any email
notifications',
'echo-pref-email-frequency-immediately' = 'Individual notifications as
they come in',
'echo-pref-email-frequency-daily' = 'A daily summary of notifications',
'echo-pref-email-frequency-weekly' = 'A weekly summary of
notifications',
@@ -109,14 +109,14 @@
$5',
'notification-mention-email-batch-body' = '$1 {{GENDER:$1|mentioned}}
you on $2',
'echo-notification-count' = '$1+',
- // E-mail notification
+ // Email notification
'echo-email-subject-default' = 'New notification at {{SITENAME}}',
'echo-email-body-default' = 'You have a new notification at
{{SITENAME}}:
$1',
'echo-email-footer-default' = '$2
-To control which e-mails we send you, visit:
+To control which emails we send you, visit:
{{canonicalurl:{{#special:Preferences}}#mw-prefsection-echo}}
$1',
@@ -133,7 +133,7 @@
'echo-date-header' = '$1 $2',
'echo-load-more-error' = 'An error occurred while fetching more
results.',
- // E-mail batch
+ // Email batch
'echo-email-batch-separator' =
'', # only translate this
message to other languages if you have to change it
'echo-email-batch-bullet' = '•', # only translate this message to
other languages if you have to change it
'echo-email-batch-subject-daily' = 'You have $1
{{PLURAL:$2|notification|notifications}} today',
--
To view, visit https://gerrit.wikimedia.org/r/51141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I452dd42a007a61d1e45dd81473a2745b86566f93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...EmailCapture)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51142
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Id9358d468d9ed06a6ae4f5d26d6b825cb0950be9
---
M EmailCapture.i18n.php
1 file changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EmailCapture
refs/changes/42/51142/1
diff --git a/EmailCapture.i18n.php b/EmailCapture.i18n.php
index bec9515..d4b11be 100644
--- a/EmailCapture.i18n.php
+++ b/EmailCapture.i18n.php
@@ -12,17 +12,17 @@
* @author Trevor Parscal
*/
$messages['en'] = array(
- 'emailcapture' = 'E-mail verification',
- 'emailcapture-desc' = 'Capture e-mail addresses, and allow users to
verify them through e-mail',
- 'emailcapture-failure' = Your e-mail was '''not''' verified.,
+ 'emailcapture' = 'Email verification',
+ 'emailcapture-desc' = 'Capture email addresses, and allow users to
verify them through email',
+ 'emailcapture-failure' = Your email was '''not''' verified.,
'emailcapture-invalid-code' = 'Invalid confirmation code.',
- 'emailcapture-already-confirmed' = 'Your e-mail address has already
been confirmed.',
- 'emailcapture-response-subject' = '{{SITENAME}} e-mail address
verification',
+ 'emailcapture-already-confirmed' = 'Your email address has already
been confirmed.',
+ 'emailcapture-response-subject' = '{{SITENAME}} email address
verification',
'emailcapture-response-body' = 'Hello!
Thank you for expressing interest in helping to improve {{SITENAME}}.
-Please take a moment to confirm your e-mail by clicking on the link below:
+Please take a moment to confirm your email by clicking on the link below:
$1
You may also visit:
@@ -33,13 +33,13 @@
We’ll be in touch shortly with how you can help improve {{SITENAME}}.
-If you didn’t initiate this request, please ignore this e-mail and we won’t
send you anything else.',
+If you didn’t initiate this request, please ignore this email and we won’t
send you anything else.',
'emailcapture-success' = 'Thank you!
-Your e-mail has been successfully confirmed.',
- 'emailcapture-instructions' = 'To verify your e-mail address, enter
the code that was e-mailed to you and click {{int:emailcapture-submit}}.',
+Your email has been successfully confirmed.',
+ 'emailcapture-instructions' = 'To verify your email address, enter the
code that was emailed to you and click {{int:emailcapture-submit}}.',
'emailcapture-verify' = 'Verification code:',
- 'emailcapture-submit' = 'Verify e-mail address',
+ 'emailcapture-submit' = 'Verify email address',
);
/** Message documentation (Message documentation)
--
To view, visit https://gerrit.wikimedia.org/r/51142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9358d468d9ed06a6ae4f5d26d6b825cb0950be9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EmailCapture
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...GlobalBlocking)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51143
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I40d731998e37ca62de326475ab49c1e1b054c81e
---
M GlobalBlocking.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalBlocking
refs/changes/43/51143/1
diff --git a/GlobalBlocking.i18n.php b/GlobalBlocking.i18n.php
index 7403b31..748d366 100644
--- a/GlobalBlocking.i18n.php
+++ b/GlobalBlocking.i18n.php
@@ -111,7 +111,7 @@
* Expiry of block: $5
You can contact $1 to discuss the block.
-You cannot use the \{{int:emailuser}}\ feature unless a valid e-mail address
is specified in your [[Special:Preferences|account preferences]] and you have
not been blocked from using it.
+You cannot use the \{{int:emailuser}}\ feature unless a valid email address
is specified in your [[Special:Preferences|account preferences]] and you have
not been blocked from using it.
Your current IP address is $6.
Please include all above details in any queries you make.,
'globalblocking-blocked-nopassreset' = You cannot reset user's
passwords because you are blocked globally.,
--
To view, visit https://gerrit.wikimedia.org/r/51143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40d731998e37ca62de326475ab49c1e1b054c81e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...LiquidThreads)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51144
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Ic77eab3ac4050c274c8a999d6d314592163160d2
---
M i18n/Lqt.i18n.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads
refs/changes/44/51144/1
diff --git a/i18n/Lqt.i18n.php b/i18n/Lqt.i18n.php
index e716ab8..f322e0e 100644
--- a/i18n/Lqt.i18n.php
+++ b/i18n/Lqt.i18n.php
@@ -197,14 +197,14 @@
'lqt-log-action-signatureedit' = 'changed the signature of [[$1]] from
$2 to $3',
// Preferences
- 'lqt-preference-notify-talk' = 'E-mail me on replies to a thread I am
watching',
+ 'lqt-preference-notify-talk' = 'Email me on replies to a thread I am
watching',
'lqt-preference-watch-threads' = 'Watch threads that I create or reply
to',
'prefs-lqt' = 'Threaded discussion',
'lqt-preference-display-depth' = 'Maximum reply depth to show:',
'lqt-preference-display-count' = 'Maximum number of replies to show:',
'lqt-preference-custom-signatures' = 'Show custom user signatures',
- // E-mail notification
+ // Email notification
'lqt-enotif-subject-reply' = '{{SITENAME}} discussion - Reply: $1',
'lqt-enotif-subject-newthread' = '{{SITENAME}} discussion - New
thread: $1',
'lqt-enotif-newthread' = Hi $1,
--
To view, visit https://gerrit.wikimedia.org/r/51144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic77eab3ac4050c274c8a999d6d314592163160d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...Listings)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/51145 Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: I7cff10a9fe91352b8cc21c304d1eb8e2844b85d4 --- M Listings.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Listings refs/changes/45/51145/1 diff --git a/Listings.i18n.php b/Listings.i18n.php index c5444de..1019a41 100644 --- a/Listings.i18n.php +++ b/Listings.i18n.php @@ -15,7 +15,7 @@ 'listings-phone-symbol' = '☎', 'listings-fax' = 'fax', 'listings-fax-symbol'= '', - 'listings-email' = 'e-mail', + 'listings-email' = 'email', 'listings-email-symbol' = '', 'listings-tollfree' = 'toll-free', 'listings-tollfree-symbol' = '', -- To view, visit https://gerrit.wikimedia.org/r/51145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7cff10a9fe91352b8cc21c304d1eb8e2844b85d4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Listings Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...MobileFrontend)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/51146 Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: Ifeb7fc14bbde946ca39a32cdc6b4e718dee1cf7c --- M MobileFrontend.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/46/51146/1 diff --git a/MobileFrontend.i18n.php b/MobileFrontend.i18n.php index e3b4c8b..f8d253e 100644 --- a/MobileFrontend.i18n.php +++ b/MobileFrontend.i18n.php @@ -115,7 +115,7 @@ // account creation 'mobile-frontend-account-create-submit' = 'Sign up', 'mobile-frontend-password-confirm-placeholder' = 'Confirm password', - 'mobile-frontend-account-create-email-placeholder' = 'E-mail address (optional)', + 'mobile-frontend-account-create-email-placeholder' = 'Email address (optional)', 'mobile-frontend-account-create-captcha-placeholder' = 'Enter security text', // Search 'mobile-frontend-overlay-escape' = 'Go back', -- To view, visit https://gerrit.wikimedia.org/r/51146 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifeb7fc14bbde946ca39a32cdc6b4e718dee1cf7c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...MoodBar)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51147
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I217671768d4f77694a9d4dbceb7ce6101f1a6f2b
---
M MoodBar.i18n.php
M include/MoodBarHTMLEmailNotification.php
2 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MoodBar
refs/changes/47/51147/1
diff --git a/MoodBar.i18n.php b/MoodBar.i18n.php
index e0e1691..d3e1a97 100644
--- a/MoodBar.i18n.php
+++ b/MoodBar.i18n.php
@@ -70,14 +70,14 @@
'moodbar-ratelimited-subtitle' = 'You have exceeded moodbar rate
limit. Please wait some time and try again',
'moodbar-abuse-title' = 'Oops!',
'moodbar-abuse-subtitle' = 'Your feedback violates moodbar rules.',
- 'moodbar-email-title' = 'Add e-mail',
- 'moodbar-email-input' = 'Your e-mail address',
- 'moodbar-email-desc' = 'We will send you an e-mail if someone responds
to your feedback.',
+ 'moodbar-email-title' = 'Add email',
+ 'moodbar-email-input' = 'Your email address',
+ 'moodbar-email-desc' = 'We will send you an email if someone responds
to your feedback.',
'moodbar-email-submit' = 'Submit',
'moodbar-updating-title' = 'Updating...',
- 'moodbar-updating-subtitle' = 'We are updating your e-mail settings.',
- 'moodbar-email-confirm-title' = 'Confirm e-mail',
- 'moodbar-email-confirm-desc' = 'You must confirm your e-mail address
in order to receive notifications. To resend the confirmation e-mail, click
Resend Confirmation.',
+ 'moodbar-updating-subtitle' = 'We are updating your email settings.',
+ 'moodbar-email-confirm-title' = 'Confirm email',
+ 'moodbar-email-confirm-desc' = 'You must confirm your email address in
order to receive notifications. To resend the confirmation email, click Resend
Confirmation.',
'moodbar-email-resend-confirmation' = 'Resend confirmation',
'moodbar-email-optout' = 'No thanks',
// MoodBar Tooltip
diff --git a/include/MoodBarHTMLEmailNotification.php
b/include/MoodBarHTMLEmailNotification.php
index 9f4d466..984a7d7 100644
--- a/include/MoodBarHTMLEmailNotification.php
+++ b/include/MoodBarHTMLEmailNotification.php
@@ -138,7 +138,7 @@
}
/**
-* Generate the generic this page has been changed e-mail text.
+* Generate the generic this page has been changed email text.
*/
protected function composeCommonMailtext() {
global $wgPasswordSender, $wgPasswordSenderName,
$wgNoReplyAddress;
--
To view, visit https://gerrit.wikimedia.org/r/51147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I217671768d4f77694a9d4dbceb7ce6101f1a6f2b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MoodBar
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...PageTriage)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51148
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I03b1a91d84b3d104ef6f214a577658d5bbda91d8
---
M PageTriage.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage
refs/changes/48/51148/1
diff --git a/PageTriage.i18n.php b/PageTriage.i18n.php
index b16c8b7..f697bf2 100644
--- a/PageTriage.i18n.php
+++ b/PageTriage.i18n.php
@@ -974,7 +974,7 @@
* {{msg-mw|Pagetriage-notification-mark-as-reviewed-flyout}}
* {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-subject2}}
* {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-body2}},
- 'echo-email-batch-category-header-page-review' = 'E-mail batch section
title for page review. Parameters:
+ 'echo-email-batch-category-header-page-review' = 'Email batch section
title for page review. Parameters:
* $1 is the numeric count',
);
--
To view, visit https://gerrit.wikimedia.org/r/51148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I03b1a91d84b3d104ef6f214a577658d5bbda91d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...SemanticMediaWiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/51149 Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: Ic555d397f701b3ad08a29b9ea94bc1a1597e2717 --- M languages/SMW_LanguageEn.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki refs/changes/49/51149/1 diff --git a/languages/SMW_LanguageEn.php b/languages/SMW_LanguageEn.php index 8e08df5..af1cbdd 100644 --- a/languages/SMW_LanguageEn.php +++ b/languages/SMW_LanguageEn.php @@ -49,7 +49,7 @@ 'Enumeration' = '_txt', 'String' = '_txt', 'Phone number' = '_tel', - 'E-mail' = '_ema', + 'E-mail' = '_ema', // @todo FIXME: Change this to Email. See bug 45461. 'Geographic coordinate' = '_geo', 'Geographic polygon'= '_gpo', ); -- To view, visit https://gerrit.wikimedia.org/r/51149 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic555d397f701b3ad08a29b9ea94bc1a1597e2717 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticMediaWiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...SpamBlacklist)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51150
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Ibad4c4c7c98f5b0c746d62f1b2b41a4a99360ee8
---
M EmailBlacklist.php
M SpamBlacklist.i18n.php
M SpamBlacklistHooks.php
3 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpamBlacklist
refs/changes/50/51150/1
diff --git a/EmailBlacklist.php b/EmailBlacklist.php
index 8eb49af..9266b2e 100644
--- a/EmailBlacklist.php
+++ b/EmailBlacklist.php
@@ -15,7 +15,7 @@
}
/**
-* Checks a User object for a blacklisted e-mail address
+* Checks a User object for a blacklisted email address
*
* @param User $user
* @return bool True on valid email
@@ -32,9 +32,9 @@
return true;
}
- // Check for whitelisted e-mail addresses
+ // Check for whitelisted email addresses
if ( is_array( $whitelists ) ) {
- wfDebugLog( 'SpamBlacklist', Excluding whitelisted
e-mail addresses from . count( $whitelists ) .
+ wfDebugLog( 'SpamBlacklist', Excluding whitelisted
email addresses from . count( $whitelists ) .
regexes: . implode( ', ', $whitelists ) .
\n );
foreach ( $whitelists as $regex ) {
if ( preg_match( $regex, $email ) ) {
diff --git a/SpamBlacklist.i18n.php b/SpamBlacklist.i18n.php
index 7dd66a3..b0930b9 100644
--- a/SpamBlacklist.i18n.php
+++ b/SpamBlacklist.i18n.php
@@ -29,13 +29,13 @@
#/pre !-- leave this line exactly as it is --',
'email-blacklist' = ' #!-- leave this line exactly as it is -- pre
-# E-mail addresses matching this list will be blocked from registering or
sending e-mails
+# Email addresses matching this list will be blocked from registering or
sending emails
# This list affects only this wiki; refer also to the global blacklist.
# For documentation see https://www.mediawiki.org/wiki/Extension:SpamBlacklist
#
# Syntax is as follows:
# * Everything from a # character to the end of the line is a comment
-# * Every non-blank line is a regex fragment which will only match hosts
inside e-mail addresses
+# * Every non-blank line is a regex fragment which will only match hosts
inside email addresses
#/pre !-- leave this line exactly as it is --',
'email-whitelist' = ' #!-- leave this line exactly as it is -- pre
@@ -44,13 +44,13 @@
#
# Syntax is as follows:
# * Everything from a # character to the end of the line is a comment
-# * Every non-blank line is a regex fragment which will only match hosts
inside e-mail addresses
+# * Every non-blank line is a regex fragment which will only match hosts
inside email addresses
#/pre !-- leave this line exactly as it is --',
- 'spam-blacklisted-email' = 'Blacklisted e-mail address',
- 'spam-blacklisted-email-text' = 'Your e-mail address is currently
blacklisted from sending e-mails to other users.',
- 'spam-blacklisted-email-signup' = 'The given e-mail address is
currently blacklisted from use.',
+ 'spam-blacklisted-email' = 'Blacklisted email address',
+ 'spam-blacklisted-email-text' = 'Your email address is currently
blacklisted from sending emails to other users.',
+ 'spam-blacklisted-email-signup' = 'The given email address is
currently blacklisted from use.',
'spam-invalid-lines' = The following spam blacklist {{PLURAL:$1|line
is an|lines are}} invalid regular {{PLURAL:$1|expression|expressions}} and
{{PLURAL:$1|needs|need}} to be corrected before saving the page:,
'spam-blacklist-desc' = 'Regex-based anti-spam tool:
[[MediaWiki:Spam-blacklist]] and [[MediaWiki:Spam-whitelist]]',
diff --git a/SpamBlacklistHooks.php b/SpamBlacklistHooks.php
index 5597ab2..530df16 100644
--- a/SpamBlacklistHooks.php
+++ b/SpamBlacklistHooks.php
@@ -70,7 +70,7 @@
}
/**
-* Processes new accounts for valid e-mail addresses
+* Processes new accounts for valid email addresses
*
* @param $user User
* @param $abortError
--
To view, visit https://gerrit.wikimedia.org/r/51150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibad4c4c7c98f5b0c746d62f1b2b41a4a99360ee8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ThrottleOverride)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/51151 Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: I3c42e4b7592b000619a4f9f15786e81a2f13b050 --- M ThrottleOverride.i18n.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ThrottleOverride refs/changes/51/51151/1 diff --git a/ThrottleOverride.i18n.php b/ThrottleOverride.i18n.php index 22fc514..978db38 100644 --- a/ThrottleOverride.i18n.php +++ b/ThrottleOverride.i18n.php @@ -26,8 +26,8 @@ 'throttleoverride-types-actcreate' = 'Account creation', 'throttleoverride-types-edit' = 'Page edits', 'throttleoverride-types-move' = 'Page moves', - 'throttleoverride-types-mailpassword' = 'Password recovery e-mails', - 'throttleoverride-types-emailuser' = 'User e-mails' + 'throttleoverride-types-mailpassword' = 'Password recovery emails', + 'throttleoverride-types-emailuser' = 'User emails' ); /** Message documentation (Message documentation) -- To view, visit https://gerrit.wikimedia.org/r/51151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c42e4b7592b000619a4f9f15786e81a2f13b050 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ThrottleOverride Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Explicitely redefine thumbnail sizes for frwiki - change (operations/mediawiki-config)
Jérémie Roquet has uploaded a new change for review. https://gerrit.wikimedia.org/r/51152 Change subject: Explicitely redefine thumbnail sizes for frwiki .. Explicitely redefine thumbnail sizes for frwiki That way, sizes are sorted by increasing values. This also fixes the default thumbnail size that had been changed from 220px to 180px as an unwanted side effect. Change-Id: I7526cb2a252ff762d062b9463a3d8238f548ce33 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/52/51152/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5517b41..2e56bff 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10107,7 +10107,7 @@ 'wgThumbLimits' = array( 'default' = array( 120, 150, 180, 200, 220, 250, 300 ), - '+frwiki' = array( 460, 620 ), + 'frwiki' = array( 120, 150, 180, 200, 220, 250, 300, 460, 620 ), '+itwikiquote' = array( 360 ), 'svwiki' = array( 120, 200, 250, 300, 360 ), ), -- To view, visit https://gerrit.wikimedia.org/r/51152 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7526cb2a252ff762d062b9463a3d8238f548ce33 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jérémie Roquet jroq...@arkanosis.net ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added to SetupTest and moved mock service object implementio... - change (mediawiki...Wikibase)
John Erling Blad has submitted this change and it was merged.
Change subject: Added to SetupTest and moved mock service object implementions
to non-test code
..
Added to SetupTest and moved mock service object implementions to non-test code
Change-Id: I88a96b633aa29d0b7e4d6fe5fa2ecd472fad28a6
---
M repo/config/Wikibase.experimental.php
A repo/includes/Database/ObservableQueryInterface.php
M repo/includes/MessageReporter.php
M repo/tests/phpunit/includes/Database/TableBuilderTest.php
M repo/tests/phpunit/includes/Query/SQLStore/SetupTest.php
5 files changed, 147 insertions(+), 54 deletions(-)
Approvals:
John Erling Blad: Verified; Looks good to me, approved
diff --git a/repo/config/Wikibase.experimental.php
b/repo/config/Wikibase.experimental.php
index aac93cd..57193a5 100644
--- a/repo/config/Wikibase.experimental.php
+++ b/repo/config/Wikibase.experimental.php
@@ -49,6 +49,7 @@
$classes = array(
'Wikibase\Repo\Database\FieldDefinition',
'Wikibase\Repo\Database\MediaWikiQueryInterface',
+ 'Wikibase\Repo\Database\ObservableQueryInterface',
'Wikibase\Repo\Database\QueryInterface',
'Wikibase\Repo\Database\TableBuilder',
'Wikibase\Repo\Database\TableDefinition',
@@ -74,6 +75,7 @@
if ( !class_exists( 'MessageReporter' ) ) {
$wgAutoloadClasses['MessageReporter'] = $dir .
'includes/MessageReporter.php';
$wgAutoloadClasses['ObservableMessageReporter'] = $dir .
'includes/MessageReporter.php';
+ $wgAutoloadClasses['NullMessageReporter'] = $dir .
'includes/MessageReporter.php';
}
if ( defined( 'MW_PHPUNIT_TEST' ) ) {
diff --git a/repo/includes/Database/ObservableQueryInterface.php
b/repo/includes/Database/ObservableQueryInterface.php
new file mode 100644
index 000..c4b9b56
--- /dev/null
+++ b/repo/includes/Database/ObservableQueryInterface.php
@@ -0,0 +1,66 @@
+?php
+
+namespace Wikibase\Repo\Database;
+
+use Wikibase\Repo\Database\QueryInterface;
+
+/**
+ * Mock implementation of the QueryInterface interface that allows
+ * tests to assert that certain methods where called.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @since wd.db
+ *
+ * @file
+ * @ingroup WikibaseRepo
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw jeroended...@gmail.com
+ */
+class ObservableQueryInterface implements QueryInterface {
+
+ /**
+* @var callable[]
+*/
+ private $callbacks = array();
+
+ /**
+* @param string $method
+* @param callable $callback
+*/
+ public function registerCallback( $method, $callback ) {
+ $this-callbacks[$method] = $callback;
+ }
+
+ private function runCallbacks( $method, $args ) {
+ if ( array_key_exists( $method, $this-callbacks ) ) {
+ call_user_func_array( $this-callbacks[$method], $args
);
+ }
+ }
+
+ /**
+* @see QueryInterface::tableExists
+*
+* @param string $tableName
+*
+* @return boolean
+*/
+ public function tableExists( $tableName ) {
+ $this-runCallbacks( __FUNCTION__, func_get_args() );
+ }
+
+}
diff --git a/repo/includes/MessageReporter.php
b/repo/includes/MessageReporter.php
index fd13294..7d69eeb 100644
--- a/repo/includes/MessageReporter.php
+++ b/repo/includes/MessageReporter.php
@@ -123,3 +123,43 @@
}
}
+
+/**
+ * Mock implementation of the MessageReporter interface that
+ * does nothing with messages it receives.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation,
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...Translate)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51153
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Idc1b8fa7ddffeb66d419c808071feb0cf36f26be
---
M FirstSteps.i18n.php
M Translate.i18n.php
M Translate.php
M utils/UserToggles.php
4 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/53/51153/1
diff --git a/FirstSteps.i18n.php b/FirstSteps.i18n.php
index 862cdd6..21143ba 100644
--- a/FirstSteps.i18n.php
+++ b/FirstSteps.i18n.php
@@ -26,7 +26,7 @@
'translate-fs-userpage-title' = 'Create your user page',
'translate-fs-permissions-title' = 'Request translator permissions',
'translate-fs-target-title' = 'Start translating!',
- 'translate-fs-email-title' = 'Confirm your e-mail address',
+ 'translate-fs-email-title' = 'Confirm your email address',
'translate-fs-intro' = Welcome to the {{SITENAME}} first steps wizard.
You will be guided through the process of becoming a translator step by step.
@@ -55,7 +55,7 @@
You can mention other languages and other remarks in textbox below.',
'translate-fs-permissions-pending' = 'Your request has been submitted
to [[$1]] and someone from the site staff will check it as soon as possible.
-If you confirm your e-mail address, you will get an e-mail notification as
soon as it happens.',
+If you confirm your email address, you will get an email notification as soon
as it happens.',
'translate-fs-permissions-submit' = 'Send request',
'translate-fs-target-text' = 'Congratulations!
You can now start translating.
@@ -72,9 +72,9 @@
You can also contact fellow translators of the same language at
[[Portal:$1|your language portal]]\'s [[Portal_talk:$1|talk page]].
If you have not already done so, [[Special:Preferences|change your user
interface language to the language you want to translate in]], so that the wiki
is able to show the most relevant links for you.',
- 'translate-fs-email-text' = 'Please provide your e-mail address in
[[Special:Preferences|your preferences]] and confirm it from the e-mail that is
sent to you.
+ 'translate-fs-email-text' = 'Please provide your email address in
[[Special:Preferences|your preferences]] and confirm it from the email that is
sent to you.
-This allows other users to contact you by e-mail.
+This allows other users to contact you by email.
You will also receive newsletters at most once a month.
If you do not want to receive newsletters, you can opt-out in the tab
{{int:prefs-personal}} of your [[Special:Preferences|preferences]].',
);
diff --git a/Translate.i18n.php b/Translate.i18n.php
index 47891b7..2640245 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -149,7 +149,7 @@
'translate-checks-malformed' = 'nowiki$1/nowiki is malformed.',
'translate-checks-fudforum-syntax' = 'Use nowiki$1/nowiki instead
of nowiki$2/nowiki in this project.',
- 'translate-pref-nonewsletter' = 'Do not send me e-mail newsletters',
+ 'translate-pref-nonewsletter' = 'Do not send me email newsletters',
'translate-pref-editassistlang' = 'Assistant languages:',
'prefs-translate' = 'Translation options',
'translate-pref-editassistlang-help' = 'Comma separated list of
language codes.
diff --git a/Translate.php b/Translate.php
index b570177..a65e56f 100644
--- a/Translate.php
+++ b/Translate.php
@@ -501,7 +501,7 @@
$wgTranslateFuzzyBotName = 'FuzzyBot';
/**
- * Add a preference Do not send me e-mail newsletters in the e-mail
preferences.
+ * Add a preference Do not send me email newsletters in the email
preferences.
*/
$wgTranslateNewsletterPreference = false;
diff --git a/utils/UserToggles.php b/utils/UserToggles.php
index 72dcafb..4ffc2ba 100644
--- a/utils/UserToggles.php
+++ b/utils/UserToggles.php
@@ -31,10 +31,10 @@
global $wgEnableEmail, $wgEnotifRevealEditorAddress;
- // Only show if e-mail is enabled and user has a confirmed
e-mail address.
+ // Only show if email is enabled and user has a confirmed email
address.
if ( $wgEnableEmail $user-isEmailConfirmed() ) {
// 'translate-pref-nonewsletter' is used as opt-out for
- // users with a confirmed e-mail address
+ // users with a confirmed email address
$prefs = array(
'translate-nonewsletter' = array(
'type' = 'toggle',
--
To view, visit https://gerrit.wikimedia.org/r/51153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc1b8fa7ddffeb66d419c808071feb0cf36f26be
Gerrit-PatchSet: 1
Gerrit-Project:
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...TranslationNotifications)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51154
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I27aa1febee36fad92dcf7d805a61ae76145a46bd
---
M TranslationNotifications.i18n.php
1 file changed, 14 insertions(+), 14 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TranslationNotifications
refs/changes/54/51154/1
diff --git a/TranslationNotifications.i18n.php
b/TranslationNotifications.i18n.php
index e13c810..f047769 100644
--- a/TranslationNotifications.i18n.php
+++ b/TranslationNotifications.i18n.php
@@ -18,16 +18,16 @@
'translationnotifications-desc' = 'Allows translators to sign up for
translation notifications',
'translationnotifications-info' = 'User information',
'translationnotifications-username' = 'Username:',
- 'translationnotifications-emailstatus' = 'E-mail status:',
- 'translationnotifications-email-confirmed' = 'Your e-mail address is
confirmed',
- 'translationnotifications-email-disablemail' = 'Your e-mail address is
confirmed, but in [[Special:Preferences|your preferences]] you asked not to
receive e-mail.',
- 'translationnotifications-email-unconfirmed' = 'Your e-mail address is
not confirmed. $1',
- 'translationnotifications-email-notset' = 'You have not provided an
e-mail address. You can do that in your [[Special:Preferences|preferences]].',
+ 'translationnotifications-emailstatus' = 'Email status:',
+ 'translationnotifications-email-confirmed' = 'Your email address is
confirmed',
+ 'translationnotifications-email-disablemail' = 'Your email address is
confirmed, but in [[Special:Preferences|your preferences]] you asked not to
receive email.',
+ 'translationnotifications-email-unconfirmed' = 'Your email address is
not confirmed. $1',
+ 'translationnotifications-email-notset' = 'You have not provided an
email address. You can do that in your [[Special:Preferences|preferences]].',
'translationnotifications-languages' = 'Languages',
'translationnotifications-lang' = 'Language #$1',
'translationnotifications-nolang' = 'Choose a language',
'translationnotifications-contact' = 'Preferred contact methods',
- 'translationnotifications-cmethod-email' = 'E-mail',
+ 'translationnotifications-cmethod-email' = 'Email',
'translationnotifications-cmethod-talkpage' = 'Talk page',
'translationnotifications-cmethod-talkpage-elsewhere' = 'Talk page on
other wiki',
'translationnotifications-cmethod-feed' = 'Feed',
@@ -57,7 +57,7 @@
'translationnotifications-email-subject' = 'Please translate the page
$1',
'translationnotifications-email-body' = 'Hello $1,
-You are receiving this e-mail because you {{GENDER:$10|signed up}} as a
translator {{PLURAL:$9|to}} $2 on {{SITENAME}}.
+You are receiving this email because you {{GENDER:$10|signed up}} as a
translator {{PLURAL:$9|to}} $2 on {{SITENAME}}.
There is a page to translate there: $3.
You can translate it by clicking the following link:
@@ -76,7 +76,7 @@
-You are receiving this e-mail because you signed up to receive e-mails related
to translations on {{SITENAME}}. To unsubscribe or to change your notification
preferences for translations, please visit $8.',
+You are receiving this email because you signed up to receive emails related
to translations on {{SITENAME}}. To unsubscribe or to change your notification
preferences for translations, please visit $8.',
'translationnotifications-talkpage-body' = 'Hello $2,
You are receiving this notification because you {{GENDER:$1|signed up}} as a
translator {{PLURAL:$9|to}} $3 on {{SITENAME}}.
@@ -95,10 +95,10 @@
{{SITENAME}} translation coordinators',
'translationnotifications-notification-url-listitem' = 'translate to
$1',
- 'translationnotifications-digestemail-subject' = 'Digest e-mail for
translation requests from {{SITENAME}}',
+ 'translationnotifications-digestemail-subject' = 'Digest email for
translation requests from {{SITENAME}}',
'translationnotifications-digestemail-body' = 'Hello $1,
-You are receiving this e-mail because you {{GENDER:$1|signed up}} as a
translator to $2 on {{SITENAME}}.
+You are receiving this email because you {{GENDER:$1|signed up}} as a
translator to $2 on {{SITENAME}}.
There {{PLURAL:$3|is 1 page|are $3 pages}} available for translation. The
details are given below.
@@ -112,7 +112,7 @@
-You are receiving this e-mail because you signed up to receive e-mails related
to translations on {{SITENAME}}. To unsubscribe or to change your notification
preferences for translations, please visit $5.',
+You are receiving this email because you signed up to receive emails related
to translations on {{SITENAME}}. To unsubscribe
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...WikiLove)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51155
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Ie64a457d0323049c5932e3bb0fb22bdd0e2d4dd0
---
M ApiWikiLove.php
M WikiLove.i18n.php
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLove
refs/changes/55/51155/1
diff --git a/ApiWikiLove.php b/ApiWikiLove.php
index 78282d2..83ea8f1 100644
--- a/ApiWikiLove.php
+++ b/ApiWikiLove.php
@@ -121,7 +121,7 @@
try {
$api-execute();
} catch( DBQueryError $dbqe ) {
- $this-setWarning( 'E-mail was not sent' );
+ $this-setWarning( 'Email was not sent' );
}
wfProfileOut( __METHOD__ );
}
@@ -165,8 +165,8 @@
'or when on a MediaWiki page through
mw.user.tokens',
),
'subject' = 'Subject header of the new section',
- 'email' = array( 'Content of the optional e-mail
message to send to the user.',
- 'A warning will be returned if the user cannot
be e-mailed. WikiLove will be sent to user talk page either way.',
+ 'email' = array( 'Content of the optional email
message to send to the user.',
+ 'A warning will be returned if the user cannot
be emailed. WikiLove will be sent to user talk page either way.',
),
'type' = array( 'Type of WikiLove (for statistics);
this corresponds with a type',
'selected in the left menu, and optionally a
subtype after that',
diff --git a/WikiLove.i18n.php b/WikiLove.i18n.php
index e3ca1c3..12454f6 100644
--- a/WikiLove.i18n.php
+++ b/WikiLove.i18n.php
@@ -33,7 +33,7 @@
'wikilove-image-example' = '(example: Trophy.png)',
'wikilove-button-preview' = 'Preview',
'wikilove-preview' = 'Preview',
- 'wikilove-notify' = 'Notify the user by e-mail',
+ 'wikilove-notify' = 'Notify the user by email',
'wikilove-button-send' = 'Send WikiLove',
'wikilove-type-barnstars' = 'Barnstars',
'wikilove-barnstar-header' = 'A barnstar for you!',
--
To view, visit https://gerrit.wikimedia.org/r/51155
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie64a457d0323049c5932e3bb0fb22bdd0e2d4dd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLove
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix whitespace of I2dc613b73 - change (mediawiki...Translate)
Santhosh has submitted this change and it was merged.
Change subject: Fix whitespace of I2dc613b73
..
Fix whitespace of I2dc613b73
Change-Id: I5fa1d25072be652c4fe1474db002cc3246fc
---
M resources/css/ext.translate.proofread.css
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Santhosh: Verified; Looks good to me, approved
diff --git a/resources/css/ext.translate.proofread.css
b/resources/css/ext.translate.proofread.css
index eabaf3d..3bd09e5 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -17,7 +17,7 @@
.tux-message-proofread.open .tux-proofread-source,
.tux-message-proofread.open .tux-proofread-translation,
.tux-message-proofread.open .tux-proofread-action-block {
- display:none;
+ display: none;
}
.tux-proofread-source {
--
To view, visit https://gerrit.wikimedia.org/r/51116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5fa1d25072be652c4fe1474db002cc3246fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...TranslationNotifications)
Santhosh has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I27aa1febee36fad92dcf7d805a61ae76145a46bd
---
M TranslationNotifications.i18n.php
1 file changed, 14 insertions(+), 14 deletions(-)
Approvals:
Santhosh: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/TranslationNotifications.i18n.php
b/TranslationNotifications.i18n.php
index e13c810..f047769 100644
--- a/TranslationNotifications.i18n.php
+++ b/TranslationNotifications.i18n.php
@@ -18,16 +18,16 @@
'translationnotifications-desc' = 'Allows translators to sign up for
translation notifications',
'translationnotifications-info' = 'User information',
'translationnotifications-username' = 'Username:',
- 'translationnotifications-emailstatus' = 'E-mail status:',
- 'translationnotifications-email-confirmed' = 'Your e-mail address is
confirmed',
- 'translationnotifications-email-disablemail' = 'Your e-mail address is
confirmed, but in [[Special:Preferences|your preferences]] you asked not to
receive e-mail.',
- 'translationnotifications-email-unconfirmed' = 'Your e-mail address is
not confirmed. $1',
- 'translationnotifications-email-notset' = 'You have not provided an
e-mail address. You can do that in your [[Special:Preferences|preferences]].',
+ 'translationnotifications-emailstatus' = 'Email status:',
+ 'translationnotifications-email-confirmed' = 'Your email address is
confirmed',
+ 'translationnotifications-email-disablemail' = 'Your email address is
confirmed, but in [[Special:Preferences|your preferences]] you asked not to
receive email.',
+ 'translationnotifications-email-unconfirmed' = 'Your email address is
not confirmed. $1',
+ 'translationnotifications-email-notset' = 'You have not provided an
email address. You can do that in your [[Special:Preferences|preferences]].',
'translationnotifications-languages' = 'Languages',
'translationnotifications-lang' = 'Language #$1',
'translationnotifications-nolang' = 'Choose a language',
'translationnotifications-contact' = 'Preferred contact methods',
- 'translationnotifications-cmethod-email' = 'E-mail',
+ 'translationnotifications-cmethod-email' = 'Email',
'translationnotifications-cmethod-talkpage' = 'Talk page',
'translationnotifications-cmethod-talkpage-elsewhere' = 'Talk page on
other wiki',
'translationnotifications-cmethod-feed' = 'Feed',
@@ -57,7 +57,7 @@
'translationnotifications-email-subject' = 'Please translate the page
$1',
'translationnotifications-email-body' = 'Hello $1,
-You are receiving this e-mail because you {{GENDER:$10|signed up}} as a
translator {{PLURAL:$9|to}} $2 on {{SITENAME}}.
+You are receiving this email because you {{GENDER:$10|signed up}} as a
translator {{PLURAL:$9|to}} $2 on {{SITENAME}}.
There is a page to translate there: $3.
You can translate it by clicking the following link:
@@ -76,7 +76,7 @@
-You are receiving this e-mail because you signed up to receive e-mails related
to translations on {{SITENAME}}. To unsubscribe or to change your notification
preferences for translations, please visit $8.',
+You are receiving this email because you signed up to receive emails related
to translations on {{SITENAME}}. To unsubscribe or to change your notification
preferences for translations, please visit $8.',
'translationnotifications-talkpage-body' = 'Hello $2,
You are receiving this notification because you {{GENDER:$1|signed up}} as a
translator {{PLURAL:$9|to}} $3 on {{SITENAME}}.
@@ -95,10 +95,10 @@
{{SITENAME}} translation coordinators',
'translationnotifications-notification-url-listitem' = 'translate to
$1',
- 'translationnotifications-digestemail-subject' = 'Digest e-mail for
translation requests from {{SITENAME}}',
+ 'translationnotifications-digestemail-subject' = 'Digest email for
translation requests from {{SITENAME}}',
'translationnotifications-digestemail-body' = 'Hello $1,
-You are receiving this e-mail because you {{GENDER:$1|signed up}} as a
translator to $2 on {{SITENAME}}.
+You are receiving this email because you {{GENDER:$1|signed up}} as a
translator to $2 on {{SITENAME}}.
There {{PLURAL:$3|is 1 page|are $3 pages}} available for translation. The
details are given below.
@@ -112,7 +112,7 @@
-You are receiving this e-mail because you signed up to receive e-mails related
to translations on {{SITENAME}}. To unsubscribe or to change your notification
preferences for translations, please visit $5.',
+You are receiving this email because you signed up to receive emails related
to translations on {{SITENAME}}. To unsubscribe or to change your notification
preferences for translations,
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...SpamBlacklist)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Ibad4c4c7c98f5b0c746d62f1b2b41a4a99360ee8
---
M EmailBlacklist.php
M SpamBlacklist.i18n.php
M SpamBlacklistHooks.php
3 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/EmailBlacklist.php b/EmailBlacklist.php
index 8eb49af..9266b2e 100644
--- a/EmailBlacklist.php
+++ b/EmailBlacklist.php
@@ -15,7 +15,7 @@
}
/**
-* Checks a User object for a blacklisted e-mail address
+* Checks a User object for a blacklisted email address
*
* @param User $user
* @return bool True on valid email
@@ -32,9 +32,9 @@
return true;
}
- // Check for whitelisted e-mail addresses
+ // Check for whitelisted email addresses
if ( is_array( $whitelists ) ) {
- wfDebugLog( 'SpamBlacklist', Excluding whitelisted
e-mail addresses from . count( $whitelists ) .
+ wfDebugLog( 'SpamBlacklist', Excluding whitelisted
email addresses from . count( $whitelists ) .
regexes: . implode( ', ', $whitelists ) .
\n );
foreach ( $whitelists as $regex ) {
if ( preg_match( $regex, $email ) ) {
diff --git a/SpamBlacklist.i18n.php b/SpamBlacklist.i18n.php
index 7dd66a3..b0930b9 100644
--- a/SpamBlacklist.i18n.php
+++ b/SpamBlacklist.i18n.php
@@ -29,13 +29,13 @@
#/pre !-- leave this line exactly as it is --',
'email-blacklist' = ' #!-- leave this line exactly as it is -- pre
-# E-mail addresses matching this list will be blocked from registering or
sending e-mails
+# Email addresses matching this list will be blocked from registering or
sending emails
# This list affects only this wiki; refer also to the global blacklist.
# For documentation see https://www.mediawiki.org/wiki/Extension:SpamBlacklist
#
# Syntax is as follows:
# * Everything from a # character to the end of the line is a comment
-# * Every non-blank line is a regex fragment which will only match hosts
inside e-mail addresses
+# * Every non-blank line is a regex fragment which will only match hosts
inside email addresses
#/pre !-- leave this line exactly as it is --',
'email-whitelist' = ' #!-- leave this line exactly as it is -- pre
@@ -44,13 +44,13 @@
#
# Syntax is as follows:
# * Everything from a # character to the end of the line is a comment
-# * Every non-blank line is a regex fragment which will only match hosts
inside e-mail addresses
+# * Every non-blank line is a regex fragment which will only match hosts
inside email addresses
#/pre !-- leave this line exactly as it is --',
- 'spam-blacklisted-email' = 'Blacklisted e-mail address',
- 'spam-blacklisted-email-text' = 'Your e-mail address is currently
blacklisted from sending e-mails to other users.',
- 'spam-blacklisted-email-signup' = 'The given e-mail address is
currently blacklisted from use.',
+ 'spam-blacklisted-email' = 'Blacklisted email address',
+ 'spam-blacklisted-email-text' = 'Your email address is currently
blacklisted from sending emails to other users.',
+ 'spam-blacklisted-email-signup' = 'The given email address is
currently blacklisted from use.',
'spam-invalid-lines' = The following spam blacklist {{PLURAL:$1|line
is an|lines are}} invalid regular {{PLURAL:$1|expression|expressions}} and
{{PLURAL:$1|needs|need}} to be corrected before saving the page:,
'spam-blacklist-desc' = 'Regex-based anti-spam tool:
[[MediaWiki:Spam-blacklist]] and [[MediaWiki:Spam-whitelist]]',
diff --git a/SpamBlacklistHooks.php b/SpamBlacklistHooks.php
index 5597ab2..530df16 100644
--- a/SpamBlacklistHooks.php
+++ b/SpamBlacklistHooks.php
@@ -70,7 +70,7 @@
}
/**
-* Processes new accounts for valid e-mail addresses
+* Processes new accounts for valid email addresses
*
* @param $user User
* @param $abortError
--
To view, visit https://gerrit.wikimedia.org/r/51150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibad4c4c7c98f5b0c746d62f1b2b41a4a99360ee8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Idc1b8fa7ddffeb66d419c808071feb0cf36f26be
---
M FirstSteps.i18n.php
M Translate.i18n.php
M Translate.php
M utils/UserToggles.php
4 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/FirstSteps.i18n.php b/FirstSteps.i18n.php
index 862cdd6..21143ba 100644
--- a/FirstSteps.i18n.php
+++ b/FirstSteps.i18n.php
@@ -26,7 +26,7 @@
'translate-fs-userpage-title' = 'Create your user page',
'translate-fs-permissions-title' = 'Request translator permissions',
'translate-fs-target-title' = 'Start translating!',
- 'translate-fs-email-title' = 'Confirm your e-mail address',
+ 'translate-fs-email-title' = 'Confirm your email address',
'translate-fs-intro' = Welcome to the {{SITENAME}} first steps wizard.
You will be guided through the process of becoming a translator step by step.
@@ -55,7 +55,7 @@
You can mention other languages and other remarks in textbox below.',
'translate-fs-permissions-pending' = 'Your request has been submitted
to [[$1]] and someone from the site staff will check it as soon as possible.
-If you confirm your e-mail address, you will get an e-mail notification as
soon as it happens.',
+If you confirm your email address, you will get an email notification as soon
as it happens.',
'translate-fs-permissions-submit' = 'Send request',
'translate-fs-target-text' = 'Congratulations!
You can now start translating.
@@ -72,9 +72,9 @@
You can also contact fellow translators of the same language at
[[Portal:$1|your language portal]]\'s [[Portal_talk:$1|talk page]].
If you have not already done so, [[Special:Preferences|change your user
interface language to the language you want to translate in]], so that the wiki
is able to show the most relevant links for you.',
- 'translate-fs-email-text' = 'Please provide your e-mail address in
[[Special:Preferences|your preferences]] and confirm it from the e-mail that is
sent to you.
+ 'translate-fs-email-text' = 'Please provide your email address in
[[Special:Preferences|your preferences]] and confirm it from the email that is
sent to you.
-This allows other users to contact you by e-mail.
+This allows other users to contact you by email.
You will also receive newsletters at most once a month.
If you do not want to receive newsletters, you can opt-out in the tab
{{int:prefs-personal}} of your [[Special:Preferences|preferences]].',
);
diff --git a/Translate.i18n.php b/Translate.i18n.php
index 47891b7..2640245 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -149,7 +149,7 @@
'translate-checks-malformed' = 'nowiki$1/nowiki is malformed.',
'translate-checks-fudforum-syntax' = 'Use nowiki$1/nowiki instead
of nowiki$2/nowiki in this project.',
- 'translate-pref-nonewsletter' = 'Do not send me e-mail newsletters',
+ 'translate-pref-nonewsletter' = 'Do not send me email newsletters',
'translate-pref-editassistlang' = 'Assistant languages:',
'prefs-translate' = 'Translation options',
'translate-pref-editassistlang-help' = 'Comma separated list of
language codes.
diff --git a/Translate.php b/Translate.php
index b570177..a65e56f 100644
--- a/Translate.php
+++ b/Translate.php
@@ -501,7 +501,7 @@
$wgTranslateFuzzyBotName = 'FuzzyBot';
/**
- * Add a preference Do not send me e-mail newsletters in the e-mail
preferences.
+ * Add a preference Do not send me email newsletters in the email
preferences.
*/
$wgTranslateNewsletterPreference = false;
diff --git a/utils/UserToggles.php b/utils/UserToggles.php
index 72dcafb..4ffc2ba 100644
--- a/utils/UserToggles.php
+++ b/utils/UserToggles.php
@@ -31,10 +31,10 @@
global $wgEnableEmail, $wgEnotifRevealEditorAddress;
- // Only show if e-mail is enabled and user has a confirmed
e-mail address.
+ // Only show if email is enabled and user has a confirmed email
address.
if ( $wgEnableEmail $user-isEmailConfirmed() ) {
// 'translate-pref-nonewsletter' is used as opt-out for
- // users with a confirmed e-mail address
+ // users with a confirmed email address
$prefs = array(
'translate-nonewsletter' = array(
'type' = 'toggle',
--
To view, visit https://gerrit.wikimedia.org/r/51153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idc1b8fa7ddffeb66d419c808071feb0cf36f26be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...MoodBar)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I217671768d4f77694a9d4dbceb7ce6101f1a6f2b
---
M MoodBar.i18n.php
M include/MoodBarHTMLEmailNotification.php
2 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MoodBar.i18n.php b/MoodBar.i18n.php
index e0e1691..d3e1a97 100644
--- a/MoodBar.i18n.php
+++ b/MoodBar.i18n.php
@@ -70,14 +70,14 @@
'moodbar-ratelimited-subtitle' = 'You have exceeded moodbar rate
limit. Please wait some time and try again',
'moodbar-abuse-title' = 'Oops!',
'moodbar-abuse-subtitle' = 'Your feedback violates moodbar rules.',
- 'moodbar-email-title' = 'Add e-mail',
- 'moodbar-email-input' = 'Your e-mail address',
- 'moodbar-email-desc' = 'We will send you an e-mail if someone responds
to your feedback.',
+ 'moodbar-email-title' = 'Add email',
+ 'moodbar-email-input' = 'Your email address',
+ 'moodbar-email-desc' = 'We will send you an email if someone responds
to your feedback.',
'moodbar-email-submit' = 'Submit',
'moodbar-updating-title' = 'Updating...',
- 'moodbar-updating-subtitle' = 'We are updating your e-mail settings.',
- 'moodbar-email-confirm-title' = 'Confirm e-mail',
- 'moodbar-email-confirm-desc' = 'You must confirm your e-mail address
in order to receive notifications. To resend the confirmation e-mail, click
Resend Confirmation.',
+ 'moodbar-updating-subtitle' = 'We are updating your email settings.',
+ 'moodbar-email-confirm-title' = 'Confirm email',
+ 'moodbar-email-confirm-desc' = 'You must confirm your email address in
order to receive notifications. To resend the confirmation email, click Resend
Confirmation.',
'moodbar-email-resend-confirmation' = 'Resend confirmation',
'moodbar-email-optout' = 'No thanks',
// MoodBar Tooltip
diff --git a/include/MoodBarHTMLEmailNotification.php
b/include/MoodBarHTMLEmailNotification.php
index 9f4d466..984a7d7 100644
--- a/include/MoodBarHTMLEmailNotification.php
+++ b/include/MoodBarHTMLEmailNotification.php
@@ -138,7 +138,7 @@
}
/**
-* Generate the generic this page has been changed e-mail text.
+* Generate the generic this page has been changed email text.
*/
protected function composeCommonMailtext() {
global $wgPasswordSender, $wgPasswordSenderName,
$wgNoReplyAddress;
--
To view, visit https://gerrit.wikimedia.org/r/51147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I217671768d4f77694a9d4dbceb7ce6101f1a6f2b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MoodBar
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: Ifeb7fc14bbde946ca39a32cdc6b4e718dee1cf7c --- M MobileFrontend.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/MobileFrontend.i18n.php b/MobileFrontend.i18n.php index e3b4c8b..f8d253e 100644 --- a/MobileFrontend.i18n.php +++ b/MobileFrontend.i18n.php @@ -115,7 +115,7 @@ // account creation 'mobile-frontend-account-create-submit' = 'Sign up', 'mobile-frontend-password-confirm-placeholder' = 'Confirm password', - 'mobile-frontend-account-create-email-placeholder' = 'E-mail address (optional)', + 'mobile-frontend-account-create-email-placeholder' = 'Email address (optional)', 'mobile-frontend-account-create-captcha-placeholder' = 'Enter security text', // Search 'mobile-frontend-overlay-escape' = 'Go back', -- To view, visit https://gerrit.wikimedia.org/r/51146 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifeb7fc14bbde946ca39a32cdc6b4e718dee1cf7c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...LiquidThreads)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Ic77eab3ac4050c274c8a999d6d314592163160d2
---
M i18n/Lqt.i18n.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/Lqt.i18n.php b/i18n/Lqt.i18n.php
index e716ab8..f322e0e 100644
--- a/i18n/Lqt.i18n.php
+++ b/i18n/Lqt.i18n.php
@@ -197,14 +197,14 @@
'lqt-log-action-signatureedit' = 'changed the signature of [[$1]] from
$2 to $3',
// Preferences
- 'lqt-preference-notify-talk' = 'E-mail me on replies to a thread I am
watching',
+ 'lqt-preference-notify-talk' = 'Email me on replies to a thread I am
watching',
'lqt-preference-watch-threads' = 'Watch threads that I create or reply
to',
'prefs-lqt' = 'Threaded discussion',
'lqt-preference-display-depth' = 'Maximum reply depth to show:',
'lqt-preference-display-count' = 'Maximum number of replies to show:',
'lqt-preference-custom-signatures' = 'Show custom user signatures',
- // E-mail notification
+ // Email notification
'lqt-enotif-subject-reply' = '{{SITENAME}} discussion - Reply: $1',
'lqt-enotif-subject-newthread' = '{{SITENAME}} discussion - New
thread: $1',
'lqt-enotif-newthread' = Hi $1,
--
To view, visit https://gerrit.wikimedia.org/r/51144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic77eab3ac4050c274c8a999d6d314592163160d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I452dd42a007a61d1e45dd81473a2745b86566f93
---
M Echo.i18n.php
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Echo.i18n.php b/Echo.i18n.php
index 683ee2a..5bc8f88 100644
--- a/Echo.i18n.php
+++ b/Echo.i18n.php
@@ -14,15 +14,15 @@
// Preferences
'prefs-echo' = 'Notifications',
'prefs-displaynotifications' = 'Display options',
- 'prefs-emailfrequency' = 'When would you like to receive e-mail
notifications?',
+ 'prefs-emailfrequency' = 'When would you like to receive email
notifications?',
'prefs-echosubscriptions' = 'Notify me when someone…',
'echo-pref-web' = 'Web',
- 'echo-pref-email' = 'E-mail',
+ 'echo-pref-email' = 'Email',
'echo-pref-subscription-edit-user-talk' = 'Posts on my talk page',
'echo-pref-subscription-article-linked' = 'Creates a link to a page I
created',
'echo-pref-subscription-reverted' = 'Reverts my edit',
'echo-pref-subscription-mention' = 'Mentions me',
- 'echo-pref-email-frequency-never' = 'Do not send me any e-mail
notifications',
+ 'echo-pref-email-frequency-never' = 'Do not send me any email
notifications',
'echo-pref-email-frequency-immediately' = 'Individual notifications as
they come in',
'echo-pref-email-frequency-daily' = 'A daily summary of notifications',
'echo-pref-email-frequency-weekly' = 'A weekly summary of
notifications',
@@ -109,14 +109,14 @@
$5',
'notification-mention-email-batch-body' = '$1 {{GENDER:$1|mentioned}}
you on $2',
'echo-notification-count' = '$1+',
- // E-mail notification
+ // Email notification
'echo-email-subject-default' = 'New notification at {{SITENAME}}',
'echo-email-body-default' = 'You have a new notification at
{{SITENAME}}:
$1',
'echo-email-footer-default' = '$2
-To control which e-mails we send you, visit:
+To control which emails we send you, visit:
{{canonicalurl:{{#special:Preferences}}#mw-prefsection-echo}}
$1',
@@ -133,7 +133,7 @@
'echo-date-header' = '$1 $2',
'echo-load-more-error' = 'An error occurred while fetching more
results.',
- // E-mail batch
+ // Email batch
'echo-email-batch-separator' =
'', # only translate this
message to other languages if you have to change it
'echo-email-batch-bullet' = '•', # only translate this message to
other languages if you have to change it
'echo-email-batch-subject-daily' = 'You have $1
{{PLURAL:$2|notification|notifications}} today',
--
To view, visit https://gerrit.wikimedia.org/r/51141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I452dd42a007a61d1e45dd81473a2745b86566f93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...E3Experiments)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Ica2c7788a70fd8c4753358a99638130bbd481f19
---
M api/ApiAccountCreation.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/ApiAccountCreation.php b/api/ApiAccountCreation.php
index a6e6363..5b0c60a 100644
--- a/api/ApiAccountCreation.php
+++ b/api/ApiAccountCreation.php
@@ -55,7 +55,7 @@
}
- // e-mail validation
+ // email validation
if ( isset( $params[ 'email' ] ) ) {
$email = $params[ 'email' ];
$valid = User::isValidEmailAddr( $email );
--
To view, visit https://gerrit.wikimedia.org/r/51140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica2c7788a70fd8c4753358a99638130bbd481f19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/E3Experiments
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I6b83393f919ed0c1cd938004693d7f3f62320ceb
---
M extras/recaptcha/recaptcha-php/recaptchalib.php
M gateway_common/interface.i18n.php
M payflowpro_gateway/payflowpro_gateway.i18n.php
3 files changed, 12 insertions(+), 12 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extras/recaptcha/recaptcha-php/recaptchalib.php
b/extras/recaptcha/recaptcha-php/recaptchalib.php
index 674ac12..649bd0c 100644
--- a/extras/recaptcha/recaptcha-php/recaptchalib.php
+++ b/extras/recaptcha/recaptcha-php/recaptchalib.php
@@ -373,6 +373,6 @@
$url = recaptcha_mailhide_url ( $pubkey, $privkey, $email );
return htmlentities( $emailparts[0] ) . a href=' . htmlentities (
$url ) .
- ' onclick=\window.open(' . htmlentities ( $url ) . ', '',
'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300');
return false;\ title=\Reveal this e-mail address\.../a@ . htmlentities
( $emailparts [1] );
+ ' onclick=\window.open(' . htmlentities ( $url ) . ', '',
'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300');
return false;\ title=\Reveal this email address\.../a@ . htmlentities (
$emailparts [1] );
}
diff --git a/gateway_common/interface.i18n.php
b/gateway_common/interface.i18n.php
index 499f221..f963ff2 100644
--- a/gateway_common/interface.i18n.php
+++ b/gateway_common/interface.i18n.php
@@ -21,7 +21,7 @@
'donate_interface-submit-button' = 'Donate',
'donate_interface-comment-message' = 'Have a thought to share with the
world? Put up to 200 characters here:',
'donate_interface-comment-label' = 'Comment:',
- 'donate_interface-email-agreement' = I agree to receive occasional
e-mail updates from the Wikimedia Foundation.,
+ 'donate_interface-email-agreement' = I agree to receive occasional
email updates from the Wikimedia Foundation.,
'donate_interface-comment-title' = 'Public comment',
'donate_interface-donation-description' = 'Donation to the Wikimedia
Foundation',
'donate_interface-big-amount-display' = '$100',
@@ -177,14 +177,14 @@
'donate_interface-error-msg-js' = 'Please enter your',
'donate_interface-error-msg-validation' = 'Please correct the errors
in the form.',
'donate_interface-error-msg-invalid-amount' = 'Please enter a valid
amount',
- 'donate_interface-error-msg-email' = 'Please enter a valid e-mail
address',
+ 'donate_interface-error-msg-email' = 'Please enter a valid email
address',
'donate_interface-error-msg-card-num' = 'Please enter a valid credit
card number for one of the accepted credit card types',
'donate_interface-error-msg-amex' = 'Please enter a correct card
number for American Express.',
'donate_interface-error-msg-mc' = 'Please enter a correct card number
for MasterCard.',
'donate_interface-error-msg-visa' = 'Please enter a correct card
number for Visa.',
'donate_interface-error-msg-discover' = 'Please enter a correct card
number for Discover.',
'donate_interface-error-msg-amount' = 'donation amount',
- 'donate_interface-error-msg-emailAdd' = 'e-mail address',
+ 'donate_interface-error-msg-emailAdd' = 'email address',
'donate_interface-error-msg-fname' = 'first name',
'donate_interface-error-msg-lname' = 'last name',
'donate_interface-error-msg-street' = 'street address',
@@ -265,7 +265,7 @@
'donate_interface-billing-code' = 'Billing zip',
'donate_interface-country' = 'Country',
'donate_interface-select-country' = 'Select a country',
- 'donate_interface-confirm-email' = 'Confirm e-mail',
+ 'donate_interface-confirm-email' = 'Confirm email',
'donate_interface-phone' = 'Phone',
'donate_interface-telephone' = 'Telephone',
'donate_interface-telephone-home' = 'Tel. (home)',
@@ -316,7 +316,7 @@
'donate_interface-please-complete' = 'Please complete your donation
below ...',
'donate_interface-description' = 'Description',
'donate_interface-donation' = 'Donation',
- 'donate_interface-email-receipt' = 'E-mail receipt to',
+ 'donate_interface-email-receipt' = 'Email receipt to',
'donate_interface-monthly-donation' = 'Make a monthly donation',
'donate_interface-via-paypal' = '(via PayPal)',
'donate_interface-shirt-size' = 'T-shirt size:',
@@ -401,25 +401,25 @@
// Links to translation improvement
'donate_interface-translate-bluelink' = 'Improve this translation',
'donate_interface-translate-redlink1' = 'Help translate this page.',
- 'donate_interface-translate-redlink2' =
[MediaWiki-commits] [Gerrit] Adding $this = $( this ) where appropriate - change (mediawiki...Translate)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51156
Change subject: Adding $this = $( this ) where appropriate
..
Adding $this = $( this ) where appropriate
Change-Id: I796311b5f5422909ea70d448adbca45def9f1cac
---
M resources/js/ext.translate.special.translate.js
1 file changed, 18 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/56/51156/1
diff --git a/resources/js/ext.translate.special.translate.js
b/resources/js/ext.translate.special.translate.js
index e427405..8d8091a 100644
--- a/resources/js/ext.translate.special.translate.js
+++ b/resources/js/ext.translate.special.translate.js
@@ -157,14 +157,17 @@
$.each( workflowstates, function ( id, workflowstate ) {
if ( workflowstate._canchange ) {
workflowstate.id = id;
+
$selector.append( $('li')
.data( 'state', workflowstate )
.text( workflowstate._name )
.on( 'click', function() {
+ var $this = $( this );
+
$selector.find(
'.selected' ).removeClass( 'selected' );
- $( this ).addClass(
'selected' )
+ $this.addClass(
'selected' )
.parent().addClass( 'hide' );
-
workflowSelectionHandler( $( this ).data( 'state' ) );
+
workflowSelectionHandler( $this.data( 'state' ) );
})
);
}
@@ -284,13 +287,17 @@
if ( $messageList.length ) {
uri = new mw.Uri( window.location.href );
filter = uri.query.filter;
+
if ( filter === undefined ) {
filter = '!translated';
}
+
mw.translate.changeFilter( filter );
$( '.tux-message-selector li' ).each( function () {
- if ( $( this ).data( 'filter' ) === filter ) {
- $( this ).addClass( 'selected' );
+ var $this = $( this );
+
+ if ( $this.data( 'filter' ) === filter ) {
+ $this.addClass( 'selected' );
}
} );
}
@@ -375,15 +382,17 @@
$translateContainer.find( '.tux-workflow-status-selector li' )
.on( 'click', function () {
- var state, stateText, $selector;
+ var state, stateText, $selector
+ $this = $( this );
- state = $( this ).data( 'state' );
- stateText = $( this ).text();
+ state = $this.data( 'state' );
+ stateText = $this.text();
$selector = $translateContainer.find(
'.tux-workflow-status' );
- $( this ).parent().find( '.selected'
).removeClass( 'selected' );
- $( this ).addClass( 'selected' )
+ $this.parent().find( '.selected' ).removeClass(
'selected' );
+ $this.addClass( 'selected' )
.parent().addClass( 'hide' );
$selector.text( mw.msg(
'translate-workflow-set-doing' ) );
+
mw.translate.changeWorkflowStatus(
$selector.data( 'group' ),
$selector.data( 'language' ),
state,
--
To view, visit https://gerrit.wikimedia.org/r/51156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I796311b5f5422909ea70d448adbca45def9f1cac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ConfirmEdit)
jenkins-bot has submitted this change and it was merged. Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: Ic9071861e050309523e0f143b18c815d7c136554 --- M ConfirmEdit.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/ConfirmEdit.php b/ConfirmEdit.php index 87a48e0..1abd5ae 100644 --- a/ConfirmEdit.php +++ b/ConfirmEdit.php @@ -140,7 +140,7 @@ $wgCaptchaBadLoginExpiration = 5 * 60; /** - * Allow users who have confirmed their e-mail addresses to post + * Allow users who have confirmed their email addresses to post * URL links without being harassed by the captcha. */ $ceAllowConfirmedEmail = false; -- To view, visit https://gerrit.wikimedia.org/r/51133 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic9071861e050309523e0f143b18c815d7c136554 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ConfirmEdit Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged. Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: I526595dc0e0cdcd377f3c7fcd063bc62f36937d4 --- M CentralAuth.i18n.php M CentralAuthPlugin.php M CentralAuthUser.php 3 files changed, 9 insertions(+), 9 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/CentralAuth.i18n.php b/CentralAuth.i18n.php index 051862e..d8b9f6a 100644 --- a/CentralAuth.i18n.php +++ b/CentralAuth.i18n.php @@ -28,7 +28,7 @@ 'centralauth-merge-step1-title' = 'Begin login unification', 'centralauth-merge-step1-detail' = 'Please enter your account password. -Your password and registered e-mail address will be checked against the accounts on other wikis to confirm that they match. +Your password and registered email address will be checked against the accounts on other wikis to confirm that they match. No changes will be made until you have confirmed that things are in order.', 'centralauth-merge-step1-submit' = 'Confirm login information', @@ -84,7 +84,7 @@ // For lists of wikis/accounts: 'centralauth-list-home-title' = 'Home wiki', - 'centralauth-list-home-dryrun' = 'The password and e-mail address set at this wiki will be used for your unified account.', + 'centralauth-list-home-dryrun' = 'The password and email address set at this wiki will be used for your unified account.', 'centralauth-list-attached-title' = 'Attached accounts', 'centralauth-list-attached' = 'The account named $1 on each of the following sites has been automatically attached to the unified account:', 'centralauth-list-attached-dryrun' = 'The account named $1 on each of the following sites will be automatically attached to the unified account:', @@ -97,7 +97,7 @@ // Merge methods 'centralauth-merge-method-primary' = 'home wiki', 'centralauth-merge-method-empty'= 'no contributions', - 'centralauth-merge-method-mail' = 'confirmed by e-mail', + 'centralauth-merge-method-mail' = 'confirmed by email', 'centralauth-merge-method-password' = 'confirmed by password', 'centralauth-merge-method-admin'= 'admin-merged account', 'centralauth-merge-method-new' = 'new account', @@ -105,7 +105,7 @@ 'centralauth-merge-method-primary-desc' = 'This is the wiki at which the account was initially merged. Note that it may differ from the real home wiki of that user.', 'centralauth-merge-method-empty-desc'= 'Indicates that the local account was merged because it had no edits.', - 'centralauth-merge-method-mail-desc' = 'Indicates that the local account was merged because its email address matched the e-mail address of the main account.', + 'centralauth-merge-method-mail-desc' = 'Indicates that the local account was merged because its email address matched the email address of the main account.', 'centralauth-merge-method-password-desc' = 'Indicates that the local account was merged because user specified a valid password for it.', 'centralauth-merge-method-admin-desc'= 'Indicates that the local account was merged manually by stewards. That feature is disabled now because of security reasons.', @@ -118,7 +118,7 @@ 'centralauth-finish-text' = 'If these accounts do belong to you, you can finish the login unification process simply by typing the passwords for the other accounts here:', 'centralauth-finish-password' = 'Password:', 'centralauth-finish-login' = 'Login', - 'centralauth-finish-send-confirmation' = 'E-mail password', + 'centralauth-finish-send-confirmation' = 'Email password', 'centralauth-finish-problems' = Are you having trouble, or are you not the owner of these other accounts? [[meta:Help:Unified login problems|How to find help]]…, 'centralauth-finish-noconfirms'= 'No accounts could be confirmed using this password.', diff --git a/CentralAuthPlugin.php b/CentralAuthPlugin.php index 3e796a3..2790d15 100644 --- a/CentralAuthPlugin.php +++ b/CentralAuthPlugin.php @@ -181,7 +181,7 @@ /** * Add a user to the external authentication database. -* E-mail and real name addresses are provided by the +* Email and real name addresses are provided by the * registering user, and may or may not be accepted. * * Return true if successful. diff --git a/CentralAuthUser.php b/CentralAuthUser.php index 3a50267..3505502 100644 --- a/CentralAuthUser.php +++ b/CentralAuthUser.php @@ -662,7 +662,7 @@ * @return Array of wiki = authentication method */ function prepareMigration( $migrationSet, $passwords =
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ThrottleOverride)
Parent5446 has submitted this change and it was merged. Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: I3c42e4b7592b000619a4f9f15786e81a2f13b050 --- M ThrottleOverride.i18n.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Parent5446: Verified Siebrand: Looks good to me, approved diff --git a/ThrottleOverride.i18n.php b/ThrottleOverride.i18n.php index 22fc514..978db38 100644 --- a/ThrottleOverride.i18n.php +++ b/ThrottleOverride.i18n.php @@ -26,8 +26,8 @@ 'throttleoverride-types-actcreate' = 'Account creation', 'throttleoverride-types-edit' = 'Page edits', 'throttleoverride-types-move' = 'Page moves', - 'throttleoverride-types-mailpassword' = 'Password recovery e-mails', - 'throttleoverride-types-emailuser' = 'User e-mails' + 'throttleoverride-types-mailpassword' = 'Password recovery emails', + 'throttleoverride-types-emailuser' = 'User emails' ); /** Message documentation (Message documentation) -- To view, visit https://gerrit.wikimedia.org/r/51151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c42e4b7592b000619a4f9f15786e81a2f13b050 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ThrottleOverride Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Parent5446 tylerro...@gmail.com Gerrit-Reviewer: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...CodeReview)
Siebrand has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I19e93cb4c4d3181b7167a486dbd7e6d92b0aaf91
---
M CodeReview.php
M backend/CodeRepository.php
M backend/CodeRevision.php
M ui/CodeRevisionAuthorView.php
4 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/CodeReview.php b/CodeReview.php
index 2037215..91fc04f 100644
--- a/CodeReview.php
+++ b/CodeReview.php
@@ -168,18 +168,18 @@
// Leave this off by default until it works right
$wgCodeReviewENotif = false;
-// Set this to an e-mail list to send all comments to
+// Set this to an email list to send all comments to
$wgCodeReviewCommentWatcherEmail = false;
-// Name to use in the To: header of e-mails to the list. Ignored if
$wgCodeReviewCommentWatcherEmail isn't set
+// Name to use in the To: header of emails to the list. Ignored if
$wgCodeReviewCommentWatcherEmail isn't set
$wgCodeReviewCommentWatcherName = CodeReview comments list;
// Set this flag to true if you want to disable the automatic notifications to
all
// watchers of a specific revision, when a follow-up to that revision is
committed.
-// Useful for small repos when everyone is reading the commit e-mails anyway,
+// Useful for small repos when everyone is reading the commit emails anyway,
// or if you have multiple repositories which refer to one another, which
result
// in an unreasonable level of false positives.
// Note that the new revision will still be marked as a follow-up - this
setting
-// just stops the e-mail being sent.
+// just stops the email being sent.
$wgCodeReviewDisableFollowUpNotification = false;
// What images can be used for client-side side-by-side comparisons?
diff --git a/backend/CodeRepository.php b/backend/CodeRepository.php
index 512615e..f92d360 100644
--- a/backend/CodeRepository.php
+++ b/backend/CodeRepository.php
@@ -288,7 +288,7 @@
* on the wiki then it includes the repo name as a prefix to the
revision ID
* (separated with a period).
* This ensures you get a unique reference, as the revision ID alone
can be
-* confusing (e.g. in e-mails, page titles etc.). If only one
repository is
+* confusing (e.g. in emails, page titles etc.). If only one
repository is
* defined then this returns the same as getRevIdString() as there
* is no ambiguity.
*
diff --git a/backend/CodeRevision.php b/backend/CodeRevision.php
index 2146840..b884552 100644
--- a/backend/CodeRevision.php
+++ b/backend/CodeRevision.php
@@ -171,7 +171,7 @@
* on the wiki then it includes the repo name as a prefix to the
revision ID
* (separated with a period).
* This ensures you get a unique reference, as the revision ID alone
can be
-* confusing (e.g. in e-mails, page titles etc.). If only one
repository is
+* confusing (e.g. in emails, page titles etc.). If only one
repository is
* defined then this returns the same as getIdString() as there is no
ambiguity.
*
* @param $id int
@@ -700,7 +700,7 @@
if ( $user ) {
$users[$user-getId()] = $user;
}
- // If we've got a spam list, send e-mails to it too
+ // If we've got a spam list, send emails to it too
if ( $wgCodeReviewCommentWatcherEmail ) {
$watcher = new User();
$watcher-setEmail( $wgCodeReviewCommentWatcherEmail );
diff --git a/ui/CodeRevisionAuthorView.php b/ui/CodeRevisionAuthorView.php
index 8cc1525..1ff78c7 100644
--- a/ui/CodeRevisionAuthorView.php
+++ b/ui/CodeRevisionAuthorView.php
@@ -23,7 +23,7 @@
$this-mUser-getId(),
$this-mUser-getName(),
false, /* default for redContribsWhenNoEdits */
- Linker::TOOL_LINKS_EMAIL /* Add send e-mail
link */
+ Linker::TOOL_LINKS_EMAIL /* Add send email
link */
) )-escaped();
}
--
To view, visit https://gerrit.wikimedia.org/r/51129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I19e93cb4c4d3181b7167a486dbd7e6d92b0aaf91
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CodeReview
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ArticleFeedbackv5)
Siebrand has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I86403875e690de6b4cac3b91245e2960a9ffd8b8
---
M ArticleFeedbackv5.i18n.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/ArticleFeedbackv5.i18n.php b/ArticleFeedbackv5.i18n.php
index e264bd8..e271141 100644
--- a/ArticleFeedbackv5.i18n.php
+++ b/ArticleFeedbackv5.i18n.php
@@ -334,7 +334,7 @@
'articlefeedbackv5-noteflyover-requestoversight-description' = 'Before
requesting oversight, please check that this post
includes one of these issues:
* phone numbers
-* e-mail addresses
+* email addresses
* pornographic links
* defamatory/libelous comments about a person
* [//en.wikipedia.org/wiki/Wikipedia:Oversight#Policy other criteria for
oversight]',
@@ -517,7 +517,7 @@
Thank you for expressing interest in helping to improve {{SITENAME}}.
-Please take a moment to confirm your e-mail by clicking on the link below:
+Please take a moment to confirm your email address by clicking on the link
below:
$1
@@ -531,7 +531,7 @@
We will be in touch shortly with how you can help improve {{SITENAME}}.
-If you did not initiate this request, please ignore this e-mail and we will
not send you anything else.
+If you did not initiate this request, please ignore this email and we will not
send you anything else.
Best wishes, and thank you,
The {{SITENAME}} team',
--
To view, visit https://gerrit.wikimedia.org/r/51126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86403875e690de6b4cac3b91245e2960a9ffd8b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ArticleFeedback)
Siebrand has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Ica47671266b424eb00ce9f7cb5004d46690d8ad6
---
M ArticleFeedback.i18n.php
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/ArticleFeedback.i18n.php b/ArticleFeedback.i18n.php
index 676bda6..0317559 100644
--- a/ArticleFeedback.i18n.php
+++ b/ArticleFeedback.i18n.php
@@ -23,8 +23,8 @@
'articlefeedback-form-panel-expertise-profession' = 'It is part of my
profession',
'articlefeedback-form-panel-expertise-hobby' = 'It is a deep personal
passion',
'articlefeedback-form-panel-expertise-other' = 'The source of my
knowledge is not listed here',
- 'articlefeedback-form-panel-helpimprove' = 'I would like to help
improve Wikipedia, send me an e-mail (optional)',
- 'articlefeedback-form-panel-helpimprove-note' = 'We will send you a
confirmation e-mail. We will not share your e-mail address with outside parties
as per our $1.',
+ 'articlefeedback-form-panel-helpimprove' = 'I would like to help
improve Wikipedia, send me an email (optional)',
+ 'articlefeedback-form-panel-helpimprove-note' = 'We will send you a
confirmation email. We will not share your email address with outside parties
as per our $1.',
'articlefeedback-form-panel-helpimprove-email-placeholder' =
'em...@example.org', // Optional
'articlefeedback-form-panel-helpimprove-privacy' = 'feedback privacy
statement',
'articlefeedback-form-panel-submit' = 'Submit ratings',
@@ -96,7 +96,7 @@
Thank you for expressing interest in helping to improve {{SITENAME}}.
-Please take a moment to confirm your e-mail by clicking on the link below:
+Please take a moment to confirm your email address by clicking on the link
below:
$1
@@ -110,7 +110,7 @@
We will be in touch shortly with how you can help improve {{SITENAME}}.
-If you did not initiate this request, please ignore this e-mail and we will
not send you anything else.
+If you did not initiate this request, please ignore this email and we will not
send you anything else.
Best wishes, and thank you,
The {{SITENAME}} team',
--
To view, visit https://gerrit.wikimedia.org/r/51125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica47671266b424eb00ce9f7cb5004d46690d8ad6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedback
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ConfirmAccount)
Siebrand has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Ia2e037bb84566149dde0e1edd18fe6ccfc8b152d
---
M backend/ConfirmAccount.class.php
M backend/UserAccountRequest.php
M frontend/language/ConfirmAccount.i18n.php
M frontend/language/ConfirmAccountPage.i18n.php
M frontend/language/RequestAccountPage.i18n.php
M frontend/language/UserCredentialsPage.i18n.php
M frontend/specialpages/actions/RequestAccount_body.php
7 files changed, 25 insertions(+), 25 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/backend/ConfirmAccount.class.php b/backend/ConfirmAccount.class.php
index 208708e..70b3149 100644
--- a/backend/ConfirmAccount.class.php
+++ b/backend/ConfirmAccount.class.php
@@ -64,7 +64,7 @@
}
/**
-* Generate and store a new e-mail confirmation token, and return
+* Generate and store a new email confirmation token, and return
* the URL the user can use to confirm.
* @param string $token
* @return string
@@ -78,7 +78,7 @@
}
/**
-* Generate, store, and return a new e-mail confirmation code.
+* Generate, store, and return a new email confirmation code.
* A hash (unsalted since it's used as a key) is stored.
* @param User $user
* @param string $expiration
@@ -94,7 +94,7 @@
}
/**
-* Generate a new e-mail confirmation token and send a confirmation
+* Generate a new email confirmation token and send a confirmation
* mail to the user's given address.
*
* @param User $user
diff --git a/backend/UserAccountRequest.php b/backend/UserAccountRequest.php
index 592fae3..8e07270 100644
--- a/backend/UserAccountRequest.php
+++ b/backend/UserAccountRequest.php
@@ -431,7 +431,7 @@
}
/**
-* Try to acquire a e-mail address in the request queue for insertion
+* Try to acquire an email address in the request queue for insertion
* @return bool
*/
public static function acquireEmail( $email ) {
diff --git a/frontend/language/ConfirmAccount.i18n.php
b/frontend/language/ConfirmAccount.i18n.php
index 8f7337e..e822ce4 100644
--- a/frontend/language/ConfirmAccount.i18n.php
+++ b/frontend/language/ConfirmAccount.i18n.php
@@ -10,7 +10,7 @@
$messages['en'] = array(
# Site message for admins
- 'confirmaccount-newrequests' = '\'\'\'$1\'\'\' open e-mail confirmed
[[Special:ConfirmAccounts|account {{PLURAL:$1|request is pending|requests are
pending}}]]. \'\'\'Your attention is needed!\'\'\'',
+ 'confirmaccount-newrequests' = '\'\'\'$1\'\'\' open email confirmed
[[Special:ConfirmAccounts|account {{PLURAL:$1|request is pending|requests are
pending}}]]. \'\'\'Your attention is needed!\'\'\'',
# Add to Special:Login
'requestaccount-loginnotice' = 'To obtain a user account, you must
\'\'\'[[Special:RequestAccount|request one]]\'\'\'.',
diff --git a/frontend/language/ConfirmAccountPage.i18n.php
b/frontend/language/ConfirmAccountPage.i18n.php
index 2214249..18bb940 100644
--- a/frontend/language/ConfirmAccountPage.i18n.php
+++ b/frontend/language/ConfirmAccountPage.i18n.php
@@ -39,7 +39,7 @@
'confirmaccount-none-r' = 'There are currently no recently rejected
account requests in this list.',
'confirmaccount-none-e' = 'There are currently no expired account
requests in this list.',
'confirmaccount-real-q' = 'Name',
- 'confirmaccount-email-q' = 'E-mail',
+ 'confirmaccount-email-q' = 'Email',
'confirmaccount-bio-q'= 'Biography',
'confirmaccount-showopen' = 'open requests',
'confirmaccount-showrej' = 'rejected requests',
@@ -65,7 +65,7 @@
'confirmaccount-leg-ip' = 'IP address data',
'confirmaccount-name' = 'Username',
'confirmaccount-real' = 'Name:',
- 'confirmaccount-email'= 'E-mail:',
+ 'confirmaccount-email'= 'Email:',
'confirmaccount-reqtype' = 'Position:',
'confirmaccount-pos-0'= 'author',
'confirmaccount-pos-1'= 'editor',
@@ -85,8 +85,8 @@
'confirmaccount-create' = 'Accept (create account)',
'confirmaccount-deny' = 'Reject (delist)',
'confirmaccount-hold' = 'Hold',
- 'confirmaccount-spam' = 'Spam (do not send e-mail)',
- 'confirmaccount-reason' = 'Comment (will be included in e-mail):',
+ 'confirmaccount-spam' = 'Spam (do not send email)',
+ 'confirmaccount-reason' = 'Comment (will be included in email):',
'confirmaccount-ip' = 'IP address:',
'confirmaccount-xff' = 'X-Forwarded-For:',
'confirmaccount-agent'= 'User-Agent:',
diff --git a/frontend/language/RequestAccountPage.i18n.php
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...CommunityHiring)
Siebrand has submitted this change and it was merged. Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: Idfb53f4cd05a81ba9f9735b4922e310c071b7f57 --- M CommunityHiring.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/CommunityHiring.i18n.php b/CommunityHiring.i18n.php index 303d490..cc80283 100644 --- a/CommunityHiring.i18n.php +++ b/CommunityHiring.i18n.php @@ -12,7 +12,7 @@ 'communityhiring-address-postal' = 'Postal Code: (Optional)', 'communityhiring-address-country' = 'Country:', 'communityhiring-phone' = 'Phone: (Optional)', - 'communityhiring-email' = 'E-mail:', + 'communityhiring-email' = 'Email address:', 'communityhiring-paragraphs' = 'Wikimedia', 'communityhiring-paragraphs-intro' = 'Please answer the next questions with a single, well thought out paragraph.', 'communityhiring-significance' = 'Tell us how you see the significance of Wikimedia communities in the world.', -- To view, visit https://gerrit.wikimedia.org/r/51130 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idfb53f4cd05a81ba9f9735b4922e310c071b7f57 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CommunityHiring Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...Configure)
Siebrand has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Id97cc19152d8f82e2c1e7525de00be519bb1b599
---
M Configure.i18n.php
M settings/Settings.i18n.php
2 files changed, 23 insertions(+), 23 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/Configure.i18n.php b/Configure.i18n.php
index d097be4..f1ece8e 100644
--- a/Configure.i18n.php
+++ b/Configure.i18n.php
@@ -81,8 +81,8 @@
'configure-section-mysql' = 'MySQL specific',
'configure-section-postgres' = 'PostgreSQL specific',
'configure-section-sqlite'= 'SQLite specific',
- 'configure-section-email' = 'E-mail',
- 'configure-section-enotif'= 'E-mail notification',
+ 'configure-section-email' = 'Email',
+ 'configure-section-enotif'= 'Email notification',
'configure-section-localization' = 'Localisation',
'configure-section-timezone' = 'Time zone',
'configure-section-html' = 'HTML',
@@ -190,7 +190,7 @@
'configure-condition-requirement' = 'Requirement',
'configure-condition-name-1' = 'Minimal edit count',
'configure-condition-name-2' = 'Minimal age',
- 'configure-condition-name-3' = 'E-mail confirmed',
+ 'configure-condition-name-3' = 'Email confirmed',
'configure-condition-name-4' = 'In groups',
'configure-condition-name-5' = 'User\'s IP address',
'configure-condition-name-6' = 'User\'s IP address in CIDR
range',
@@ -199,7 +199,7 @@
'configure-condition-description-1' = 'Minimum edit count of $1',
'configure-condition-description-2' = 'Minimum account age of $1
{{PLURAL:$1|second|seconds}}',
- 'configure-condition-description-3' = 'E-mail confirmed',
+ 'configure-condition-description-3' = 'Email confirmed',
'configure-condition-description-4' = 'In all of the groups $1',
'configure-condition-description-5' = 'User\'s IP address is $1',
'configure-condition-description-6' = 'User\'s IP address in $1
range',
diff --git a/settings/Settings.i18n.php b/settings/Settings.i18n.php
index a6e9800..9a99f39 100644
--- a/settings/Settings.i18n.php
+++ b/settings/Settings.i18n.php
@@ -183,8 +183,8 @@
'configure-setting-wgAutoblockExpiry' = 'Number of seconds before
autoblock entries expire',
'configure-setting-wgDeleteRevisionsLimit' = Integer of how many
revisions a page must have before the ''bigdelete'' right is required to delete
it,
'configure-setting-wgDisabledActions' = 'Disabled page actions',
- 'configure-setting-wgNewPasswordExpiry' = 'The time, in seconds, when
an e-mailed temporary password expires',
- 'configure-setting-wgEmailConfirmToEdit' = 'Require users to confirm
e-mail address before they can edit',
+ 'configure-setting-wgNewPasswordExpiry' = 'The time, in seconds, when
an emailed temporary password expires',
+ 'configure-setting-wgEmailConfirmToEdit' = 'Require users to confirm
email address before they can edit',
'configure-setting-wgEnableAPI' = 'Enable API',
'configure-setting-wgEnableWriteAPI' = 'Enable Write API',
'configure-setting-wgImplicitGroups' = 'Groups which are not shown on
[[Special:ListUsers]] et al',
@@ -196,18 +196,18 @@
'configure-setting-wgSpamRegex' = 'Spam filter regular expressions',
'configure-setting-wgSummarySpamRegex' = 'Spam filter regular
expressions for edit summaries',
'configure-setting-wgWhitelistRead' = 'Pages anonymous user may see',
- 'configure-setting-wgEmailAuthentication' = 'Require authentication of
e-mail addresses for e-mail functions',
- 'configure-setting-wgEmergencyContact' = 'Site administrator e-mail
address',
- 'configure-setting-wgEnableEmail' = 'Enable e-mail features',
- 'configure-setting-wgEnableUserEmail' = 'Enable user-to-user e-mail',
- 'configure-setting-wgNoReplyAddress' = 'Dummy address which should be
accepted during e-mail send action',
- 'configure-setting-wgPasswordSender' = 'Password reminder e-mail
address',
+ 'configure-setting-wgEmailAuthentication' = 'Require authentication of
email addresses for email functions',
+ 'configure-setting-wgEmergencyContact' = 'Site administrator email
address',
+ 'configure-setting-wgEnableEmail' = 'Enable emailfeatures',
+ 'configure-setting-wgEnableUserEmail' = 'Enable user-to-user email',
+ 'configure-setting-wgNoReplyAddress' = 'Dummy address which should be
accepted during email send action',
+ 'configure-setting-wgPasswordSender' = 'Password reminder email
address',
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ContactPage)
Siebrand has submitted this change and it was merged. Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: Id7868cc91c0ca1929500b4c1cfeec62281ab2bb0 --- M ContactPage.i18n.php M ContactPage.php 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/ContactPage.i18n.php b/ContactPage.i18n.php index 8022a6a..9a6da41 100644 --- a/ContactPage.i18n.php +++ b/ContactPage.i18n.php @@ -19,16 +19,16 @@ 'contactpage-desc' = '[[Special:Contact|Contact form for visitors]]', 'contactpage-title' = 'Contact', 'contactpage-pagetext' = 'Please use the form below to contact us.', - 'contactpage-legend' = 'Send e-mail', + 'contactpage-legend' = 'Send email', 'contactpage-defsubject' = 'Contact message', 'contactpage-subject-and-sender' = '$1 (from $2)', 'contactpage-subject-and-sender-withip' = '$1 (from $2 at $3)', 'contactpage-fromname' = 'Your name: *', - 'contactpage-fromaddress' = 'Your e-mail: **', + 'contactpage-fromaddress' = 'Your email address: **', 'contactpage-formfootnotes' = '* optionalbr / ** optional but needed if you want an answer', 'contactpage-fromname-required' = 'Your name:', - 'contactpage-fromaddress-required' = 'Your e-mail:', + 'contactpage-fromaddress-required' = 'Your email address:', 'contactpage-formfootnotes-required' = 'All fields are required.', 'contactpage-captcha' = 'To send the message, please solve the captcha ([[Special:Captcha/help|more info]])', 'contactpage-captcha-failed' = 'Captcha test failed! ([[Special:Captcha/help|more info]])', diff --git a/ContactPage.php b/ContactPage.php index e736f74..b2ba057 100644 --- a/ContactPage.php +++ b/ContactPage.php @@ -35,15 +35,15 @@ # Configuration // Name of a registered wiki user who will receive the mails $wgContactUser = null; -// E-mail address used as the sender of the contact email, if the visitor does +// Email address used as the sender of the contact email, if the visitor does // not supply an email address. Defaults to $wgEmergencyContact. $wgContactSender = null; // The name to be used with $wgContactSender. -// This will be shown in the recipient's e-mail program +// This will be shown in the recipient's email program $wgContactSenderName = 'Contact Form on ' . $wgSitename; -// If true, users will be required to supply a name and an e-mail address +// If true, users will be required to supply a name and an email address // on Special:Contact. $wgContactRequireAll = false; -- To view, visit https://gerrit.wikimedia.org/r/51134 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id7868cc91c0ca1929500b4c1cfeec62281ab2bb0 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/ContactPage Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ContributionTracking)
Siebrand has submitted this change and it was merged. Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: I65ac9a0c8fee1c6465fdbe7eb0cad1219d80ae79 --- M ApiContributionTracking.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/ApiContributionTracking.php b/ApiContributionTracking.php index 6dd90e4..3bdecca 100644 --- a/ApiContributionTracking.php +++ b/ApiContributionTracking.php @@ -161,7 +161,7 @@ 'utm_campaign' = 'String identifying utm_campaign', 'utm_key' = 'String identifying utm_key', 'payments_form' = 'String identifying the form on the payments cluster through which the donation was made', - 'email-opt' = 'Boolean assumed to be from a checkbox. This is actually the inverse of the E-mail opt-out checkbox.', + 'email-opt' = 'Boolean assumed to be from a checkbox. This is actually the inverse of the email opt-out checkbox.', 'language' = array( 'User language code. Messages will be translated appropriately (where possible).', 'This will also determine what Thank You page the user sees upon completion of a donation at the gateway.' ), -- To view, visit https://gerrit.wikimedia.org/r/51137 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I65ac9a0c8fee1c6465fdbe7eb0cad1219d80ae79 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContributionTracking Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...ContactPageFundraiser)
Siebrand has submitted this change and it was merged. Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: Ifaedb5c515f8ac78f38d655b0d849b3f428b6d98 --- M ContactPage.i18n.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/ContactPage.i18n.php b/ContactPage.i18n.php index 647303c..06664f6 100644 --- a/ContactPage.i18n.php +++ b/ContactPage.i18n.php @@ -20,11 +20,11 @@ 'contactpage-defsubject' = 'Contact Message', 'contactpage-subject-and-sender' = '$1 (from $2)', 'contactpage-fromname' = 'your name *', - 'contactpage-fromaddress' = 'your e-mail **', + 'contactpage-fromaddress' = 'your email address **', 'contactpage-formfootnotes' = '* optionalbr / ** optional but needed if you want an answer', 'contactpage-fromname-required' = 'your name', - 'contactpage-fromaddress-required' = 'your e-mail', + 'contactpage-fromaddress-required' = 'your email address', 'contactpage-formfootnotes-required' = 'All fields are required.', 'contactpage-captcha' = 'To send the message, please solve the captcha ([[Special:Captcha/help|more info]])', 'contactpage-captcha-failed' = 'Captcha test failed! ([[Special:Captcha/help|more info]])', -- To view, visit https://gerrit.wikimedia.org/r/51135 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifaedb5c515f8ac78f38d655b0d849b3f428b6d98 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContactPageFundraiser Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (wikimedia...DonationEmailUnsubscribe)
Siebrand has submitted this change and it was merged. Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: Icfb8b252c5cee0ccd7ce716c9cff59171ef7a9b0 --- M FundraiserUnsubscribe.i18n.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/FundraiserUnsubscribe.i18n.php b/FundraiserUnsubscribe.i18n.php index ea18f25..4ce3b61 100644 --- a/FundraiserUnsubscribe.i18n.php +++ b/FundraiserUnsubscribe.i18n.php @@ -13,14 +13,14 @@ 'fundraiserunsubscribe' = 'Unsubscribe from Wikimedia Fundraising Email', 'fundraiserunsubscribe-query' = Are you sure you want to unsubscribe '$1'?, - 'fundraiserunsubscribe-info' = 'This will opt you out of e-mails from the Wikimedia Foundation sent to you as a donor. You may still receive e-mails to this e-mail address if it is associated with an account on one of our projects. If you have any questions, please contact [mailto:$1 $1].', + 'fundraiserunsubscribe-info' = 'This will opt you out of emails from the Wikimedia Foundation sent to you as a donor. You may still receive emails to this email address if it is associated with an account on one of our projects. If you have any questions, please contact [mailto:$1 $1].', 'fundraiserunsubscribe-submit' = 'Unsubscribe', 'fundraiserunsubscribe-cancel' = 'Cancel', 'fundraiserunsubscribe-errormsg' = 'An error occured while attempting to process your request. Please contact [mailto:$1 $1].', 'fundraiserunsubscribe-success' = 'You have successfully been removed from our mailing list.', - 'fundraiserunsubscribe-sucesswarning' = 'Please allow up to four (4) days for the changes to take effect. We apologize for any e-mails you receive during this time. If you have any questions, please contact [mailto:$1 $1].', + 'fundraiserunsubscribe-sucesswarning' = 'Please allow up to four (4) days for the changes to take effect. We apologize for any emails you receive during this time. If you have any questions, please contact [mailto:$1 $1].', ); $messages['qqq'] = array( @@ -33,7 +33,7 @@ 'fundraiserunsubscribe-submit' = 'Label for button which will unsubscribe them from the fundraising email list.', 'fundraiserunsubscribe-cancel' = 'Label for button which will cancel the unsubscribe process and redirect them to the WMF homepage', - 'fundraiserunsubscribe-errormsg' = 'Text to display if the unsubscribe failed. Link to e-mail address:$1 for more support.', + 'fundraiserunsubscribe-errormsg' = 'Text to display if the unsubscribe failed. Link to email address:$1 for more support.', 'fundraiserunsubscribe-success' = 'Message indicating that everything that can be done to unsubscribe them has been done.', 'fundraiserunsubscribe-sucesswarning' = 'Notification to the user that there might be some manual operations or ongoing things that will take time to clear. Will always be shown with fundraiserunsubscribe-success. $1 is an email address for them to contact if they have further questions.', -- To view, visit https://gerrit.wikimedia.org/r/51138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icfb8b252c5cee0ccd7ce716c9cff59171ef7a9b0 Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/fundraising/DonationEmailUnsubscribe Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...GlobalBlocking)
Siebrand has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: I40d731998e37ca62de326475ab49c1e1b054c81e
---
M GlobalBlocking.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/GlobalBlocking.i18n.php b/GlobalBlocking.i18n.php
index 7403b31..748d366 100644
--- a/GlobalBlocking.i18n.php
+++ b/GlobalBlocking.i18n.php
@@ -111,7 +111,7 @@
* Expiry of block: $5
You can contact $1 to discuss the block.
-You cannot use the \{{int:emailuser}}\ feature unless a valid e-mail address
is specified in your [[Special:Preferences|account preferences]] and you have
not been blocked from using it.
+You cannot use the \{{int:emailuser}}\ feature unless a valid email address
is specified in your [[Special:Preferences|account preferences]] and you have
not been blocked from using it.
Your current IP address is $6.
Please include all above details in any queries you make.,
'globalblocking-blocked-nopassreset' = You cannot reset user's
passwords because you are blocked globally.,
--
To view, visit https://gerrit.wikimedia.org/r/51143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40d731998e37ca62de326475ab49c1e1b054c81e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...EmailCapture)
Siebrand has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Id9358d468d9ed06a6ae4f5d26d6b825cb0950be9
---
M EmailCapture.i18n.php
1 file changed, 10 insertions(+), 10 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/EmailCapture.i18n.php b/EmailCapture.i18n.php
index bec9515..d4b11be 100644
--- a/EmailCapture.i18n.php
+++ b/EmailCapture.i18n.php
@@ -12,17 +12,17 @@
* @author Trevor Parscal
*/
$messages['en'] = array(
- 'emailcapture' = 'E-mail verification',
- 'emailcapture-desc' = 'Capture e-mail addresses, and allow users to
verify them through e-mail',
- 'emailcapture-failure' = Your e-mail was '''not''' verified.,
+ 'emailcapture' = 'Email verification',
+ 'emailcapture-desc' = 'Capture email addresses, and allow users to
verify them through email',
+ 'emailcapture-failure' = Your email was '''not''' verified.,
'emailcapture-invalid-code' = 'Invalid confirmation code.',
- 'emailcapture-already-confirmed' = 'Your e-mail address has already
been confirmed.',
- 'emailcapture-response-subject' = '{{SITENAME}} e-mail address
verification',
+ 'emailcapture-already-confirmed' = 'Your email address has already
been confirmed.',
+ 'emailcapture-response-subject' = '{{SITENAME}} email address
verification',
'emailcapture-response-body' = 'Hello!
Thank you for expressing interest in helping to improve {{SITENAME}}.
-Please take a moment to confirm your e-mail by clicking on the link below:
+Please take a moment to confirm your email by clicking on the link below:
$1
You may also visit:
@@ -33,13 +33,13 @@
We’ll be in touch shortly with how you can help improve {{SITENAME}}.
-If you didn’t initiate this request, please ignore this e-mail and we won’t
send you anything else.',
+If you didn’t initiate this request, please ignore this email and we won’t
send you anything else.',
'emailcapture-success' = 'Thank you!
-Your e-mail has been successfully confirmed.',
- 'emailcapture-instructions' = 'To verify your e-mail address, enter
the code that was e-mailed to you and click {{int:emailcapture-submit}}.',
+Your email has been successfully confirmed.',
+ 'emailcapture-instructions' = 'To verify your email address, enter the
code that was emailed to you and click {{int:emailcapture-submit}}.',
'emailcapture-verify' = 'Verification code:',
- 'emailcapture-submit' = 'Verify e-mail address',
+ 'emailcapture-submit' = 'Verify email address',
);
/** Message documentation (Message documentation)
--
To view, visit https://gerrit.wikimedia.org/r/51142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id9358d468d9ed06a6ae4f5d26d6b825cb0950be9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EmailCapture
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...Listings)
Siebrand has submitted this change and it was merged. Change subject: (bug 45461) Use email instead of e-mail .. (bug 45461) Use email instead of e-mail Change-Id: I7cff10a9fe91352b8cc21c304d1eb8e2844b85d4 --- M Listings.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/Listings.i18n.php b/Listings.i18n.php index c5444de..1019a41 100644 --- a/Listings.i18n.php +++ b/Listings.i18n.php @@ -15,7 +15,7 @@ 'listings-phone-symbol' = '☎', 'listings-fax' = 'fax', 'listings-fax-symbol'= '', - 'listings-email' = 'e-mail', + 'listings-email' = 'email', 'listings-email-symbol' = '', 'listings-tollfree' = 'toll-free', 'listings-tollfree-symbol' = '', -- To view, visit https://gerrit.wikimedia.org/r/51145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7cff10a9fe91352b8cc21c304d1eb8e2844b85d4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Listings Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki...WikiLove)
Siebrand has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Ie64a457d0323049c5932e3bb0fb22bdd0e2d4dd0
---
M ApiWikiLove.php
M WikiLove.i18n.php
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/ApiWikiLove.php b/ApiWikiLove.php
index 78282d2..83ea8f1 100644
--- a/ApiWikiLove.php
+++ b/ApiWikiLove.php
@@ -121,7 +121,7 @@
try {
$api-execute();
} catch( DBQueryError $dbqe ) {
- $this-setWarning( 'E-mail was not sent' );
+ $this-setWarning( 'Email was not sent' );
}
wfProfileOut( __METHOD__ );
}
@@ -165,8 +165,8 @@
'or when on a MediaWiki page through
mw.user.tokens',
),
'subject' = 'Subject header of the new section',
- 'email' = array( 'Content of the optional e-mail
message to send to the user.',
- 'A warning will be returned if the user cannot
be e-mailed. WikiLove will be sent to user talk page either way.',
+ 'email' = array( 'Content of the optional email
message to send to the user.',
+ 'A warning will be returned if the user cannot
be emailed. WikiLove will be sent to user talk page either way.',
),
'type' = array( 'Type of WikiLove (for statistics);
this corresponds with a type',
'selected in the left menu, and optionally a
subtype after that',
diff --git a/WikiLove.i18n.php b/WikiLove.i18n.php
index e3ca1c3..12454f6 100644
--- a/WikiLove.i18n.php
+++ b/WikiLove.i18n.php
@@ -33,7 +33,7 @@
'wikilove-image-example' = '(example: Trophy.png)',
'wikilove-button-preview' = 'Preview',
'wikilove-preview' = 'Preview',
- 'wikilove-notify' = 'Notify the user by e-mail',
+ 'wikilove-notify' = 'Notify the user by email',
'wikilove-button-send' = 'Send WikiLove',
'wikilove-type-barnstars' = 'Barnstars',
'wikilove-barnstar-header' = 'A barnstar for you!',
--
To view, visit https://gerrit.wikimedia.org/r/51155
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie64a457d0323049c5932e3bb0fb22bdd0e2d4dd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLove
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45461) Use email instead of e-mail - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45461) Use email instead of e-mail
..
(bug 45461) Use email instead of e-mail
Change-Id: Iae47a24127b4bdd4ef308bdbd5be865217eb14f1
---
M languages/messages/MessagesEn.php
M maintenance/language/messages.inc
2 files changed, 119 insertions(+), 119 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 68d5968..9ea15cd 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -660,10 +660,10 @@
'tog-previewontop'= 'Show preview before edit box',
'tog-previewonfirst' = 'Show preview on first edit',
'tog-nocache' = 'Disable browser page caching',
-'tog-enotifwatchlistpages'= 'E-mail me when a page or file on my
watchlist is changed',
-'tog-enotifusertalkpages' = 'E-mail me when my user talk page is changed',
-'tog-enotifminoredits'= 'E-mail me also for minor edits of pages and
files',
-'tog-enotifrevealaddr'= 'Reveal my e-mail address in notification
e-mails',
+'tog-enotifwatchlistpages'= 'Email me when a page or file on my watchlist
is changed',
+'tog-enotifusertalkpages' = 'Email me when my user talk page is changed',
+'tog-enotifminoredits'= 'Email me also for minor edits of pages and
files',
+'tog-enotifrevealaddr'= 'Reveal my email address in notification
emails',
'tog-shownumberswatching' = 'Show the number of watching users',
'tog-oldsig' = 'Existing signature:',
'tog-fancysig'= 'Treat signature as wikitext (without an
automatic link)',
@@ -678,7 +678,7 @@
'tog-watchlisthideliu'= 'Hide edits by logged in users from the
watchlist',
'tog-watchlisthideanons' = 'Hide edits by anonymous users from the
watchlist',
'tog-watchlisthidepatrolled' = 'Hide patrolled edits from the watchlist',
-'tog-ccmeonemails'= 'Send me copies of e-mails I send to other
users',
+'tog-ccmeonemails'= 'Send me copies of emails I send to other
users',
'tog-diffonly'= 'Do not show page content below diffs',
'tog-showhiddencats' = 'Show hidden categories',
'tog-noconvertlink' = 'Disable link title conversion', # only
translate this message to other languages if you have to change it
@@ -1097,7 +1097,7 @@
'gotaccount' = 'Already have an account? $1.',
'gotaccountlink' = 'Log in',
'userlogin-resetlink'= 'Forgotten your login details?',
-'createaccountmail' = 'Use a temporary random password and send it
to the e-mail address specified below',
+'createaccountmail' = 'Use a temporary random password and send it
to the email address specified below',
'createaccountreason'= 'Reason:',
'badretype' = 'The passwords you entered do not match.',
'userexists' = 'Username entered already in use.
@@ -1131,7 +1131,7 @@
'passwordtooshort' = 'Passwords must be at least {{PLURAL:$1|1
character|$1 characters}}.',
'password-name-match'= 'Your password must be different from your
username.',
'password-login-forbidden' = 'The use of this username and password has
been forbidden.',
-'mailmypassword' = 'E-mail new password',
+'mailmypassword' = 'Email new password',
'passwordremindertitle' = 'New temporary password for {{SITENAME}}',
'passwordremindertext' = 'Someone (probably you, from IP address $1)
requested a new
password for {{SITENAME}} ($4). A temporary password for user
@@ -1142,13 +1142,13 @@
If someone else made this request, or if you have remembered your password,
and you no longer wish to change it, you may ignore this message and
continue using your old password.',
-'noemail'= 'There is no e-mail address recorded for user
$1.',
-'noemailcreate' = 'You need to provide a valid e-mail address',
-'passwordsent' = 'A new password has been sent to the e-mail
address registered for $1.
+'noemail'= 'There is no email address recorded for user
$1.',
+'noemailcreate' = 'You need to provide a valid email address',
+'passwordsent' = 'A new password has been sent to the email
address registered for $1.
Please log in again after you receive it.',
'blocked-mailpassword' = 'Your IP address is blocked from editing, and
so is not allowed to use the password recovery function to prevent abuse.',
-'eauthentsent' = 'A confirmation e-mail has been sent to the
nominated e-mail address.
-Before any other e-mail is sent to the account, you will have to follow the
instructions in the e-mail, to confirm that the account is actually yours.',
+'eauthentsent'
[MediaWiki-commits] [Gerrit] (hot fix) include ask extension if available - change (mediawiki...Wikibase)
Daniel Werner has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51157
Change subject: (hot fix) include ask extension if available
..
(hot fix) include ask extension if available
Ask extension is required in experimental mode right now, so we include it, if
its there.
This fix is marked as hot fix since all tests are currently failing with
experimental mode enabled.
Change-Id: I94e89333d5bc1ee6f6e8d698ef67f354a83a6c3a
---
M lib/INSTALL
M lib/RELEASE-NOTES
M lib/WikibaseLib.php
3 files changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/57/51157/1
diff --git a/lib/INSTALL b/lib/INSTALL
index ebd31bc..ea3285a 100644
--- a/lib/INSTALL
+++ b/lib/INSTALL
@@ -11,6 +11,7 @@
* MediaWiki 1.21 or later
* PHP 5.3 or later
* Diff 0.1 or later
+* Ask 0.1 or later (if experimental features are enabled)
* DataValues 0.1 or later
* DataTypes 0.1 or later
* ValueParsers 0.1 or later
diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES
index 057c0fe..80d6592 100644
--- a/lib/RELEASE-NOTES
+++ b/lib/RELEASE-NOTES
@@ -21,6 +21,11 @@
* StatementObject class and Statement interface changed to Statement class
* Moved all Serializer code into Wikibase\Lib\Serializers
+; Requirements
+
+* If experimental features are enabled, then this will depends on Ask
extension now. See Extension page on mediawiki.org:
https://www.mediawiki.org/wiki/Extension:Ask
+
+
=== Version 0.3 ===
(???)
@@ -36,6 +41,7 @@
* Added reference hash based methods to References
* Added unserialization support to SnakSerializer
+
=== Version 0.2 ===
(???)
@@ -45,6 +51,7 @@
* Added TemplateStore
* Added Term interface
+
=== Version 0.1 ===
(2012-11-01)
diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index abe0c98..0a9987f 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -45,6 +45,11 @@
@include_once( __DIR__ . '/../../DataValues/DataValues.php' );
}
+// Include the Ask extension if that hasn't been done yet, since it's required
for WikibaseLib to work.
+if ( !defined( 'Ask_VERSION' ) ) {
+ @include_once( __DIR__ . '/../../Ask/Ask.php' );
+}
+
$dependencies = array(
'Diff_VERSION' = 'Diff',
'DataValues_VERSION' = 'DataValues',
--
To view, visit https://gerrit.wikimedia.org/r/51157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94e89333d5bc1ee6f6e8d698ef67f354a83a6c3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner daniel.wer...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Re-registering onBeforePageDisplay hook - change (mediawiki...Wikibase)
Daniel Werner has submitted this change and it was merged.
Change subject: Re-registering onBeforePageDisplay hook
..
Re-registering onBeforePageDisplay hook
Change I032208726699d104c8ee76ef97e3f61b5f78f334 seems to have accidentally
removed the
onBeforePageDisplay hook from the Wikibase.php file preventing the native
search box
being replaced by the entity selector widget.
Change-Id: Ib515bdb8ddc01072f5965b30aa12556a6821c9e9
---
M repo/Wikibase.hooks.php
M repo/Wikibase.php
2 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
Daniel Werner: Verified; Looks good to me, approved
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index c1c7b88..b8213f3 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -37,9 +37,12 @@
final class RepoHooks {
/**
* Handler for the BeforePageDisplay hook, simply injects
wikibase.ui.entitysearch module
+* replacing the native search box with the entity selector widget.
*
* @since 0.4
*
+* @param \OutputPage $out
+* @param \Skin $skin
* @return boolean
*/
public static function onBeforePageDisplay( \OutputPage $out, \Skin
$skin ) {
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 2111cee..15d7d6b 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -254,7 +254,8 @@
// Hooks
-$wgHooks['WikibaseDefaultSettings'][] =
'Wikibase\RepoHooks::onWikibaseDefaultSettings';
+$wgHooks['BeforePageDisplay'][]
= 'Wikibase\RepoHooks::onBeforePageDisplay';
+$wgHooks['WikibaseDefaultSettings'][] =
'Wikibase\RepoHooks::onWikibaseDefaultSettings';
$wgHooks['LoadExtensionSchemaUpdates'][] =
'Wikibase\RepoHooks::onSchemaUpdate';
$wgHooks['UnitTestsList'][]=
'Wikibase\RepoHooks::registerUnitTests';
$wgHooks['NamespaceIsMovable'][] =
'Wikibase\RepoHooks::onNamespaceIsMovable';
--
To view, visit https://gerrit.wikimedia.org/r/50915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib515bdb8ddc01072f5965b30aa12556a6821c9e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Daniel Werner daniel.wer...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove href link to Special:CreateItem for none link in client - change (mediawiki...Wikibase)
Daniel Werner has submitted this change and it was merged. Change subject: Remove href link to Special:CreateItem for none link in client .. Remove href link to Special:CreateItem for none link in client - a page may have (none) link but already be linked to an item with only one site link - if we do put a link, then we need to do it differently Change-Id: I33b159de87dd4f9ff27faabbdeba5f6e2a199385 --- M client/WikibaseClient.hooks.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Daniel Werner: Verified; Looks good to me, approved diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php index 198f95b..4ee53b8 100644 --- a/client/WikibaseClient.hooks.php +++ b/client/WikibaseClient.hooks.php @@ -607,7 +607,6 @@ // Placeholder in case the page doesn't have any langlinks yet // self::onBeforePageDisplay adds the JavaScript module which will overwrite this with a link $template-data['language_urls'][] = array( - 'href' = ClientUtils::repoArticleUrl( Special:CreateItem/$siteId/$titleText ), 'text' = wfMessage( 'parentheses', wfMessage( 'wikibase-nolanglinks' )-escaped() ), 'id' = 'wbc-linkToItem', 'class' = 'wbc-editpage', -- To view, visit https://gerrit.wikimedia.org/r/50944 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I33b159de87dd4f9ff27faabbdeba5f6e2a199385 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Daniel Werner daniel.wer...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Preparing the config for 2013.02 release - change (translatewiki)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/51158 Change subject: Preparing the config for 2013.02 release .. Preparing the config for 2013.02 release Change-Id: I869a2e225bce63fbe55b86b6a80fd5c411e160de --- M melange/config.ini 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/58/51158/1 diff --git a/melange/config.ini b/melange/config.ini index 73acd47..f4aa65b 100644 --- a/melange/config.ini +++ b/melange/config.ini @@ -2,8 +2,8 @@ mediawikirepo=ssh://nikerab...@gerrit.wikimedia.org:29418/mediawiki/core.git extensionrepo=ssh://nikerab...@gerrit.wikimedia.org:29418/mediawiki/extensions/ branches=origin/master origin/REL1_20 origin/REL1_19 -releasever=2012.12 -releasever-prev=2012.11 +releasever=2013.02 +releasever-prev=2013.01 bundlename=MediaWiki language extension bundle downloadurl=https://translatewiki.net/mleb hasher=sha256sum @@ -18,8 +18,8 @@ cldr=origin/master CleanChanges=origin/master LocalisationUpdate=origin/master -Translate=efa70e2 -UniversalLanguageSelector=origin/master +Translate=origin/master +UniversalLanguageSelector=2012.12 [install] dbname=melange -- To view, visit https://gerrit.wikimedia.org/r/51158 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I869a2e225bce63fbe55b86b6a80fd5c411e160de Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update ms-be12 entries in dhcp, site, clean up other ms-be e... - change (operations/puppet)
ArielGlenn has submitted this change and it was merged.
Change subject: update ms-be12 entries in dhcp, site, clean up other ms-be
entries
..
update ms-be12 entries in dhcp, site, clean up other ms-be entries
Change-Id: I0b736f0d15d6045a8cdafb8bca3ee5196c9f1527
---
M files/dhcpd/linux-host-entries.ttyS1-115200
M manifests/site.pp
2 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200
b/files/dhcpd/linux-host-entries.ttyS1-115200
index 811178a..87329ef 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1511,7 +1511,7 @@
}
host ms-be12 {
- hardware ethernet 04:7D:7B:2E:2E:7A;
+ hardware ethernet 90:B1:1C:18:AA:93;
fixed-address ms-be12.pmtpa.wmnet;
}
diff --git a/manifests/site.pp b/manifests/site.pp
index c23c237..f90a5ac 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1506,7 +1506,7 @@
node /^ms-be(3|[5-8]|10)\.pmtpa\.wmnet$/ {
# the ms-be hosts that are 720xds with ssds have two more disks
- # but they show up as m and n, those get the OS
+ # but with the h310s they show up as m and n, those get the OS
$all_drives = [ '/dev/sda', '/dev/sdb', '/dev/sdc', '/dev/sdd',
'/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh', '/dev/sdi',
'/dev/sdj',
'/dev/sdk', '/dev/sdl' ]
@@ -1521,8 +1521,9 @@
swift::mount_filesystem{ '/dev/sdn3': }
}
-node /^ms-be11\.pmtpa\.wmnet$/ {
+node /^ms-be(11|12)\.pmtpa\.wmnet$/ {
# the ms-be hosts with ssds have two more disks
+ # this is the 720xds with h710 layout
$all_drives = [ '/dev/sdc', '/dev/sdd', '/dev/sde',
'/dev/sdf', '/dev/sdg', '/dev/sdh', '/dev/sdi', '/dev/sdj',
'/dev/sdk',
'/dev/sdl', '/dev/sdm', '/dev/sdn' ]
@@ -1537,8 +1538,9 @@
swift::mount_filesystem{ '/dev/sdb3': }
}
-node /^ms-be1([1-2]|[4-9])\.pmtpa\.wmnet$/ {
+node /^ms-be(1|2|4|9)\.pmtpa\.wmnet$/ {
# the ms-be hosts with ssds have two more disks
+ # these are the c2100s, to be gone soon
$all_drives = [ '/dev/sdc', '/dev/sdd', '/dev/sde',
'/dev/sdf', '/dev/sdg', '/dev/sdh', '/dev/sdi', '/dev/sdj',
'/dev/sdk',
'/dev/sdl', '/dev/sdm', '/dev/sdn' ]
--
To view, visit https://gerrit.wikimedia.org/r/51128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b736f0d15d6045a8cdafb8bca3ee5196c9f1527
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] automatically include ask extension if available - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: automatically include ask extension if available
..
automatically include ask extension if available
Ask extension is required in experimental mode right now, so we include it, if
its there.
Currently, all tests are failing with experimental mode enabled if the ask
extension is not enabled.
Change-Id: I94e89333d5bc1ee6f6e8d698ef67f354a83a6c3a
---
M lib/INSTALL
M lib/RELEASE-NOTES
M lib/WikibaseLib.php
3 files changed, 13 insertions(+), 0 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/lib/INSTALL b/lib/INSTALL
index ebd31bc..ea3285a 100644
--- a/lib/INSTALL
+++ b/lib/INSTALL
@@ -11,6 +11,7 @@
* MediaWiki 1.21 or later
* PHP 5.3 or later
* Diff 0.1 or later
+* Ask 0.1 or later (if experimental features are enabled)
* DataValues 0.1 or later
* DataTypes 0.1 or later
* ValueParsers 0.1 or later
diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES
index 057c0fe..80d6592 100644
--- a/lib/RELEASE-NOTES
+++ b/lib/RELEASE-NOTES
@@ -21,6 +21,11 @@
* StatementObject class and Statement interface changed to Statement class
* Moved all Serializer code into Wikibase\Lib\Serializers
+; Requirements
+
+* If experimental features are enabled, then this will depends on Ask
extension now. See Extension page on mediawiki.org:
https://www.mediawiki.org/wiki/Extension:Ask
+
+
=== Version 0.3 ===
(???)
@@ -36,6 +41,7 @@
* Added reference hash based methods to References
* Added unserialization support to SnakSerializer
+
=== Version 0.2 ===
(???)
@@ -45,6 +51,7 @@
* Added TemplateStore
* Added Term interface
+
=== Version 0.1 ===
(2012-11-01)
diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index abe0c98..0a9987f 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -45,6 +45,11 @@
@include_once( __DIR__ . '/../../DataValues/DataValues.php' );
}
+// Include the Ask extension if that hasn't been done yet, since it's required
for WikibaseLib to work.
+if ( !defined( 'Ask_VERSION' ) ) {
+ @include_once( __DIR__ . '/../../Ask/Ask.php' );
+}
+
$dependencies = array(
'Diff_VERSION' = 'Diff',
'DataValues_VERSION' = 'DataValues',
--
To view, visit https://gerrit.wikimedia.org/r/51157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94e89333d5bc1ee6f6e8d698ef67f354a83a6c3a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner daniel.wer...@wikimedia.de
Gerrit-Reviewer: Jens Ohlig jens.oh...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Styling adjustments for proofread view and toggle buttons - change (mediawiki...Translate)
Pginer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51159
Change subject: Styling adjustments for proofread view and toggle buttons
..
Styling adjustments for proofread view and toggle buttons
Several CSS adjustments for the toggle buttons (list and proofread)
and the layout of proofread view. The changes include:
* Adjusting the style to make them consistent with other buttons (.button class
is now used)
* Use of images (in png and svg formats)
* Positioning (adding paddings to some elements)
* Typo fix for width
Change-Id: I1a6bcdca0a9c058663ad8ca273350613c7af42c8
---
M resources/css/ext.translate.messagetable.css
M resources/css/ext.translate.proofread.css
A resources/images/view-list-hi.png
A resources/images/view-list-hi.svg
A resources/images/view-list.png
A resources/images/view-list.svg
A resources/images/view-page-hi.png
A resources/images/view-page-hi.svg
A resources/images/view-page.png
A resources/images/view-page.svg
A resources/images/view-proofread-hi.png
A resources/images/view-proofread-hi.svg
A resources/images/view-proofread.png
A resources/images/view-proofread.svg
M utils/TuxMessageTable.php
15 files changed, 504 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/59/51159/1
diff --git a/resources/css/ext.translate.messagetable.css
b/resources/css/ext.translate.messagetable.css
index 2bb1d2f..3768601 100644
--- a/resources/css/ext.translate.messagetable.css
+++ b/resources/css/ext.translate.messagetable.css
@@ -201,24 +201,63 @@
top: 30px;
}
-.tux-action-bar .toggle-button {
+.tux-action-bar .toggle.button {
height: 35px;
- with: 50%;
+ width: 50%;
font-size: 15px;
vertical-align: middle;
+ border-radius: 0;
+ text-shadow: none;
+}
+
+.toggle.button:first-child {
+ border-radius: 3px 0 0 3px;
+}
+
+.toggle.button:last-child {
+ border-radius: 0 3px 3px 0;
}
.tux-action-bar .translate-mode-button:before {
- content: '☰ ';
+ content: ;
+ height: 15px;
+ width: 25px;
+ display: inline-block;
+ vertical-align: bottom;
+ background: transparent url(../images/view-list.png) center center
no-repeat;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-list.svg);
+ background-image: -moz-linear-gradient(transparent, transparent),
url(../images/view-list.svg);
+ background-image: linear-gradient(transparent, transparent),
url(../images/view-list.svg);
+}
+
+.tux-action-bar .translate-mode-button.down:before {
+ background: transparent url(../images/view-list-hi.png) center center
no-repeat;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-list-hi.svg);
+ background-image: -moz-linear-gradient(transparent, transparent),
url(../images/view-list-hi.svg);
+ background-image: linear-gradient(transparent, transparent),
url(../images/view-list-hi.svg);
}
.tux-action-bar .tux-proofread-button:before {
- content: '✔ ';
+ content: ;
+ height: 15px;
+ width: 25px;
+ display: inline-block;
+ vertical-align: bottom;
+ background: transparent url(../images/view-proofread.png) center center
no-repeat;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-proofread.svg);
+ background-image: -moz-linear-gradient(transparent, transparent),
url(../images/view-proofread.svg);
+ background-image: linear-gradient(transparent, transparent),
url(../images/view-proofread.svg);
+}
+.tux-action-bar .tux-proofread-button.down:before {
+ background: transparent url(../images/view-proofread-hi.png) center
center no-repeat;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-proofread-hi.svg);
+ background-image: -moz-linear-gradient(transparent, transparent),
url(../images/view-proofread-hi.svg);
+ background-image: linear-gradient(transparent, transparent),
url(../images/view-proofread-hi.svg);
}
-.tux-action-bar .toggle-button.down {
+.tux-action-bar .toggle.button.down {
color: #FFF;
- background-color: #252525;
+ background: #252525;
}
/* Loading indicator: */
diff --git a/resources/css/ext.translate.proofread.css
b/resources/css/ext.translate.proofread.css
index eabaf3d..a05a770 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -1,7 +1,7 @@
.ext-translate-container .tux-messagelist .tux-message-proofread {
height: auto;
min-height: 50px;
- padding: 20px 0 10px 0;
+ padding: 20px 0 20px 0;
margin: 0;
vertical-align: middle;
border-bottom: 1px solid #f8f8f8;
@@ -20,16 +20,18 @@
display:none;
}
[MediaWiki-commits] [Gerrit] Hotfixing syntax error from Id97cc19152d8f82e2c1e7525de00be5... - change (mediawiki...Configure)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/51160 Change subject: Hotfixing syntax error from Id97cc19152d8f82e2c1e7525de00be519bb1b599 .. Hotfixing syntax error from Id97cc19152d8f82e2c1e7525de00be519bb1b599 Change-Id: I995e78bfe7f2d0d727e74d08dfe81608cf8a3d0c --- M settings/Settings.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Configure refs/changes/60/51160/1 diff --git a/settings/Settings.i18n.php b/settings/Settings.i18n.php index 9a99f39..48ac8d0 100644 --- a/settings/Settings.i18n.php +++ b/settings/Settings.i18n.php @@ -619,7 +619,7 @@ 'configure-setting-wgSysopEmailBans' = 'Allow administrators to ban users from accessing [[Special:EmailUser]]', 'configure-setting-wgEnotifFromEditor' = 'Email notifications appear to be coming from the page editor (not from wiki server)', 'configure-setting-wgEnotifImpersonal' = 'Send a generic email instead of a personalised emailfor each user', - 'configure-setting-wgEnotifMaxRecips' = 'Maximum number of users to eemailat once when using impersonal email, + 'configure-setting-wgEnotifMaxRecips' = 'Maximum number of users to eemailat once when using impersonal email', 'configure-setting-wgEnotifMinorEdits' = 'Email notifications also for minor edits (user preference is shown and user needs to opt-in)', 'configure-setting-wgEnotifRevealEditorAddress' = Reply-to address of emailnotifications may be filled with page editor's address (user preference is shown and user needs to opt-in), 'configure-setting-wgEnotifUseJobQ' = 'Send emails via the job queue', -- To view, visit https://gerrit.wikimedia.org/r/51160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I995e78bfe7f2d0d727e74d08dfe81608cf8a3d0c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Configure Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hotfixing syntax error from Id97cc19152d8f82e2c1e7525de00be5... - change (mediawiki...Configure)
Raimond Spekking has submitted this change and it was merged. Change subject: Hotfixing syntax error from Id97cc19152d8f82e2c1e7525de00be519bb1b599 .. Hotfixing syntax error from Id97cc19152d8f82e2c1e7525de00be519bb1b599 Change-Id: I995e78bfe7f2d0d727e74d08dfe81608cf8a3d0c --- M settings/Settings.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/settings/Settings.i18n.php b/settings/Settings.i18n.php index 9a99f39..48ac8d0 100644 --- a/settings/Settings.i18n.php +++ b/settings/Settings.i18n.php @@ -619,7 +619,7 @@ 'configure-setting-wgSysopEmailBans' = 'Allow administrators to ban users from accessing [[Special:EmailUser]]', 'configure-setting-wgEnotifFromEditor' = 'Email notifications appear to be coming from the page editor (not from wiki server)', 'configure-setting-wgEnotifImpersonal' = 'Send a generic email instead of a personalised emailfor each user', - 'configure-setting-wgEnotifMaxRecips' = 'Maximum number of users to eemailat once when using impersonal email, + 'configure-setting-wgEnotifMaxRecips' = 'Maximum number of users to eemailat once when using impersonal email', 'configure-setting-wgEnotifMinorEdits' = 'Email notifications also for minor edits (user preference is shown and user needs to opt-in)', 'configure-setting-wgEnotifRevealEditorAddress' = Reply-to address of emailnotifications may be filled with page editor's address (user preference is shown and user needs to opt-in), 'configure-setting-wgEnotifUseJobQ' = 'Send emails via the job queue', -- To view, visit https://gerrit.wikimedia.org/r/51160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I995e78bfe7f2d0d727e74d08dfe81608cf8a3d0c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Configure Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup in EntityContent.php - change (mediawiki...Wikibase)
Daniel Werner has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51161
Change subject: Cleanup in EntityContent.php
..
Cleanup in EntityContent.php
* Added documentation for how EntityContent::equal behaves since this is not
clear from just
looking at Content::equals.
* Changed code of EntityContent::equal to be more self-explanatory
* Changed some comments/documentation to fit into the 100chars per line limit
Change-Id: If10c2877c9d4de83880c94e0a79f00a24aea1e91
---
M repo/includes/content/EntityContent.php
1 file changed, 47 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/61/51161/1
diff --git a/repo/includes/content/EntityContent.php
b/repo/includes/content/EntityContent.php
index 22314d3..448c9f3 100644
--- a/repo/includes/content/EntityContent.php
+++ b/repo/includes/content/EntityContent.php
@@ -125,7 +125,8 @@
public abstract function getEntity();
/**
-* @return String a string representing the content in a way useful for
building a full text search index.
+* @return String a string representing the content in a way useful for
building a full text
+* search index.
*/
public function getTextForSearchIndex() {
wfProfileIn( __METHOD__ );
@@ -194,15 +195,16 @@
}
/**
-* @return String the wikitext to include when another page includes
this content, or false if the content is not
-* includable in a wikitext page.
+* @return String the wikitext to include when another page includes
this content, or false if
+* the content is not includable in a wikitext page.
*/
public function getWikitextForTransclusion() {
return false;
}
/**
-* Returns a textual representation of the content suitable for use in
edit summaries and log messages.
+* Returns a textual representation of the content suitable for use in
edit summaries and log
+* messages.
*
* @param int $maxlength maximum length of the summary text
* @return String the summary text
@@ -232,7 +234,11 @@
}
/**
-* @see Content::equals()
+* Both contents will be considered equal if they have the same ID and
equal Entity data. If
+* one of the contents is considered new, then matching IDs is not a
criteria for them to be
+* considered equal.
+*
+* @see Content::equals
*/
public function equals( \Content $that = null ) {
if ( is_null( $that ) ) {
@@ -247,24 +253,24 @@
return false;
}
- $thisId = $this-getEntity()-getPrefixedId();
- $thatId = $that-getEntity()-getPrefixedId();
+ $thisEntity = $this-getEntity();
+ $thatEntity = $that-getEntity();
- if ( $thisId !== null $thatId !== null ) {
- if ( $thisId !== $thatId ) {
- return false;
- }
+ if ( !$this-isNew() !$that-isNew()
+$thisEntity-getPrefixedId() !==
$thatEntity-getPrefixedId()
+ ) {
+ return false;
}
- return $this-getEntity()-equals( $that-getEntity() );
+ return $thisEntity-equals( $thatEntity );
}
/**
* Returns true if this content is countable as a real wiki page,
provided
* that it's also in a countable location (e.g. a current revision in
the main namespace).
*
-* @param boolean $hasLinks: if it is known whether this content
contains links, provide this information here,
-* to avoid redundant
parsing to find out.
+* @param boolean $hasLinks: if it is known whether this content
contains links, provide this
+*information here, to avoid redundant parsing to find out.
* @return boolean
*/
public function isCountable( $hasLinks = null ) {
@@ -305,8 +311,8 @@
*
* @param String$permission the permission to check
* @param null|User $user the user to check for. If
omitted, $wgUser is checked.
-* @param bool $doExpensiveQueries whether to perform expensive
checks (default: true). May be set to false for
-* non-critical checks.
+* @param bool $doExpensiveQueries whether to perform expensive
checks (default: true). May
+* be set to false for
non-critical checks.
*
* @return bool True if the user has the given permission, false
[MediaWiki-commits] [Gerrit] Defined most of the DataValueHandler interface - change (mediawiki...Wikibase)
Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51162
Change subject: Defined most of the DataValueHandler interface
..
Defined most of the DataValueHandler interface
Change-Id: I8db83806520372f7fc479b1fce207e2c99d2e3e8
---
M repo/includes/Database/TableDefinition.php
M repo/includes/Query/SQLStore/DataValueHandler.php
M repo/tests/phpunit/includes/Query/SQLStore/DataValueHandlerTest.php
3 files changed, 143 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/62/51162/1
diff --git a/repo/includes/Database/TableDefinition.php
b/repo/includes/Database/TableDefinition.php
index 37e9006..f558738 100644
--- a/repo/includes/Database/TableDefinition.php
+++ b/repo/includes/Database/TableDefinition.php
@@ -47,6 +47,10 @@
private $fields;
/**
+* Constructor.
+*
+* @since wd.db
+*
* @param string $name
* @param FieldDefinition[] $fields
*
@@ -66,6 +70,10 @@
}
/**
+* Returns the name of the table.
+*
+* @since wd.db
+*
* @return string
*/
public function getName() {
@@ -73,10 +81,16 @@
}
/**
+* Returns the fields that make up this table.
+*
+* @since wd.db
+*
* @return FieldDefinition[]
*/
public function getFields() {
return $this-fields;
}
+ // TODO: multiple field indices
+
}
\ No newline at end of file
diff --git a/repo/includes/Query/SQLStore/DataValueHandler.php
b/repo/includes/Query/SQLStore/DataValueHandler.php
index 86f5045..2f10e0b 100644
--- a/repo/includes/Query/SQLStore/DataValueHandler.php
+++ b/repo/includes/Query/SQLStore/DataValueHandler.php
@@ -2,6 +2,9 @@
namespace Wikibase\Repo\Query\SQLStore;
+use Wikibase\Repo\Database\TableDefinition;
+use DataValues\DataValue;
+
/**
* Represents the mapping between a DataValue type and the
* associated implementation in the store.
@@ -33,4 +36,69 @@
*/
abstract class DataValueHandler {
+ /**
+* Returns the definition of a table to hold DataValue objects of
+* the type handled by this DataValueHandler.
+*
+* @since wd.qe
+*
+* @return TableDefinition
+*/
+ abstract public function getTableDefinition();
+
+ /**
+* Returns the name of the field that holds the value from which
+* a DataValue instance can be (re)constructed.
+*
+* The field should clearly be part of the table returned
+* by @see getTableDefinition.
+*
+* @since wd.qe
+*
+* @return string
+*/
+ abstract public function getValueFieldName();
+
+ /**
+* Return the field used to select this type of DataValue. In
+* particular, this identifies the column that is used to sort values
+* of this kind. Every type of data returns a non-empty string here.
+*
+* @since wd.qe
+*
+* @return string
+*/
+ abstract public function getSortField();
+
+ /**
+* Create a DataValue from a cell value in the tables value field.
+*
+* @since wd.qe
+*
+* @param $dbValue // TODO: mixed or string?
+*
+* @return DataValue
+*/
+ abstract public function newDataValueFromDbValue( $dbValue );
+
+ /**
+* Return the label field for this type of DataValue. This should be
+* a string column in the database table that can be used for selecting
+* values using criteria such as starts with. The return value can be
+* empty if this is not supported. This is preferred for SMWDataItem
+* classes that do not have an obvious canonical string writing anyway.
+*
+* The return value can be a column name or the empty string (if the
+* give type of DataValue does not have a label field).
+*
+* @since wd.qe
+*
+* @return string|null
+*/
+ public function getLabelField() {
+ return null;
+ }
+
+ // TODO: getInsertValues and getWhereConds
+
}
\ No newline at end of file
diff --git
a/repo/tests/phpunit/includes/Query/SQLStore/DataValueHandlerTest.php
b/repo/tests/phpunit/includes/Query/SQLStore/DataValueHandlerTest.php
index 1744f97..8514a7d 100644
--- a/repo/tests/phpunit/includes/Query/SQLStore/DataValueHandlerTest.php
+++ b/repo/tests/phpunit/includes/Query/SQLStore/DataValueHandlerTest.php
@@ -27,15 +27,70 @@
*
* @ingroup WikibaseRepoTest
*
- * @group Wikibase
- * @group WikibaseRepo
- * @group WikibaseQuery
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw jeroended...@gmail.com
*/
-class DataValueHandlerTest extends
[MediaWiki-commits] [Gerrit] Added DataValueHandler tests - change (mediawiki...Wikibase)
Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51163
Change subject: Added DataValueHandler tests
..
Added DataValueHandler tests
Change-Id: I73160e261668d6d234e6b927866f6d1747d2ba90
---
M repo/includes/Database/TableDefinition.php
M repo/includes/Query/SQLStore/DataValueHandler.php
M repo/tests/phpunit/includes/Database/TableDefinitionTest.php
M repo/tests/phpunit/includes/Query/SQLStore/DataValueHandlerTest.php
4 files changed, 87 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/63/51163/1
diff --git a/repo/includes/Database/TableDefinition.php
b/repo/includes/Database/TableDefinition.php
index f558738..c333869 100644
--- a/repo/includes/Database/TableDefinition.php
+++ b/repo/includes/Database/TableDefinition.php
@@ -66,7 +66,16 @@
}
$this-name = $name;
- $this-fields = $fields;
+
+ $this-fields = array();
+
+ foreach ( $fields as $field ) {
+ if ( array_key_exists( $field-getName(), $this-fields
) ) {
+ throw new InvalidArgumentException( 'A table
cannot have two fields with the same name' );
+ }
+
+ $this-fields[$field-getName()] = $field;
+ }
}
/**
@@ -82,6 +91,8 @@
/**
* Returns the fields that make up this table.
+* The array keys in the returned array correspond to the names
+* of the fields defined by the value they point to.
*
* @since wd.db
*
@@ -91,6 +102,19 @@
return $this-fields;
}
+ /**
+* Returns if the table has a field with the provided name.
+*
+* @since wd.db
+*
+* @param string $fieldName
+*
+* @return boolean
+*/
+ public function hasFieldWithName( $fieldName ) {
+ return array_key_exists( $fieldName, $this-fields );
+ }
+
// TODO: multiple field indices
}
\ No newline at end of file
diff --git a/repo/includes/Query/SQLStore/DataValueHandler.php
b/repo/includes/Query/SQLStore/DataValueHandler.php
index 2f10e0b..a9e30c4 100644
--- a/repo/includes/Query/SQLStore/DataValueHandler.php
+++ b/repo/includes/Query/SQLStore/DataValueHandler.php
@@ -68,7 +68,7 @@
*
* @return string
*/
- abstract public function getSortField();
+ abstract public function getSortFieldName();
/**
* Create a DataValue from a cell value in the tables value field.
@@ -95,7 +95,7 @@
*
* @return string|null
*/
- public function getLabelField() {
+ public function getLabelFieldName() {
return null;
}
diff --git a/repo/tests/phpunit/includes/Database/TableDefinitionTest.php
b/repo/tests/phpunit/includes/Database/TableDefinitionTest.php
index cc1a168..89d4e3c 100644
--- a/repo/tests/phpunit/includes/Database/TableDefinitionTest.php
+++ b/repo/tests/phpunit/includes/Database/TableDefinitionTest.php
@@ -85,6 +85,14 @@
$this-assertInternalType( 'array', $table-getFields() );
$this-assertContainsOnlyInstancesOf(
'Wikibase\Repo\Database\FieldDefinition', $table-getFields() );
+ foreach ( $table-getFields() as $expectedName = $field ) {
+ $this-assertEquals(
+ $expectedName,
+ $field-getName(),
+ 'The array key matches the corresponding field
name'
+ );
+ }
+
$newTable = new TableDefinition( $table-getName(),
$table-getFields() );
$this-assertEquals(
@@ -94,4 +102,13 @@
);
}
+ public function testReturnValueOfHasField( TableDefinition $table ) {
+ foreach ( $table-getFields() as $field ) {
+ $this-assertTrue( $table-hasFieldWithName(
$field-getName() ) );
+ }
+
+ $this-assertFalse( $table-hasFieldWithName(
'zsfrcvbxuyiyrewrbmndsrbtfocszdf' ) );
+ $this-assertFalse( $table-hasFieldWithName( '' ) );
+ }
+
}
diff --git
a/repo/tests/phpunit/includes/Query/SQLStore/DataValueHandlerTest.php
b/repo/tests/phpunit/includes/Query/SQLStore/DataValueHandlerTest.php
index 8514a7d..dd248a2 100644
--- a/repo/tests/phpunit/includes/Query/SQLStore/DataValueHandlerTest.php
+++ b/repo/tests/phpunit/includes/Query/SQLStore/DataValueHandlerTest.php
@@ -30,7 +30,7 @@
* @licence GNU GPL v2+
* @author Jeroen De Dauw jeroended...@gmail.com
*/
-abstract class DataValueHandlerTest extends \MediaWikiTestCase {
+abstract class DataValueHandlerTest extends \PHPUnit_Framework_TestCase {
/**
[MediaWiki-commits] [Gerrit] Moving entitysearch to experimental features - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: Moving entitysearch to experimental features
..
Moving entitysearch to experimental features
Replacing the native search box with the entity selector requires some
adjustments
to be done in the entity selector widget. Until these are not done, the entity
selector should not replace the search box since it will behave very different
than
a regular search box.
Change-Id: I37786e885f48f0d4f80025a8835f10512ff0a7f4
---
M repo/Wikibase.hooks.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index b8213f3..4fa3afe 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -46,7 +46,9 @@
* @return boolean
*/
public static function onBeforePageDisplay( \OutputPage $out, \Skin
$skin ) {
- $out-addModules( 'wikibase.ui.entitysearch' );
+ if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
+ $out-addModules( 'wikibase.ui.entitysearch' );
+ }
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/51121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37786e885f48f0d4f80025a8835f10512ff0a7f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 42063, 44577) Special:EntityData supports RDF/XML output - change (mediawiki...Wikibase)
Anja Jentzsch has uploaded a new change for review. https://gerrit.wikimedia.org/r/51164 Change subject: (Bug 42063, 44577) Special:EntityData supports RDF/XML output .. (Bug 42063, 44577) Special:EntityData supports RDF/XML output Special:EntityData supports RDF/XML output when using the .rdf postfix. EasyRdf ( http://www.easyrdf.org ) is introduced for easy modeling and exporting of the data model as RDF.. Work in progress! Change-Id: Ie9f2f8944a65750077152a69923c0a0b18a49d5e --- M repo/Wikibase.php A repo/includes/content/LinkedDataHandler.php A repo/includes/content/easyRdf/CHANGELOG.md A repo/includes/content/easyRdf/EasyRdf.php A repo/includes/content/easyRdf/EasyRdf/Exception.php A repo/includes/content/easyRdf/EasyRdf/Format.php A repo/includes/content/easyRdf/EasyRdf/Graph.php A repo/includes/content/easyRdf/EasyRdf/GraphStore.php A repo/includes/content/easyRdf/EasyRdf/Http.php A repo/includes/content/easyRdf/EasyRdf/Http/Client.php A repo/includes/content/easyRdf/EasyRdf/Http/Response.php A repo/includes/content/easyRdf/EasyRdf/Literal.php A repo/includes/content/easyRdf/EasyRdf/Literal/Boolean.php A repo/includes/content/easyRdf/EasyRdf/Literal/Date.php A repo/includes/content/easyRdf/EasyRdf/Literal/DateTime.php A repo/includes/content/easyRdf/EasyRdf/Literal/Decimal.php A repo/includes/content/easyRdf/EasyRdf/Literal/HexBinary.php A repo/includes/content/easyRdf/EasyRdf/Literal/Integer.php A repo/includes/content/easyRdf/EasyRdf/Namespace.php A repo/includes/content/easyRdf/EasyRdf/ParsedUri.php A repo/includes/content/easyRdf/EasyRdf/Parser.php A repo/includes/content/easyRdf/EasyRdf/Parser/Arc.php A repo/includes/content/easyRdf/EasyRdf/Parser/Json.php A repo/includes/content/easyRdf/EasyRdf/Parser/Ntriples.php A repo/includes/content/easyRdf/EasyRdf/Parser/Rapper.php A repo/includes/content/easyRdf/EasyRdf/Parser/RdfPhp.php A repo/includes/content/easyRdf/EasyRdf/Parser/RdfXml.php A repo/includes/content/easyRdf/EasyRdf/Parser/Redland.php A repo/includes/content/easyRdf/EasyRdf/Parser/Turtle.php A repo/includes/content/easyRdf/EasyRdf/Resource.php A repo/includes/content/easyRdf/EasyRdf/Serialiser.php A repo/includes/content/easyRdf/EasyRdf/Serialiser/Arc.php A repo/includes/content/easyRdf/EasyRdf/Serialiser/GraphViz.php A repo/includes/content/easyRdf/EasyRdf/Serialiser/Json.php A repo/includes/content/easyRdf/EasyRdf/Serialiser/Ntriples.php A repo/includes/content/easyRdf/EasyRdf/Serialiser/Rapper.php A repo/includes/content/easyRdf/EasyRdf/Serialiser/RdfPhp.php A repo/includes/content/easyRdf/EasyRdf/Serialiser/RdfXml.php A repo/includes/content/easyRdf/EasyRdf/Serialiser/Turtle.php A repo/includes/content/easyRdf/EasyRdf/Sparql/Client.php A repo/includes/content/easyRdf/EasyRdf/Sparql/Result.php A repo/includes/content/easyRdf/EasyRdf/TypeMapper.php A repo/includes/content/easyRdf/EasyRdf/Utils.php A repo/includes/content/easyRdf/LICENSE.md A repo/includes/content/easyRdf/README.md M repo/includes/specials/SpecialEntityData.php 46 files changed, 11,559 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/64/51164/1 -- To view, visit https://gerrit.wikimedia.org/r/51164 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9f2f8944a65750077152a69923c0a0b18a49d5e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Anja Jentzsch anja.jentz...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added base of GeoCoordinateHandler [DO NOT MERGE] - change (mediawiki...Wikibase)
Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51165
Change subject: Added base of GeoCoordinateHandler [DO NOT MERGE]
..
Added base of GeoCoordinateHandler [DO NOT MERGE]
Change-Id: Ibdf6679b3a0e657cef65cc77e525aec883bc047f
---
M repo/includes/Database/FieldDefinition.php
A repo/includes/Query/SQLStore/DVHandlers/GeoCoordinateHandler.php
M repo/includes/Query/SQLStore/DataValueHandler.php
M repo/tests/phpunit/includes/Database/FieldDefinitionTest.php
M repo/tests/phpunit/includes/Database/TableDefinitionTest.php
5 files changed, 120 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/65/51165/1
diff --git a/repo/includes/Database/FieldDefinition.php
b/repo/includes/Database/FieldDefinition.php
index e1d3301..d280e5c 100644
--- a/repo/includes/Database/FieldDefinition.php
+++ b/repo/includes/Database/FieldDefinition.php
@@ -93,15 +93,15 @@
/**
* @param string $name
* @param string $type
+* @param boolean $null
* @param mixed $default
* @param string|null $attributes
-* @param boolean $null
* @param string|null $index
* @param boolean $autoIncrement
*
* @throws InvalidArgumentException
*/
- public function __construct( $name, $type, $default = null, $attributes
= null, $null = true, $index = null, $autoIncrement = false ) {
+ public function __construct( $name, $type, $null = true, $default =
null, $attributes = null, $index = null, $autoIncrement = false ) {
if ( !is_string( $name ) ) {
throw new InvalidArgumentException( 'The field $name
needs to be a string' );
}
diff --git a/repo/includes/Query/SQLStore/DVHandlers/GeoCoordinateHandler.php
b/repo/includes/Query/SQLStore/DVHandlers/GeoCoordinateHandler.php
new file mode 100644
index 000..62c9d98
--- /dev/null
+++ b/repo/includes/Query/SQLStore/DVHandlers/GeoCoordinateHandler.php
@@ -0,0 +1,103 @@
+?php
+
+namespace Wikibase\Repo\Query\SQLStore\DVHandler;
+
+use Wikibase\Repo\Query\SQLStore\DataValueHandler;
+use Wikibase\Repo\Database\TableDefinition;
+use Wikibase\Repo\Database\FieldDefinition;
+use DataValues\DataValue;
+
+/**
+ * Represents the mapping between DataValues\GeoCoordinateValue and
+ * the corresponding table in the store.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @since wd.qe
+ *
+ * @file
+ * @ingroup WikibaseSQLStore
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw jeroended...@gmail.com
+ */
+class GeoCoordinateHandler extends DataValueHandler {
+
+ /**
+* @see DataValueHandler::getTableDefinition
+*
+* @since wd.qe
+*
+* @return TableDefinition
+*/
+ public function getTableDefinition() {
+ $fields = array(
+ new FieldDefinition( 'lat',
FieldDefinition::TYPE_FLOAT, false ),
+ new FieldDefinition( 'lon',
FieldDefinition::TYPE_FLOAT, false ),
+ new FieldDefinition( 'alt',
FieldDefinition::TYPE_FLOAT, true ),
+ new FieldDefinition( 'json',
FieldDefinition::TYPE_TEXT, false ),
+ );
+
+ return new TableDefinition( 'geo', $fields );
+ }
+
+ /**
+* @see DataValueHandler::getValueFieldName
+*
+* @since wd.qe
+*
+* @return string
+*/
+ public function getValueFieldName() {
+ return 'json';
+ }
+
+ /**
+* @see DataValueHandler::getSortFieldName
+*
+* @since wd.qe
+*
+* @return string
+*/
+ public function getSortFieldName() {
+ return 'lat';
+ }
+
+ /**
+* @see DataValueHandler::newDataValueFromDbValue
+*
+* @since wd.qe
+*
+* @param $dbValue // TODO: mixed or string?
+*
+* @return DataValue
+*/
+ public function newDataValueFromDbValue( $dbValue ) {
+ // TODO
+ }
+
+ /**
+* @see
[MediaWiki-commits] [Gerrit] Fix incorrect find and replace - change (mediawiki...Configure)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/51166 Change subject: Fix incorrect find and replace .. Fix incorrect find and replace Follow-up to Change-Id: Id97cc19152d8f82e2c1e7525de00be519bb1b599. No idea what went wrong here... Thanks for spotting. Change-Id: Ib224f6c5903234232aaeed5c57c4590fdaf6c9c5 --- M settings/Settings.i18n.php 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Configure refs/changes/66/51166/1 diff --git a/settings/Settings.i18n.php b/settings/Settings.i18n.php index 48ac8d0..c5f029c 100644 --- a/settings/Settings.i18n.php +++ b/settings/Settings.i18n.php @@ -198,7 +198,7 @@ 'configure-setting-wgWhitelistRead' = 'Pages anonymous user may see', 'configure-setting-wgEmailAuthentication' = 'Require authentication of email addresses for email functions', 'configure-setting-wgEmergencyContact' = 'Site administrator email address', - 'configure-setting-wgEnableEmail' = 'Enable emailfeatures', + 'configure-setting-wgEnableEmail' = 'Enable email features', 'configure-setting-wgEnableUserEmail' = 'Enable user-to-user email', 'configure-setting-wgNoReplyAddress' = 'Dummy address which should be accepted during email send action', 'configure-setting-wgPasswordSender' = 'Password reminder email address', @@ -618,12 +618,12 @@ 'configure-setting-wgBlockDisablesLogin' = 'Disallow blocked users to login', 'configure-setting-wgSysopEmailBans' = 'Allow administrators to ban users from accessing [[Special:EmailUser]]', 'configure-setting-wgEnotifFromEditor' = 'Email notifications appear to be coming from the page editor (not from wiki server)', - 'configure-setting-wgEnotifImpersonal' = 'Send a generic email instead of a personalised emailfor each user', - 'configure-setting-wgEnotifMaxRecips' = 'Maximum number of users to eemailat once when using impersonal email', + 'configure-setting-wgEnotifImpersonal' = 'Send a generic email instead of a personalised email for each user', + 'configure-setting-wgEnotifMaxRecips' = 'Maximum number of users to email at once when using impersonal email', 'configure-setting-wgEnotifMinorEdits' = 'Email notifications also for minor edits (user preference is shown and user needs to opt-in)', - 'configure-setting-wgEnotifRevealEditorAddress' = Reply-to address of emailnotifications may be filled with page editor's address (user preference is shown and user needs to opt-in), + 'configure-setting-wgEnotifRevealEditorAddress' = Reply-to address of email notifications may be filled with page editor's address (user preference is shown and user needs to opt-in), 'configure-setting-wgEnotifUseJobQ' = 'Send emails via the job queue', - 'configure-setting-wgEnotifUseRealName' = 'Use real name instead of username in emailfrom field', + 'configure-setting-wgEnotifUseRealName' = 'Use real name instead of username in email from field', 'configure-setting-wgEnotifUserTalk' = 'Email notifications can be sent for first change on a user_talk page (user preference is shown and user needs to opt-in)', 'configure-setting-wgEnotifWatchlist' = 'Email notifications can be sent for the first change on watched pages (user preference is shown and user needs to opt-in)', 'configure-setting-wgUsersNotifiedOnAllChanges' = 'Usernames who will be sent a notification email for every change which occurs on a wiki', -- To view, visit https://gerrit.wikimedia.org/r/51166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib224f6c5903234232aaeed5c57c4590fdaf6c9c5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Configure Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45346) Update FUEL to use correct naming convention - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: (bug 45346) Update FUEL to use correct naming convention .. (bug 45346) Update FUEL to use correct naming convention Change-Id: Icb9da42bd3bc20e84a2bf3db34d0568ec9b564eb --- M groups/FUEL/FUEL.yaml 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Nikerabbit: Looks good to me, but someone else must approve Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/FUEL/FUEL.yaml b/groups/FUEL/FUEL.yaml index 440e44a..4f7afad 100644 --- a/groups/FUEL/FUEL.yaml +++ b/groups/FUEL/FUEL.yaml @@ -45,9 +45,9 @@ FILES: class: GettextFFS - sourcePattern: %GROUPROOT%/fuel/language/%CODE%/terminology/desktop/fuel-desktop_translatewiki.net.po + sourcePattern: %GROUPROOT%/fuel/language/%CODE%/terminology/desktop/fuel-desktop-%CODE%_translatewiki.net.po definitionFile: %GROUPROOT%/fuel/language/en/terminology/desktop/fuel-desktop-en.pot - targetPattern: fuel/language/%CODE%/terminology/desktop/fuel-desktop_translatewiki.net.po + targetPattern: fuel/language/%CODE%/terminology/desktop/fuel-desktop-%CODE%_translatewiki.net.po MANGLER: class: StringMatcher @@ -62,9 +62,9 @@ FILES: class: GettextFFS - sourcePattern: %GROUPROOT%/fuel/language/%CODE%/terminology/mobile/fuel-mobile_translatewiki.net.po + sourcePattern: %GROUPROOT%/fuel/language/%CODE%/terminology/mobile/fuel-mobile-%CODE%_translatewiki.net.po definitionFile: %GROUPROOT%/fuel/language/en/terminology/mobile/fuel-mobile-en.pot - targetPattern: fuel/language/%CODE%/terminology/mobile/fuel-mobile_translatewiki.net.po + targetPattern: fuel/language/%CODE%/terminology/mobile/fuel-mobile-%CODE%_translatewiki.net.po MANGLER: class: StringMatcher @@ -79,9 +79,9 @@ FILES: class: GettextFFS - sourcePattern: %GROUPROOT%/fuel/language/%CODE%/terminology/web/fuel-web_translatewiki.net.po + sourcePattern: %GROUPROOT%/fuel/language/%CODE%/terminology/web/fuel-web-%CODE%_translatewiki.net.po definitionFile: %GROUPROOT%/fuel/language/en/terminology/web/fuel-web-en.pot - targetPattern: fuel/language/%CODE%/terminology/web/fuel-web_translatewiki.net.po + targetPattern: fuel/language/%CODE%/terminology/web/fuel-web-%CODE%_translatewiki.net.po MANGLER: class: StringMatcher -- To view, visit https://gerrit.wikimedia.org/r/50898 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb9da42bd3bc20e84a2bf3db34d0568ec9b564eb Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Styling adjustments for proofread view and toggle buttons - change (mediawiki...Translate)
Santhosh has submitted this change and it was merged.
Change subject: Styling adjustments for proofread view and toggle buttons
..
Styling adjustments for proofread view and toggle buttons
Several CSS adjustments for the toggle buttons (list and proofread)
and the layout of proofread view. The changes include:
* Adjusting the style to make them consistent with other buttons (.button class
is now used)
* Use of images (in png and svg formats)
* Positioning (adding paddings to some elements)
* Typo fix for width
Change-Id: I1a6bcdca0a9c058663ad8ca273350613c7af42c8
---
M resources/css/ext.translate.messagetable.css
M resources/css/ext.translate.proofread.css
A resources/images/view-list-hi.png
A resources/images/view-list-hi.svg
A resources/images/view-list.png
A resources/images/view-list.svg
A resources/images/view-page-hi.png
A resources/images/view-page-hi.svg
A resources/images/view-page.png
A resources/images/view-page.svg
A resources/images/view-proofread-hi.png
A resources/images/view-proofread-hi.svg
A resources/images/view-proofread.png
A resources/images/view-proofread.svg
M utils/TuxMessageTable.php
15 files changed, 506 insertions(+), 12 deletions(-)
Approvals:
Santhosh: Verified; Looks good to me, approved
diff --git a/resources/css/ext.translate.messagetable.css
b/resources/css/ext.translate.messagetable.css
index 2bb1d2f..f1b073d 100644
--- a/resources/css/ext.translate.messagetable.css
+++ b/resources/css/ext.translate.messagetable.css
@@ -201,24 +201,64 @@
top: 30px;
}
-.tux-action-bar .toggle-button {
+.tux-action-bar .toggle.button {
height: 35px;
- with: 50%;
+ width: 50%;
font-size: 15px;
vertical-align: middle;
+ border-radius: 0;
+ text-shadow: none;
+}
+
+.toggle.button:first-child {
+ border-radius: 3px 0 0 3px;
+}
+
+.toggle.button:last-child {
+ border-radius: 0 3px 3px 0;
}
.tux-action-bar .translate-mode-button:before {
- content: '☰ ';
+ content: ;
+ height: 15px;
+ width: 25px;
+ display: inline-block;
+ vertical-align: bottom;
+ background: transparent url(../images/view-list.png) center center
no-repeat;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-list.svg);
+ background-image: -moz-linear-gradient(transparent, transparent),
url(../images/view-list.svg);
+ background-image: linear-gradient(transparent, transparent),
url(../images/view-list.svg);
+}
+
+.tux-action-bar .translate-mode-button.down:before {
+ background: transparent url(../images/view-list-hi.png) center center
no-repeat;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-list-hi.svg);
+ background-image: -moz-linear-gradient(transparent, transparent),
url(../images/view-list-hi.svg);
+ background-image: linear-gradient(transparent, transparent),
url(../images/view-list-hi.svg);
}
.tux-action-bar .tux-proofread-button:before {
- content: '✔ ';
+ content: ;
+ height: 15px;
+ width: 25px;
+ display: inline-block;
+ vertical-align: bottom;
+ background: transparent url(../images/view-proofread.png) center center
no-repeat;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-proofread.svg);
+ background-image: -moz-linear-gradient(transparent, transparent),
url(../images/view-proofread.svg);
+ background-image: linear-gradient(transparent, transparent),
url(../images/view-proofread.svg);
}
-.tux-action-bar .toggle-button.down {
+.tux-action-bar .tux-proofread-button.down:before {
+ background: transparent url(../images/view-proofread-hi.png) center
center no-repeat;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-proofread-hi.svg);
+ background-image: -moz-linear-gradient(transparent, transparent),
url(../images/view-proofread-hi.svg);
+ background-image: linear-gradient(transparent, transparent),
url(../images/view-proofread-hi.svg);
+}
+
+.tux-action-bar .toggle.button.down {
color: #FFF;
- background-color: #252525;
+ background: #252525;
}
/* Loading indicator: */
diff --git a/resources/css/ext.translate.proofread.css
b/resources/css/ext.translate.proofread.css
index 3bd09e5..9f9ef51 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -1,7 +1,7 @@
.ext-translate-container .tux-messagelist .tux-message-proofread {
height: auto;
min-height: 50px;
- padding: 20px 0 10px 0;
+ padding: 20px 0 20px 0;
margin: 0;
vertical-align: middle;
border-bottom: 1px solid #f8f8f8;
@@ -20,16 +20,18 @@
display: none;
}
-.tux-proofread-source {
+.tux-messagelist .tux-message-proofread
[MediaWiki-commits] [Gerrit] Fix incorrect find and replace - change (mediawiki...Configure)
Siebrand has submitted this change and it was merged. Change subject: Fix incorrect find and replace .. Fix incorrect find and replace Follow-up to Change-Id: Id97cc19152d8f82e2c1e7525de00be519bb1b599. No idea what went wrong here... Thanks for spotting. Change-Id: Ib224f6c5903234232aaeed5c57c4590fdaf6c9c5 --- M settings/Settings.i18n.php 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/settings/Settings.i18n.php b/settings/Settings.i18n.php index 48ac8d0..c5f029c 100644 --- a/settings/Settings.i18n.php +++ b/settings/Settings.i18n.php @@ -198,7 +198,7 @@ 'configure-setting-wgWhitelistRead' = 'Pages anonymous user may see', 'configure-setting-wgEmailAuthentication' = 'Require authentication of email addresses for email functions', 'configure-setting-wgEmergencyContact' = 'Site administrator email address', - 'configure-setting-wgEnableEmail' = 'Enable emailfeatures', + 'configure-setting-wgEnableEmail' = 'Enable email features', 'configure-setting-wgEnableUserEmail' = 'Enable user-to-user email', 'configure-setting-wgNoReplyAddress' = 'Dummy address which should be accepted during email send action', 'configure-setting-wgPasswordSender' = 'Password reminder email address', @@ -618,12 +618,12 @@ 'configure-setting-wgBlockDisablesLogin' = 'Disallow blocked users to login', 'configure-setting-wgSysopEmailBans' = 'Allow administrators to ban users from accessing [[Special:EmailUser]]', 'configure-setting-wgEnotifFromEditor' = 'Email notifications appear to be coming from the page editor (not from wiki server)', - 'configure-setting-wgEnotifImpersonal' = 'Send a generic email instead of a personalised emailfor each user', - 'configure-setting-wgEnotifMaxRecips' = 'Maximum number of users to eemailat once when using impersonal email', + 'configure-setting-wgEnotifImpersonal' = 'Send a generic email instead of a personalised email for each user', + 'configure-setting-wgEnotifMaxRecips' = 'Maximum number of users to email at once when using impersonal email', 'configure-setting-wgEnotifMinorEdits' = 'Email notifications also for minor edits (user preference is shown and user needs to opt-in)', - 'configure-setting-wgEnotifRevealEditorAddress' = Reply-to address of emailnotifications may be filled with page editor's address (user preference is shown and user needs to opt-in), + 'configure-setting-wgEnotifRevealEditorAddress' = Reply-to address of email notifications may be filled with page editor's address (user preference is shown and user needs to opt-in), 'configure-setting-wgEnotifUseJobQ' = 'Send emails via the job queue', - 'configure-setting-wgEnotifUseRealName' = 'Use real name instead of username in emailfrom field', + 'configure-setting-wgEnotifUseRealName' = 'Use real name instead of username in email from field', 'configure-setting-wgEnotifUserTalk' = 'Email notifications can be sent for first change on a user_talk page (user preference is shown and user needs to opt-in)', 'configure-setting-wgEnotifWatchlist' = 'Email notifications can be sent for the first change on watched pages (user preference is shown and user needs to opt-in)', 'configure-setting-wgUsersNotifiedOnAllChanges' = 'Usernames who will be sent a notification email for every change which occurs on a wiki', -- To view, visit https://gerrit.wikimedia.org/r/51166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib224f6c5903234232aaeed5c57c4590fdaf6c9c5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Configure Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Profiling - change (mediawiki...MobileFrontend)
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51167
Change subject: Profiling
..
Profiling
Change-Id: I6a5766fd181a31e41ff49d0c9da0933445366486
---
M includes/specials/SpecialMobileWatchlist.php
1 file changed, 31 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/67/51167/1
diff --git a/includes/specials/SpecialMobileWatchlist.php
b/includes/specials/SpecialMobileWatchlist.php
index 1b2af0b..536ce04 100644
--- a/includes/specials/SpecialMobileWatchlist.php
+++ b/includes/specials/SpecialMobileWatchlist.php
@@ -14,6 +14,8 @@
private $fromPageTitle;
function execute( $par ) {
+ wfProfileIn( __METHOD__ );
+
$ctx = MobileContext::singleton();
$ctx-setOverlay( false );
$this-usePageImages = $ctx-isBetaGroupMember() defined(
'PAGE_IMAGES_INSTALLED' );
@@ -33,6 +35,7 @@
if( $user-isAnon() ) {
// No watchlist for you.
parent::execute( $par );
+ wfProfileOut( __METHOD__ );
return;
} else {
$mobileSkin-addArticleClass( 'noMargins watchlist' );
@@ -48,6 +51,8 @@
$res = $this-doListQuery();
$this-showListResults( $res );
}
+
+ wfProfileOut( __METHOD__ );
}
/**
@@ -167,6 +172,8 @@
}
function doFeedQuery() {
+ wfProfileIn( __METHOD__ );
+
$user = $this-getUser();
$dbr = wfGetDB( DB_SLAVE, 'watchlist' );
@@ -222,12 +229,17 @@
ChangeTags::modifyDisplayQuery( $tables, $fields, $conds,
$join_conds, $options, '' );
wfRunHooks('SpecialWatchlistQuery',
array($conds,$tables,$join_conds,$fields) );
+ wfProfileIn( __METHOD__ . '-query' );
$res = $dbr-select( $tables, $fields, $conds, __METHOD__,
$options, $join_conds );
+ wfProfileOut( __METHOD__ . '-query' );
+ wfProfileOut( __METHOD__ );
return $res;
}
function doListQuery() {
+ wfProfileIn( __METHOD__ );
+
$user = $this-getUser();
$dbr = wfGetDB( DB_SLAVE, 'watchlist' );
@@ -279,8 +291,11 @@
$conds[] = wl_namespace $ns OR (wl_namespace = $ns
AND wl_title = $titleQuoted);
}
+ wfProfileIn( __METHOD__ . '-query' );
$res = $dbr-select( $tables, $fields, $conds, __METHOD__,
$options, $joinConds );
+ wfProfileOut( __METHOD__ . '-query' );
+ wfProfileOut( __METHOD__ );
return $res;
}
@@ -293,6 +308,8 @@
}
function showResults( ResultWrapper $res, $feed ) {
+ wfProfileIn( __METHOD__ );
+
$empty = $res-numRows() === 0;
$this-seenTitles = array();
@@ -347,6 +364,8 @@
);
}
}
+
+ wfProfileOut( __METHOD__ );
}
function showEmptyList( $feed ) {
@@ -376,6 +395,8 @@
}
private function renderThumb( $row ) {
+ wfProfileIn( __METHOD__ );
+
if ( $this-usePageImages !is_null( $row-pp_value ) ) {
$file = wfFindFile( $row-pp_value );
if ( $file ) {
@@ -390,10 +411,14 @@
}
}
}
+
+ wfProfileOut( __METHOD__ );
return '';
}
private function showFeedResultRow( $row ) {
+ wfProfileIn( __METHOD__ );
+
$output = $this-getOutput();
$title = Title::makeTitle( $row-rc_namespace, $row-rc_title );
@@ -443,11 +468,14 @@
Html::closeElement( 'a' ) .
'/li'
);
+
+ wfProfileOut( __METHOD__ );
}
private function showListResultRow( $row ) {
- $output = $this-getOutput();
+ wfProfileIn( __METHOD__ );
+ $output = $this-getOutput();
$title = Title::makeTitle( $row-wl_namespace, $row-wl_title );
$titleText = $title-getPrefixedText();
$ts = new MWTimestamp( $row-rev_timestamp );
@@ -462,6 +490,8 @@
Html::closeElement( 'a' ) .
Html::closeElement( 'li' )
);
+
+ wfProfileOut( __METHOD__ );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/51167
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id:
