Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/52016
Change subject: Use American English spelling for behavior
......................................................................
Use American English spelling for behavior
Change-Id: Iaacef2b6a239178ae317e0e1a722cc8d0a24e19a
---
M resources/jquery/jquery.autocomplete.js
M resources/mw.UploadWizard.js
M test/jasmine/spec/mediawiki.parser2.spec.js
3 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/16/52016/1
diff --git a/resources/jquery/jquery.autocomplete.js
b/resources/jquery/jquery.autocomplete.js
index 25da739..e9f4e3a 100644
--- a/resources/jquery/jquery.autocomplete.js
+++ b/resources/jquery/jquery.autocomplete.js
@@ -149,7 +149,7 @@
$(lis[active]).addClass("ac_over");
- // Weird behaviour in IE
+ // Weird behavior in IE
// if (lis[active] && lis[active].scrollIntoView) {
// lis[active].scrollIntoView(false);
// }
diff --git a/resources/mw.UploadWizard.js b/resources/mw.UploadWizard.js
index e044053..e27cdd6 100644
--- a/resources/mw.UploadWizard.js
+++ b/resources/mw.UploadWizard.js
@@ -408,7 +408,7 @@
return ownWork.licenses.length > 1 ||
licenseIsNotDefault;
}
else {
- return true; // TODO: might want to have
similar behaviour here
+ return true; // TODO: might want to have
similar behavior here
}
};
diff --git a/test/jasmine/spec/mediawiki.parser2.spec.js
b/test/jasmine/spec/mediawiki.parser2.spec.js
index ce023ad..82d34f2 100644
--- a/test/jasmine/spec/mediawiki.parser2.spec.js
+++ b/test/jasmine/spec/mediawiki.parser2.spec.js
@@ -2,7 +2,7 @@
"en_simple": "Simple message",
"en_replace": "Simple $1 replacement",
"en_link": "Simple [http://example.com link to example].",
- "en_link_replace": "Complex [$1 $2] behaviour.",
+ "en_link_replace": "Complex [$1 $2] behavior.",
"en_simple_magic": "Simple {{ALOHOMORA}} message",
"en_undelete_short": "Undelete {{PLURAL:$1|one edit|$1 edits}}",
"en_category-subcat-count": "{{PLURAL:$2|This category has only the
following subcategory.|This category has the following
{{PLURAL:$1|subcategory|$1 subcategories}}, out of $2 total.}}",
@@ -395,7 +395,7 @@
expect( contents[1].getAttribute( 'href' ) ).toEqual(
'http://example.com/foo' );
expect( contents[1].childNodes[0].nodeValue ).toEqual(
'linking' );
expect( contents[2].nodeName ).toEqual( '#text' );
- expect( contents[2].nodeValue ).toEqual( ' behaviour.'
);
+ expect( contents[2].nodeValue ).toEqual( ' behavior.' );
} );
it ( "should bind a click handler into a link", function() {
@@ -411,7 +411,7 @@
expect( contents[1].getAttribute( 'href' ) ).toEqual(
'#' );
expect( contents[1].childNodes[0].nodeValue ).toEqual(
'linking' );
expect( contents[2].nodeName ).toEqual( '#text' );
- expect( contents[2].nodeValue ).toEqual( ' behaviour.'
);
+ expect( contents[2].nodeValue ).toEqual( ' behavior.' );
// determining bindings is hard in IE
var anchor = parsed.find( 'a' );
if ( ( $j.browser.mozilla || $j.browser.webkit ) &&
anchor.click ) {
@@ -434,7 +434,7 @@
expect( contents[1].nodeName ).toEqual( 'BUTTON' );
expect( contents[1].childNodes[0].nodeValue ).toEqual(
'buttoning' );
expect( contents[2].nodeName ).toEqual( '#text' );
- expect( contents[2].nodeValue ).toEqual( ' behaviour.'
);
+ expect( contents[2].nodeValue ).toEqual( ' behavior.' );
// determining bindings is hard in IE
if ( ( $j.browser.mozilla || $j.browser.webkit ) &&
button.click ) {
expect( clicked ).toEqual( false );
@@ -492,7 +492,7 @@
var gM = mediaWiki.language.parser.getMessageFunction();
// passing this through jQuery and back to string,
because browsers may have subtle differences, like the case of tag names.
// a surrounding <SPAN> is needed for html() to work
right
- var expectedHtml = $j( '<span>Complex <a
href="http://example.com/foo";>linking</a> behaviour.</span>' ).html();
+ var expectedHtml = $j( '<span>Complex <a
href="http://example.com/foo";>linking</a> behavior.</span>' ).html();
var result = gM( 'en_link_replace',
'http://example.com/foo', 'linking' );
expect( typeof result ).toEqual( 'string' );
expect( result ).toEqual( expectedHtml );
@@ -506,7 +506,7 @@
$div.find( '.foo' ).msg( 'en_link_replace', $button,
'buttoning' );
// passing this through jQuery and back to string,
because browsers may have subtle differences, like the case of tag names.
// a surrounding <SPAN> is needed for html() to work
right
- var expectedHtml = $j( '<span>Complex
<button>buttoning</button> behaviour.</span>' ).html();
+ var expectedHtml = $j( '<span>Complex
<button>buttoning</button> behavior.</span>' ).html();
var createdHtml = $div.find( '.foo' ).html();
// it is hard to test for clicks with IE; also it
inserts or removes spaces around nodes when creating HTML tags, depending on
their type.
// so need to check the strings stripped of spaces.
--
To view, visit https://gerrit.wikimedia.org/r/52016
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaacef2b6a239178ae317e0e1a722cc8d0a24e19a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
