Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consistent AE Spelling #7777

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Consistent AE Spelling #7777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions en/console-commands/input-output.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ Writing to ``stdout`` and ``stderr`` is another common operation in CakePHP::
$io->err('Error message');

In addition to vanilla output methods, CakePHP provides wrapper methods that
style output with appropriate ANSI colours::
style output with appropriate ANSI colors::

// Green text on stdout
$io->success('Success message');
Expand Down Expand Up @@ -307,9 +307,9 @@ new output style you could do::
$io->setStyle('flashy', ['text' => 'magenta', 'blink' => true]);

This would then allow you to use a ``<flashy>`` tag in your shell output, and if
ansi colours are enabled, the following would be rendered as blinking magenta
ansi colors are enabled, the following would be rendered as blinking magenta
text ``$this->out('<flashy>Whoooa</flashy> Something went wrong');``. When
defining styles you can use the following colours for the ``text`` and
defining styles you can use the following colors for the ``text`` and
``background`` attributes:

* black
Expand All @@ -332,10 +332,10 @@ truthy value enables them.
Adding a style makes it available on all instances of ConsoleOutput as well,
so you don't have to redeclare styles for both stdout and stderr objects.

Turning Off Colouring
=====================
Turning Off Coloring
====================

Although colouring is pretty, there may be times when you want to turn it off,
Although coloring is pretty, there may be times when you want to turn it off,
or force it on::

$io->outputAs(ConsoleOutput::RAW);
Expand All @@ -350,6 +350,6 @@ no styling is done at all. There are three modes you can use.
This is a good mode to use if you are outputting XML or, want to debug why
your styling isn't working.

By default on \*nix systems ConsoleOutput objects default to colour output.
By default on \*nix systems ConsoleOutput objects default to color output.
On Windows systems, plain output is the default unless the ``ANSICON``
environment variable is present.
2 changes: 1 addition & 1 deletion en/development/testing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ and number passed.

.. note::

If you are on a Windows system you probably won't see any colours.
If you are on a Windows system you probably won't see any colors.

Test Case Conventions
=====================
Expand Down
2 changes: 1 addition & 1 deletion en/orm/behaviors/translate.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ language abbreviation with area code `UN M.49
:doc:`Internationalization and Localization
</core-libraries/internationalization-and-localization>`. Thus you are
consistent and switching the language works identical for both, the
``Translate Behaviour`` and ``Internationalization and Localization``.
``Translate`` behavior and ``Internationalization and Localization``.

So it's recommended to use either the two letter ISO code of the language like
``en``, ``fr``, ``de`` or the full locale name such as ``fr_FR``, ``es_AR``,
Expand Down