From 16728a3ef135851a7cc7c7c70c0f1b48f32096b5 Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Wed, 9 Jun 2021 16:32:48 +0100 Subject: [PATCH] Swapped to American English spellings - Traditionally all of Ghost's public-facing text was written in British English - We're changing that to US English because that's more common - US English should also be used in code e.g. properties are called color not colour - most of these changes are in comments, but I've changed them so that we have US English in front of us always - fixed a few other typos I noticed whilst there --- core/bridge.js | 2 +- core/frontend/helpers/ghost_head.js | 2 +- core/server/adapters/scheduling/SchedulingDefault.js | 2 +- core/server/models/user.js | 2 +- core/server/web/api/middleware/normalize-image.js | 2 +- core/server/web/shared/middlewares/pretty-urls.js | 2 +- test/unit/data/validation/index_spec.js | 2 +- test/utils/acceptance-utils.js | 2 +- test/utils/fixtures/themes/casper-1.4/page.hbs | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/bridge.js b/core/bridge.js index 7907326281..2f1b00ad53 100644 --- a/core/bridge.js +++ b/core/bridge.js @@ -20,7 +20,7 @@ class Bridge { constructor() { /** * When locale changes, we reload theme translations - * @deprecated: the term "lang" was deprecated in favour of "locale" publicly in 4.0 + * @deprecated: the term "lang" was deprecated in favor of "locale" publicly in 4.0 */ events.on('settings.lang.edited', (model) => { this.getActiveTheme().initI18n({locale: model.get('value')}); diff --git a/core/frontend/helpers/ghost_head.js b/core/frontend/helpers/ghost_head.js index 0f14cdbed0..b946d7d78c 100644 --- a/core/frontend/helpers/ghost_head.js +++ b/core/frontend/helpers/ghost_head.js @@ -116,7 +116,7 @@ module.exports = function ghost_head(options) { // eslint-disable-line camelcase * - getMetaData(dataRoot, dataRoot) -> yes that looks confusing! * - there is a very mixed usage of `data.context` vs. `root.context` vs `root._locals.context` vs. `this.context` * - NOTE: getMetaData won't live here anymore soon, see https://github.com/TryGhost/Ghost/issues/8995 - * - therefor we get rid of using `getMetaData(this, dataRoot)` + * - therefore we get rid of using `getMetaData(this, dataRoot)` * - dataRoot has access to *ALL* locals, see function description * - it should not break anything */ diff --git a/core/server/adapters/scheduling/SchedulingDefault.js b/core/server/adapters/scheduling/SchedulingDefault.js index f175c5dc13..5f031a4e60 100644 --- a/core/server/adapters/scheduling/SchedulingDefault.js +++ b/core/server/adapters/scheduling/SchedulingDefault.js @@ -203,7 +203,7 @@ SchedulingDefault.prototype._deleteJob = function (object) { * - accuracy * - setTimeout is limited to 24,3 days * - * The execution of "setTimeout" is never guaranteed, therefor we've optimised the execution by using "setImmediate". + * The execution of "setTimeout" is never guaranteed, therefore we've optimized the execution by using "setImmediate". * The executor will put each job to sleep using `setTimeout` with a threshold of 70ms. And "setImmediate" is then * used to detect the correct moment to trigger the URL. diff --git a/core/server/models/user.js b/core/server/models/user.js index d013902b62..631d1c6230 100644 --- a/core/server/models/user.js +++ b/core/server/models/user.js @@ -78,7 +78,7 @@ User = ghostBookshelf.Model.extend({ * @TODO: * * The user model does not use bookshelf-relations yet. - * Therefor we have to remove the relations manually. + * Therefore we have to remove the relations manually. */ onDestroying(model, options) { ghostBookshelf.Model.prototype.onDestroying.apply(this, arguments); diff --git a/core/server/web/api/middleware/normalize-image.js b/core/server/web/api/middleware/normalize-image.js index b0747391aa..efd8130c3a 100644 --- a/core/server/web/api/middleware/normalize-image.js +++ b/core/server/web/api/middleware/normalize-image.js @@ -25,7 +25,7 @@ module.exports = function normalize(req, res, next) { .then(() => { req.files = []; - // CASE: push the processed/optimised image + // CASE: push the processed/optimized image req.files.push(Object.assign(req.file, {path: out})); // CASE: push original image, we keep a copy of it diff --git a/core/server/web/shared/middlewares/pretty-urls.js b/core/server/web/shared/middlewares/pretty-urls.js index ac9c445eb7..75941af000 100644 --- a/core/server/web/shared/middlewares/pretty-urls.js +++ b/core/server/web/shared/middlewares/pretty-urls.js @@ -4,7 +4,7 @@ // URLs get formatted correctly. // Slashes ensures that we get trailing slashes // Uncapitalise changes case to lowercase -// @TODO optimise this to reduce the number of redirects required to get to a pretty URL +// @TODO optimize this to reduce the number of redirects required to get to a pretty URL // @TODO move this to being used by routers? const slashes = require('connect-slashes'); const config = require('../../../../shared/config'); diff --git a/test/unit/data/validation/index_spec.js b/test/unit/data/validation/index_spec.js index 20537f0666..46248bfb01 100644 --- a/test/unit/data/validation/index_spec.js +++ b/test/unit/data/validation/index_spec.js @@ -5,7 +5,7 @@ const testUtils = require('../../../utils'); const models = require('../../../../core/server/models'); const validation = require('../../../../core/server/data/validation'); -// Validate our customisations +// Validate our customizations describe('Validation', function () { before(function () { models.init(); diff --git a/test/utils/acceptance-utils.js b/test/utils/acceptance-utils.js index 82ddf29a19..93c305d813 100644 --- a/test/utils/acceptance-utils.js +++ b/test/utils/acceptance-utils.js @@ -36,7 +36,7 @@ let existingData = {}; /** * Because we use ObjectID we don't know the ID of fixtures ahead of time * This function fetches all of our fixtures and exposes them so that tests can use them - * @TODO: Optimise this by making it optional / selective + * @TODO: Optimize this by making it optional / selective */ const exposeFixtures = async () => { const fixturePromises = { diff --git a/test/utils/fixtures/themes/casper-1.4/page.hbs b/test/utils/fixtures/themes/casper-1.4/page.hbs index f99c7ed2bc..7c92f9825a 100755 --- a/test/utils/fixtures/themes/casper-1.4/page.hbs +++ b/test/utils/fixtures/themes/casper-1.4/page.hbs @@ -1,7 +1,7 @@ {{!< default}} {{!-- This is a page template. A page outputs content just like any other post, and has all the same - attributes by default, but you can also customise it to behave differently if you prefer. --}} + attributes by default, but you can also customize it to behave differently if you prefer. --}} {{!-- Everything inside the #post tags pulls data from the page --}} {{#post}}