-
Notifications
You must be signed in to change notification settings - Fork 22.5k
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.
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
Change spelling of 'color' to American spelling #3005
Conversation
@@ -125,7 +125,7 @@ <h2 id="What_happens_if_a_browser_encounters_CSS_it_doesnt_understand">What happ | |||
|
|||
<pre class="brush: css">p { | |||
font-weight: bold; | |||
colour: blue; /* incorrect spelling of the color property */ | |||
color: blue; /* incorrect spelling of the color property */ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this one is supposed to be incorrect - it's a demo :)
@@ -579,7 +579,7 @@ <h3 id="Preferred_style_guides">Preferred style guides</h3> | |||
|
|||
<h3 id="Preferred_dictionary">Preferred dictionary</h3> | |||
|
|||
<p>For questions of spelling, please refer to <a href="http://www.dictionary.com/">Dictionary.com</a>. The spelling checker for this site uses American English. Please do not use variant spellings (e.g., use <em>color</em> rather than <em>colour</em>).</p> | |||
<p>For questions of spelling, please refer to <a href="http://www.dictionary.com/">Dictionary.com</a>. The spelling checker for this site uses American English. Please do not use variant spellings (e.g., use <em>color</em> rather than <em>color</em>).</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is a note telling us to use the US spelling.
@@ -204,7 +204,7 @@ <h2 id="Learn_more">Learn more</h2> | |||
<ul> | |||
<li><a href="https://github.com/mdn/webextensions-examples/tree/master/beastify">beastify</a></li> | |||
<li><a class="external external-icon" href="https://github.com/mdn/webextensions-examples/tree/master/bookmark-it">Bookmark it!</a></li> | |||
<li><a class="external external-icon" href="https://github.com/mdn/webextensions-examples/tree/master/favourite-colour">favourite-colour</a></li> | |||
<li><a class="external external-icon" href="https://github.com/mdn/webextensions-examples/tree/master/favorite-color">favorite-color</a></li> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is a URL so probably shouldn't be caught unless it is also being changed
@@ -227,7 +227,7 @@ <h2 id="Learn_more">Learn more</h2> | |||
<li>open the settings page directly from your extension using the <code><a href="/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/openOptionsPage">runtime.openOptionsPage()</a></code> API</li> | |||
<li>Settings page example: | |||
<ul> | |||
<li><a href="https://github.com/mdn/webextensions-examples/tree/master/favourite-colour">favourite-colour</a></li> | |||
<li><a href="https://github.com/mdn/webextensions-examples/tree/master/favorite-color">favorite-color</a></li> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
another URL, and I am concerned about the things above as presumably they link to ths code example which I assume uses the UK spelling.
@@ -254,7 +254,7 @@ <h2 id="Localized_string_selection">Localized string selection</h2> | |||
<ul> | |||
<li>messages.json | |||
<ul> | |||
<li><code>{ "colorLocalised": { "message": "colour", "description": "Color." }, ... }</code></li> | |||
<li><code>{ "colorLocalised": { "message": "color", "description": "Color." }, ... }</code></li> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
seems a localization example, I think the UK spelling may be intentional.
@@ -286,7 +286,7 @@ <h2 id="Localized_string_selection">Localized string selection</h2> | |||
<p>Suppose the <code>default_locale</code> is set to <code>fr</code>, and the browser's current locale is <code>en_GB</code>:</p> | |||
|
|||
<ul> | |||
<li>If the extension calls <code>getMessage("colorLocalised")</code>, it will return "colour".</li> | |||
<li>If the extension calls <code>getMessage("colorLocalised")</code>, it will return "color".</li> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also localization
@@ -30,7 +30,7 @@ <h2 id="Examine_CSS_rules">Examine CSS rules</h2> | |||
|
|||
<h3 id="Invalid_value_warnings">Invalid value warnings</h3> | |||
|
|||
<p>A warning icon appears next to unsupported CSS properties or rules that have invalid values. This can help you understand why certain styles are not being applied. In the following example, a spelling error, "background-colour" instead of "background-color" has made the rule invalid:</p> | |||
<p>A warning icon appears next to unsupported CSS properties or rules that have invalid values. This can help you understand why certain styles are not being applied. In the following example, a spelling error, "background-color" instead of "background-color" has made the rule invalid:</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also intentional as an example
@@ -30,7 +30,7 @@ <h3 id="CSS">CSS</h3> | |||
<li>Previously, an element styled with {{cssxref("display")}}:<code> inline-block</code> with a child element of type {{domxref("HTMLInputElement")}} styled with <code>display:block</code> had a wrong baseline ({{bug(1330962)}}). This is now fixed.</li> | |||
<li>When Mozilla introduced dedicated content threads to Firefox (through the Electrolysis or e10s project), support for styling {{HTMLElement("option")}} elements was removed temporarily. Starting in Firefox 54, you can apply foreground and background colors to <code><option></code> elements again, using the {{cssxref("color")}} and {{cssxref("background-color")}} attributes. See {{bug(910022)}} for more information. Note that this is still disabled in Linux due to lack of contrast (see {{bug(1338283)}} for progress on this).</li> | |||
<li><a href="/en-US/docs/Web/CSS/CSS_Animations">CSS Animations</a> now send the {{event("animationcancel")}} event as expected when an animation aborts prematurely ({{bug(1302648)}}).</li> | |||
<li>Transparent colors (i.e. those with an alpha channel of 0) were being serialized to the <a href="/en-US/docs/Web/CSS/color_value#transparent_keyword"><code>transparent</code> color keyword</a> in <a href="https://www.fxsitecompat.com/en-CA/docs/2017/transparent-rgba-colour-values-are-no-longer-serialized-to-transparent-keyword/">certain situations</a>; this has been fixed so that Firefox follows the spec (as well as other browsers' implementations). See ({{bug("1339394")}} for further information.</li> | |||
<li>Transparent colors (i.e. those with an alpha channel of 0) were being serialized to the <a href="/en-US/docs/Web/CSS/color_value#transparent_keyword"><code>transparent</code> color keyword</a> in <a href="https://www.fxsitecompat.com/en-CA/docs/2017/transparent-rgba-color-values-are-no-longer-serialized-to-transparent-keyword/">certain situations</a>; this has been fixed so that Firefox follows the spec (as well as other browsers' implementations). See ({{bug("1339394")}} for further information.</li> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
URL
@@ -54,7 +54,7 @@ <h3 id="Automated_Checking_Repair">Automated Checking & Repair</h3> | |||
|
|||
<p>The HTML advanced validator may also be downloaded from <a href="https://addons.mozilla.org/firefox/addon/249">Firefox Add-ons: HTML Validator</a>.</p> | |||
</li> | |||
<li><a class="ex-ref" href="http://juicystudio.com/services/colourcontrast.php#contrast">Color contrast analyzer</a> by Juicy Studio | |||
<li><a class="ex-ref" href="http://juicystudio.com/services/colorcontrast.php#contrast">Color contrast analyzer</a> by Juicy Studio |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
URL
@@ -67,7 +67,7 @@ <h3 id="Automated_Checking_Repair">Automated Checking & Repair</h3> | |||
<address><a class="ex-ref" href="http://www.useit.com/alertbox/designmistakes.html">Top Ten Web Design Mistakes of 2005: 1. Legibility Problems</a></address> | |||
</blockquote> | |||
|
|||
<p>How can a web author establish easily and quickly if the background color and foreground (text) color in use in his webpages have sufficient color contrast difference and sufficient color brightness difference? <a class="ex-ref" href="http://juicystudio.com/services/colourcontrast.php#contrast">Color contrast analyzer</a> is an excellent tool for such task. Effective color contrast and effective color brightness difference have a <strong>decisive importance for reading</strong>, furthermore for people with partial color deficiency (see the excellent examples in <a class="ex-ref" href="http://www.lighthouse.org/accessibility/effective-color-contrast/">Effective Color Contrast</a> by Lighthouse International). A study has established that <a class="ex-ref" href="https://msdn.microsoft.com/en-us/library/bb263953.aspx">about 8 percent of all men have some form of color deficiency</a>. Color contrast analyzer algorithm is based on the formula provided in <a class="ex-ref" href="https://www.w3.org/TR/AERT#color-contrast">Techniques For Accessibility Evaluation And Repair Tools</a> from W3C.</p> | |||
<p>How can a web author establish easily and quickly if the background color and foreground (text) color in use in his webpages have sufficient color contrast difference and sufficient color brightness difference? <a class="ex-ref" href="http://juicystudio.com/services/colorcontrast.php#contrast">Color contrast analyzer</a> is an excellent tool for such task. Effective color contrast and effective color brightness difference have a <strong>decisive importance for reading</strong>, furthermore for people with partial color deficiency (see the excellent examples in <a class="ex-ref" href="http://www.lighthouse.org/accessibility/effective-color-contrast/">Effective Color Contrast</a> by Lighthouse International). A study has established that <a class="ex-ref" href="https://msdn.microsoft.com/en-us/library/bb263953.aspx">about 8 percent of all men have some form of color deficiency</a>. Color contrast analyzer algorithm is based on the formula provided in <a class="ex-ref" href="https://www.w3.org/TR/AERT#color-contrast">Techniques For Accessibility Evaluation And Repair Tools</a> from W3C.</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
URL
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few URLs and also intentional use of UK spelling have been caught here.
I'm also a little nervous about updated naming in code especially where it links to an example somewhere which presumably uses the UK spelling. Inconsistency is probably worse than Britishness.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There may be a few ones you caught in here, but there have been a few passes on these words already and most of this are changing intentional spellings that highlight issues or are names of tools/products
@@ -265,7 +265,7 @@ <h2 id="Properties_and_values">Properties and values</h2> | |||
</div> | |||
|
|||
<div class="warning"> | |||
<p><strong>Important</strong>: In CSS (and other web standards), it has been agreed that US spelling is the standard where there is language variation or uncertainty. For example, <code>color</code> should be spelled <code>color</code>, as <code>colour</code> will not work.</p> | |||
<p><strong>Important</strong>: In CSS (and other web standards), it has been agreed that US spelling is the standard where there is language variation or uncertainty. For example, <code>color</code> should be spelled <code>color</code>, as <code>color</code> will not work.</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's spelled here as an example of what not to do
|
||
<p><img alt="Colour contrast on this page: excellent!" src="colour-contrast.png"></p> | ||
<p><img alt="Color contrast on this page: excellent!" src="color-contrast.png"></p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can't change this without renaming the PNG itself
Co-authored-by: Rachel Andrew <[email protected]>
Co-authored-by: Rachel Andrew <[email protected]>
@nschonni I think I got everything. (I hope.) |
@@ -227,7 +227,7 @@ <h2 id="Learn_more">Learn more</h2> | |||
<li>open the settings page directly from your extension using the <code><a href="/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/openOptionsPage">runtime.openOptionsPage()</a></code> API</li> | |||
<li>Settings page example: | |||
<ul> | |||
<li><a href="https://github.com/mdn/webextensions-examples/tree/master/favourite-colour">favourite-colour</a></li> | |||
<li><a href="https://github.com/mdn/webextensions-examples/tree/master/favorite-colour">favorite-colour</a></li> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you need to do a find/replace to change all these back to "favourite-colour", since it's the name of the tool (and these links are broken). Probably the example code as well, as I'm not sure if it also depends on the spelling there
} | ||
}</pre> | ||
|
||
<p>Given this JSON manifest, the <code>favourite-colour[email protected]</code> extension could access the data using code like this:</p> | ||
<p>Given this JSON manifest, the <code>favorite-color[email protected]</code> extension could access the data using code like this:</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm guessing the email address shouldn't be changed
@@ -632,7 +632,7 @@ <h4 id="Harding">Harding</h4> | |||
<h4 id="ISO">ISO</h4> | |||
|
|||
<ul> | |||
<li><a href="https://www.iso.org/obp/ui/#iso:std:iec:61966:-2-2:ed-1:v1:en">IEC 61966-2-2:2003(en)</a> Multimedia systems and equipment — Colour measurement and management — Part 2-2: Colour management — Extended RGB color space — scRGB</li> | |||
<li><a href="https://www.iso.org/obp/ui/#iso:std:iec:61966:-2-2:ed-1:v1:en">IEC 61966-2-2:2003(en)</a> Multimedia systems and equipment — colour measurement and management — Part 2-2: colour management — Extended RGB color space — scRGB</li> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Think this one needs to be undone, since it's lowercase in the title now
files/en-us/web/accessibility/aria/forms/basic_form_hints/index.html
Outdated
Show resolved
Hide resolved
…x.html Co-authored-by: Nick Schonning <[email protected]>
Ready for you again. Sorry for all the trouble. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just flagged all the "favourite-colour" lines that I think need to revert, rest looks good
@@ -150,20 +150,20 @@ <h2 id="Managed_storage_manifests">Managed storage manifests</h2> | |||
<p>For example:</p> | |||
|
|||
<pre class="brush: json line-numbers language-json">{ | |||
"name": "favourite-colour[email protected]", | |||
"name": "favourite-color[email protected]", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if this is a real email that needs to stay as-is
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's an example. Unless it contains a link or a title from another property, it seems like it should follow rules for text.
} | ||
}</pre> | ||
|
||
<p>Given this JSON manifest, the <code>favourite-colour[email protected]</code> extension could access the data using code like this:</p> | ||
<p>Given this JSON manifest, the <code>favourite-color[email protected]</code> extension could access the data using code like this:</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if this is a real email that needs to stay as-is
@@ -25,7 +25,7 @@ <h2 id="Provisioning_managed_storage">Provisioning managed storage</h2> | |||
<p>Here's an example manifest:</p> | |||
|
|||
<pre class="brush: json">{ | |||
"name": "favourite[email protected]", | |||
"name": "favorite[email protected]", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if this is a real email that needs to stay as-is
@@ -34,7 +34,7 @@ <h2 id="Provisioning_managed_storage">Provisioning managed storage</h2> | |||
} | |||
}</pre> | |||
|
|||
<p>Given this manifest, the "favourite[email protected]" extension could access the data using code like this:</p> | |||
<p>Given this manifest, the "favorite[email protected]" extension could access the data using code like this:</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if this is a real email that needs to stay as-is
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sideshowbarker Is this a real email address?
files/en-us/mozilla/add-ons/webextensions/add_a_button_to_the_toolbar/index.html
Outdated
Show resolved
Hide resolved
@@ -58,7 +58,7 @@ <h2 id="Browser_compatibility">Browser compatibility</h2> | |||
|
|||
<h2 id="Examples">Examples</h2> | |||
|
|||
<p>This example tries to remove the cookie named "favourite-colour", whose URL matches the URL of the document hosted by the currently active tab:</p> | |||
<p>This example tries to remove the cookie named "favorite-color", whose URL matches the URL of the document hosted by the currently active tab:</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Undo
@@ -71,7 +71,7 @@ <h2 id="Examples">Examples</h2> | |||
function removeCookie(tabs) { | |||
var removing = browser.cookies.remove({ | |||
url: tabs[0].url, | |||
name: "favourite-colour" | |||
name: "favorite-color" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Undo
@@ -80,7 +80,7 @@ <h2 id="Examples">Examples</h2> | |||
function setCookie(tabs) { | |||
browser.cookies.set({ | |||
url: tabs[0].url, | |||
name: "favourite-colour", | |||
name: "favorite-color", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Undo
files/en-us/mozilla/add-ons/webextensions/user_interface/options_pages/index.html
Outdated
Show resolved
Hide resolved
files/en-us/mozilla/add-ons/webextensions/user_interface/options_pages/index.html
Outdated
Show resolved
Hide resolved
I've fixed the broken links. Why wouldn't identifiers in code examples use U.S. spelling? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't gone through the demo code enough to say if the cookie name is expected in that code. Also don't know if that email address is a real Mozilla one or not
@@ -18,7 +18,7 @@ | |||
|
|||
<h2 id="Specifying_the_options_page">Specifying the options page</h2> | |||
|
|||
<p>To create an options page, write an HTML file defining the page. This page can include CSS and JavaScript files, like a normal web page. This page, from the <a href="https://github.com/mdn/webextensions-examples/tree/master/favourite-colour">favorite-colour</a> example, includes a JavaScript file:</p> | |||
<p>To create an options page, write an HTML file defining the page. This page can include CSS and JavaScript files, like a normal web page. This page, from the <a href="https://github.com/mdn/webextensions-examples/tree/master/favourite-color">favourite-color</a> example, includes a JavaScript file:</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Undo URL
@@ -60,4 +60,4 @@ <h2 id="Options_content_design">Options content design</h2> | |||
|
|||
<h2 id="Examples">Examples</h2> | |||
|
|||
<p>The <a href="https://github.com/mdn/webextensions-examples">webextensions-examples</a> repository on GitHub includes the <a href="https://github.com/mdn/webextensions-examples/tree/master/favourite-colour">favorite-colour</a> example which implements options page features.</p> | |||
<p>The <a href="https://github.com/mdn/webextensions-examples">webextensions-examples</a> repository on GitHub includes the <a href="https://github.com/mdn/webextensions-examples/tree/master/favourite-color">favourite-color</a> example which implements options page features.</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Undo URL
Please look again. |
@nschonni I think this one is waiting for your re-review |
and/or waiting for an approval from @rachelandrew |
Ping |
@jpmedley Do you still want to keep this PR open? |
Sorry for neglecting this. I just merged some conflict corrections. nschonni seems to want me to change a bunch of examples back to British spelling. Seems like, if it's not a URL or a title, it should follow the same rule as text: American spelling. |
@jpmedley I guess the decision is up to you, but I also notice that this PR is blocked on resolution of the review comment from @rachelandrew at #3005 (review) |
Everything from @rachelandrew is outdated, meaning I think I covered it all. The ball is in Rachel's court. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
apologies - didn't realise I was blocking this, all looks good now.
This includes a few changes to the word 'favorite' because they were part of the same keyword or identifier is the primary issue of this PR.