Our text guidelines specify American English spellings:
http://drupal.org/style-guide/content#english

Attached corrects a few instances of "behaviour" in core.

CommentFileSizeAuthor
#10 1540072-american-behavior_0.patch4.39 KBmstrelan
#8 1540072-american-behavior.patch4.39 KBmstrelan
#6 1540072-american-behavior.patch4.41 KBmstrelan
two-if-by-sea.patch4.48 KBxjm

Comments

xjm’s picture

xjm
she/her
Primary language English
commented
Issue tags: +Needs backport to D7
xjm’s picture

xjm
she/her
Primary language English
commented
Issue tags: +Novice

Good patch for a novice to review. :)

robloach’s picture

robloach
he/him
commented

:-(

jhodgdon’s picture

jhodgdon
she/her
Primary language English
commented
Status: Needs review » Reviewed & tested by the community

It is true that our standards are American spelling. Sorry Rob, it's been like that for ages.

The patch is fine, and I verified that there aren't any other words ending in "iour" in Core (outside of 3rd-party libraries anyway). Committing it may need to wait until we're not over critical/major thresholds, however.

jhodgdon’s picture

jhodgdon
she/her
Primary language English
commented
Version: 8.x-dev » 7.x-dev
Status: Reviewed & tested by the community » Patch (to be ported)

Committed to 8.x. Should we backport to 7.x or just leave it? I guess a backport makes sense.

mstrelan’s picture

mstrelan commented
Status: Patch (to be ported) » Needs review
StatusFileSize
new 1540072-american-behavior.patch4.41 KB

Patch for D7. Also searched for -iour, only other instances are in JQuery.

xjm’s picture

xjm
she/her
Primary language English
commented
Status: Needs review » Needs work

Thanks @mstrelan.

The two hunks for the user tests differ from the Drupal 8 patch, which had:

+++ b/core/modules/user/user.testundefined
@@ -1670,7 +1670,7 @@ class UserBlocksUnitTests extends DrupalWebTestCase {
- * Test case to test user_save() behaviour.
+ * Tests user_save() behavior.

@@ -1759,7 +1759,7 @@ class UserCreateTestCase extends DrupalWebTestCase {
- * Test case to test user_save() behaviour.
+ * Tests the user edit form.

We should make them the same so that the two codebases are more in line. However, the user entity conversion in #1361228: Make the user entity a classed object also actually is updating these two docblocks again (and it will not be backported). That issue has:

+++ b/core/modules/user/user.testundefined
@@ -1670,14 +1671,14 @@ class UserBlocksUnitTests extends DrupalWebTestCase {
- * Tests user_save() behavior.
+ * Tests saving a user account.

@@ -1759,7 +1759,7 @@ class UserCreateTestCase extends DrupalWebTestCase {
- * Tests the user edit form.
+ * Tests editing a user account.

So, let's use that text instead in order to keep the codebases in line (replacing the word "behaviour" entirely).

mstrelan’s picture

mstrelan commented
Status: Needs work » Needs review
StatusFileSize
new 1540072-american-behavior.patch4.39 KB
Niklas Fiekas’s picture

Niklas Fiekas commented
Status: Needs review » Needs work 
+++ b/includes/form.incundefined
@@ -3318,7 +3318,7 @@ function form_process_tableselect($element) {
-    // Advanced selection behaviour make no sense for radios.
+    // Advanced selection behavior make no sense for radios.

The original patch also corrected "make" to "makes".

Other than that it looks good. I re-verified that there are no further instances. Thank you, @mstrelan!

mstrelan’s picture

mstrelan commented
Status: Needs work » Needs review
StatusFileSize
new 1540072-american-behavior_0.patch4.39 KB
xjm’s picture

xjm
she/her
Primary language English
commented
Status: Needs review » Reviewed & tested by the community

Okay, that looks good to me, assuming it applies on the bot. Thanks @mstrelan!

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented
Status: Reviewed & tested by the community » Fixed

Imperialism ftw! :D

thanks for the fix. committed/pushed to 7.x.

Tim Jones Toronto’s picture

Tim Jones Toronto commented

For fun – the numbers on Drupal:

Found 29048 results containing the words: behavior

http://drupal.org/search/apachesolr_multisitesearch/behavior

vs.

Found 13670 results containing the words: behaviour

http://drupal.org/search/apachesolr_multisitesearch/behaviour

Automatically closed -- issue fixed for 2 weeks with no activity.