From ad99da1c2e44cfabfbbd390669a1e0af47c10ff4 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 9 Dec 2016 11:28:28 +1300 Subject: [PATCH] Clarify UK-english in coding conventions --- docs/en/05_Contributing/12_JavaScript_Coding_Conventions.md | 5 +++++ docs/en/05_Contributing/14_PHP_Coding_Conventions.md | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/docs/en/05_Contributing/12_JavaScript_Coding_Conventions.md b/docs/en/05_Contributing/12_JavaScript_Coding_Conventions.md index ee8e14450..bb7e97f27 100644 --- a/docs/en/05_Contributing/12_JavaScript_Coding_Conventions.md +++ b/docs/en/05_Contributing/12_JavaScript_Coding_Conventions.md @@ -21,6 +21,11 @@ as well as the [AirBnB React Conventions](https://github.com/airbnb/javascript/t A lot of their rules can be validated via [ESLint](http://eslint.org/), and can be checked locally via `npm run lint`. +## Spelling + +All symbols and documentation should use UK-English spelling (e.g. "behaviour" instead of "behavior"), +except when necessitated by third party conventions (e.g using "color" for CSS styles). + ## File and Folder Naming - All frontend files (CSS, JavaScript, images) should be placed in diff --git a/docs/en/05_Contributing/14_PHP_Coding_Conventions.md b/docs/en/05_Contributing/14_PHP_Coding_Conventions.md index d3fa3f308..63612242f 100644 --- a/docs/en/05_Contributing/14_PHP_Coding_Conventions.md +++ b/docs/en/05_Contributing/14_PHP_Coding_Conventions.md @@ -34,6 +34,11 @@ linefeed combination (CRLF) as is standard for the Windows OS (0x0D, 0x0A). Class, function, variable and constant names may only contain alphanumeric characters and underscores. +## Spelling + +All symbols and documentation should use UK-English spelling (e.g. "behaviour" instead of "behavior"), +except when necessitated by third party conventions (e.g using PHP's `Serializable` interface). + ### Classes Class and filenames are in `UpperCamelCase` format: