diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 39cfede7f9..1ec446d0cc 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -213,7 +213,7 @@ module ActionMailer
# end
# end
#
- # You can also send attachments with html template, in this case you need to add body, attachments,
+ # You can also send attachments with HTML template, in this case you need to add body, attachments,
# and custom content type like this:
#
# class NotifierMailer < ApplicationMailer
diff --git a/actionpack/test/controller/new_base/render_html_test.rb b/actionpack/test/controller/new_base/render_html_test.rb
index 4bea2ba2e9..c01b2b4a02 100644
--- a/actionpack/test/controller/new_base/render_html_test.rb
+++ b/actionpack/test/controller/new_base/render_html_test.rb
@@ -165,14 +165,14 @@ module RenderHtml
assert_status 200
end
- test "rendering html should escape the string if it is not html safe" do
+ test "rendering HTML should escape the string if it is not HTML safe" do
get "/render_html/with_layout/with_unsafe_html_tag"
assert_body "<p>hello world</p>"
assert_status 200
end
- test "rendering html should not escape the string if it is html safe" do
+ test "rendering HTML should not escape the string if it is HTML safe" do
get "/render_html/with_layout/with_safe_html_tag"
assert_body "hello world
"
diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb
index 9596142f2c..d8ed955c3f 100644
--- a/actionpack/test/controller/new_base/render_template_test.rb
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -10,7 +10,7 @@ module RenderTemplate
"locals.html.erb" => "The secret is <%= secret %>",
"xml_template.xml.builder" => "xml.html do\n xml.p 'Hello'\nend",
"with_raw.html.erb" => "Hello <%=raw 'this is raw' %>",
- "with_implicit_raw.html.erb" => "Hello <%== 'this is also raw' %> in an html template",
+ "with_implicit_raw.html.erb" => "Hello <%== 'this is also raw' %> in an HTML template",
"with_implicit_raw.text.erb" => "Hello <%== 'this is also raw' %> in a text template",
"test/with_json.html.erb" => "<%= render template: 'test/with_json', formats: [:json] %>",
"test/with_json.json.erb" => "<%= render template: 'test/final', formats: [:json] %>",
@@ -123,7 +123,7 @@ module RenderTemplate
get :with_implicit_raw
- assert_body "Hello this is also raw in an html template"
+ assert_body "Hello this is also raw in an HTML template"
assert_status 200
get :with_implicit_raw, params: { format: "text" }
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index c1c2a976a9..590e72cf90 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -170,7 +170,7 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
routing_table = body[/route_table.*<.table>/m]
assert_match "/:controller(/:action)(.:format)", routing_table
assert_match ":controller#:action", routing_table
- assert_no_match "<|>", routing_table, "there should not be escaped html in the output"
+ assert_no_match "<|>", routing_table, "there should not be escaped HTML in the output"
end
test "displays request and response info when a RoutingError occurs" do
diff --git a/actionpack/test/fixtures/test/formatted_xml_erb.html.erb b/actionpack/test/fixtures/test/formatted_xml_erb.html.erb
index 0c855a604b..2c5237c917 100644
--- a/actionpack/test/fixtures/test/formatted_xml_erb.html.erb
+++ b/actionpack/test/fixtures/test/formatted_xml_erb.html.erb
@@ -1 +1 @@
-passed formatted html erb
\ No newline at end of file
+passed formatted HTML erb
\ No newline at end of file
diff --git a/actionview/app/javascript/rails-ujs/features/disable.js b/actionview/app/javascript/rails-ujs/features/disable.js
index 3a2101b74b..44a65bdf78 100644
--- a/actionview/app/javascript/rails-ujs/features/disable.js
+++ b/actionview/app/javascript/rails-ujs/features/disable.js
@@ -45,7 +45,7 @@ const disableElement = (e) => {
}
}
-// Replace element's html with the 'data-disable-with' after storing original html
+// Replace element's HTML with the 'data-disable-with' after storing original html
// and prevent clicking on it
var disableLinkElement = function(element) {
if (getData(element, "ujs:disabled")) { return }
diff --git a/actionview/app/javascript/rails-ujs/utils/form.js b/actionview/app/javascript/rails-ujs/utils/form.js
index 8f0d38accd..0c11a9908a 100644
--- a/actionview/app/javascript/rails-ujs/utils/form.js
+++ b/actionview/app/javascript/rails-ujs/utils/form.js
@@ -31,7 +31,7 @@ const serializeElement = (element, additionalParam) => {
// Helper function that returns form elements that match the specified CSS selector
// If form is actually a "form" element this will return associated elements outside the from that have
-// the html form attribute set
+// the HTML form attribute set
const formElements = (form, selector) => {
if (matches(form, "form")) {
return toArray(form.elements).filter(el => matches(el, selector))
diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb
index e93ae1dedd..7ab394f0bd 100644
--- a/actionview/test/actionpack/controller/render_test.rb
+++ b/actionview/test/actionpack/controller/render_test.rb
@@ -1074,24 +1074,24 @@ class RenderTest < ActionController::TestCase
def test_should_render_formatted_template
get :formatted_html_erb
- assert_equal "formatted html erb", @response.body
+ assert_equal "formatted HTML erb", @response.body
end
def test_should_render_formatted_html_erb_template
get :formatted_xml_erb
- assert_equal "passed formatted html erb", @response.body
+ assert_equal "passed formatted HTML erb", @response.body
end
def test_should_render_formatted_html_erb_template_with_bad_accepts_header
@request.env["HTTP_ACCEPT"] = "; a=dsf"
get :formatted_xml_erb
- assert_equal "passed formatted html erb", @response.body
+ assert_equal "passed formatted HTML erb", @response.body
end
def test_should_render_formatted_html_erb_template_with_faulty_accepts_header
@request.accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, */*"
get :formatted_xml_erb
- assert_equal "passed formatted html erb", @response.body
+ assert_equal "passed formatted HTML erb", @response.body
end
def test_layout_test_with_different_layout
@@ -1277,7 +1277,7 @@ class RenderTest < ActionController::TestCase
get :render_to_string_with_template_and_html_partial
assert_equal "**only partial**\n", @controller.instance_variable_get(:@text)
assert_equal "only partial\n", @controller.instance_variable_get(:@html)
- assert_equal "only html partial\n", @response.body
+ assert_equal "only HTML partial\n", @response.body
assert_equal "text/html", @response.media_type
end
@@ -1290,7 +1290,7 @@ class RenderTest < ActionController::TestCase
def test_render_template_within_a_template_with_other_format
get :render_template_within_a_template_with_other_format
- expected = "only html partialThis is grand!
"
+ expected = "only HTML partialThis is grand!
"
assert_equal expected, @response.body.strip
assert_equal "text/html", @response.media_type
end
diff --git a/actionview/test/fixtures/actionpack/test/_partial_only_html.html b/actionview/test/fixtures/actionpack/test/_partial_only_html.html
index d2d630bd40..6ba71f2303 100644
--- a/actionview/test/fixtures/actionpack/test/_partial_only_html.html
+++ b/actionview/test/fixtures/actionpack/test/_partial_only_html.html
@@ -1 +1 @@
-only html partial
\ No newline at end of file
+only HTML partial
\ No newline at end of file
diff --git a/actionview/test/fixtures/actionpack/test/formatted_html_erb.html.erb b/actionview/test/fixtures/actionpack/test/formatted_html_erb.html.erb
index 1c64efabd8..85ce39170c 100644
--- a/actionview/test/fixtures/actionpack/test/formatted_html_erb.html.erb
+++ b/actionview/test/fixtures/actionpack/test/formatted_html_erb.html.erb
@@ -1 +1 @@
-formatted html erb
\ No newline at end of file
+formatted HTML erb
\ No newline at end of file
diff --git a/actionview/test/fixtures/actionpack/test/formatted_xml_erb.html.erb b/actionview/test/fixtures/actionpack/test/formatted_xml_erb.html.erb
index 0c855a604b..2c5237c917 100644
--- a/actionview/test/fixtures/actionpack/test/formatted_xml_erb.html.erb
+++ b/actionview/test/fixtures/actionpack/test/formatted_xml_erb.html.erb
@@ -1 +1 @@
-passed formatted html erb
\ No newline at end of file
+passed formatted HTML erb
\ No newline at end of file
diff --git a/actionview/test/fixtures/test/_partial_with_only_html_version.html.erb b/actionview/test/fixtures/test/_partial_with_only_html_version.html.erb
index 00e6b6d6da..1a1abfa3f1 100644
--- a/actionview/test/fixtures/test/_partial_with_only_html_version.html.erb
+++ b/actionview/test/fixtures/test/_partial_with_only_html_version.html.erb
@@ -1 +1 @@
-partial with only html version
\ No newline at end of file
+partial with only HTML version
\ No newline at end of file
diff --git a/actionview/test/template/form_collections_helper_test.rb b/actionview/test/template/form_collections_helper_test.rb
index ddd8e105a4..56d2ec6572 100644
--- a/actionview/test/template/form_collections_helper_test.rb
+++ b/actionview/test/template/form_collections_helper_test.rb
@@ -101,7 +101,7 @@ class FormCollectionsHelperTest < ActionView::TestCase
assert_no_select "input[type=radio][value=false][readonly=readonly]"
end
- test "collection radio accepts html options as input" do
+ test "collection radio accepts HTML options as input" do
collection = [[1, true], [0, false]]
with_collection_radio_buttons :user, :active, collection, :last, :first, {}, { class: "special-radio" }
@@ -109,7 +109,7 @@ class FormCollectionsHelperTest < ActionView::TestCase
assert_select "input[type=radio][value=false].special-radio#user_active_false"
end
- test "collection radio accepts html options as the last element of array" do
+ test "collection radio accepts HTML options as the last element of array" do
collection = [[1, true, { class: "foo" }], [0, false, { class: "bar" }]]
with_collection_radio_buttons :user, :active, collection, :second, :first
@@ -160,7 +160,7 @@ class FormCollectionsHelperTest < ActionView::TestCase
assert_select "label[for=user_active_false] + input#user_active_false[type=radio]"
end
- test "collection radio with block helpers accept extra html options" do
+ test "collection radio with block helpers accept extra HTML options" do
with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
b.label(class: "radio_button") + b.radio_button(class: "radio_button")
end
@@ -329,7 +329,7 @@ class FormCollectionsHelperTest < ActionView::TestCase
assert_select "label[for=user_title_господин]", "Господин"
end
- test "collection check boxes accepts html options as the last element of array" do
+ test "collection check boxes accepts HTML options as the last element of array" do
collection = [[1, "Category 1", { class: "foo" }], [2, "Category 2", { class: "bar" }]]
with_collection_check_boxes :user, :active, collection, :first, :second
@@ -460,7 +460,7 @@ class FormCollectionsHelperTest < ActionView::TestCase
assert_no_select 'input[type=checkbox][value="2"][readonly=readonly]'
end
- test "collection check boxes accepts html options" do
+ test "collection check boxes accepts HTML options" do
collection = [[1, "Category 1"], [2, "Category 2"]]
with_collection_check_boxes :user, :category_ids, collection, :first, :last, {}, { class: "check" }
@@ -506,7 +506,7 @@ class FormCollectionsHelperTest < ActionView::TestCase
assert_select "label[for=user_active_false] + input#user_active_false[type=checkbox]"
end
- test "collection check boxes with block helpers accept extra html options" do
+ test "collection check boxes with block helpers accept extra HTML options" do
with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
b.label(class: "check_box") + b.check_box(class: "check_box")
end
diff --git a/actionview/test/template/output_safety_helper_test.rb b/actionview/test/template/output_safety_helper_test.rb
index eb2952fbce..06bdb667e1 100644
--- a/actionview/test/template/output_safety_helper_test.rb
+++ b/actionview/test/template/output_safety_helper_test.rb
@@ -69,7 +69,7 @@ class OutputSafetyHelperTest < ActionView::TestCase
assert_equal("<script>", to_sentence(["<script>"]))
end
- test "to_sentence connector words are checked for html safety" do
+ test "to_sentence connector words are checked for HTML safety" do
assert_equal "one & two, and three", to_sentence(["one", "two", "three"], words_connector: " & ".html_safe)
assert_equal "one & two", to_sentence(["one", "two"], two_words_connector: " & ".html_safe)
assert_equal "one, two <script>alert(1)</script> three", to_sentence(["one", "two", "three"], last_word_connector: " ")
diff --git a/actionview/test/template/text_helper_test.rb b/actionview/test/template/text_helper_test.rb
index 828d4e86a1..fd6844120d 100644
--- a/actionview/test/template/text_helper_test.rb
+++ b/actionview/test/template/text_helper_test.rb
@@ -19,12 +19,12 @@ class TextHelperTest < ActionView::TestCase
end
def test_simple_format_should_be_html_safe
- assert_predicate simple_format(" test with html tags "), :html_safe?
+ assert_predicate simple_format(" test with HTML tags "), :html_safe?
end
def test_simple_format_included_in_isolation
helper_klass = Class.new { include ActionView::Helpers::TextHelper }
- assert_predicate helper_klass.new.simple_format(" test with html tags "), :html_safe?
+ assert_predicate helper_klass.new.simple_format(" test with HTML tags "), :html_safe?
end
def test_simple_format
diff --git a/actionview/test/ujs/public/vendor/jquery-2.2.0.js b/actionview/test/ujs/public/vendor/jquery-2.2.0.js
index b26b660667..bebfdc3570 100644
--- a/actionview/test/ujs/public/vendor/jquery-2.2.0.js
+++ b/actionview/test/ujs/public/vendor/jquery-2.2.0.js
@@ -2849,7 +2849,7 @@ var rootjQuery,
match = rquickExpr.exec( selector );
}
- // Match html or make sure no context is specified for #id
+ // Match HTML or make sure no context is specified for #id
if ( match && ( match[ 1 ] || !context ) ) {
// HANDLE: $(html) -> $(array)
@@ -4324,7 +4324,7 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
} else if ( !rhtml.test( elem ) ) {
nodes.push( context.createTextNode( elem ) );
- // Convert html into DOM nodes
+ // Convert HTML into DOM nodes
} else {
tmp = tmp || fragment.appendChild( context.createElement( "div" ) );
@@ -8312,7 +8312,7 @@ jQuery.extend( {
// Convert anything to text
"* text": String,
- // Text to html (true = no transformation)
+ // Text to HTML (true = no transformation)
"text html": true,
// Evaluate text as a JSON expression
@@ -9365,7 +9365,7 @@ support.createHTMLDocument = ( function() {
// Argument "data" should be string of html
// context (optional): If specified, the fragment will be created in this context,
// defaults to document
-// keepScripts (optional): If true, will include scripts passed in the html string
+// keepScripts (optional): If true, will include scripts passed in the HTML string
jQuery.parseHTML = function( data, context, keepScripts ) {
if ( !data || typeof data !== "string" ) {
return null;
@@ -9637,7 +9637,7 @@ jQuery.fn.extend( {
// 1) For the element inside the iframe without offsetParent, this method will return
// documentElement of the parent window
// 2) For the hidden or detached element
- // 3) For body or html element, i.e. in case of the html node - it will return itself
+ // 3) For body or HTML element, i.e. in case of the HTML node - it will return itself
//
// but those exceptions were never presented as a real life use-cases
// and might be considered as more preferable results.
diff --git a/actionview/test/ujs/public/vendor/qunit.js b/actionview/test/ujs/public/vendor/qunit.js
index 49209f9d89..e7921c485e 100644
--- a/actionview/test/ujs/public/vendor/qunit.js
+++ b/actionview/test/ujs/public/vendor/qunit.js
@@ -2103,7 +2103,7 @@ QUnit.jsDump = (function() {
key: quote,
// function calls it internally, it's the content of the function
functionCode: "[code]",
- // node calls it internally, it's an html attribute value
+ // node calls it internally, it's an HTML attribute value
attribute: quote,
string: quote,
date: quote,
diff --git a/activestorage/README.md b/activestorage/README.md
index 67709c8c2d..32dbba6433 100644
--- a/activestorage/README.md
+++ b/activestorage/README.md
@@ -144,11 +144,11 @@ Active Storage, with its included JavaScript library, supports uploading directl
1. Include the Active Storage JavaScript in your application's JavaScript bundle or reference it directly.
- Requiring directly without bundling through the asset pipeline in the application html with autostart:
+ Requiring directly without bundling through the asset pipeline in the application HTML with autostart:
```html
<%= javascript_include_tag "activestorage" %>
```
- Requiring via importmap-rails without bundling through the asset pipeline in the application html without autostart as ESM:
+ Requiring via importmap-rails without bundling through the asset pipeline in the application HTML without autostart as ESM:
```ruby
# config/importmap.rb
pin "@rails/activestorage", to: "activestorage.esm.js"
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index d02a2ee6ea..8fce9ef2d6 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -179,7 +179,7 @@ module ActiveSupport # :nodoc:
# Raised when ActiveSupport::SafeBuffer#safe_concat is called on unsafe buffers.
class SafeConcatError < StandardError
def initialize
- super "Could not concatenate to the buffer because it is not html safe."
+ super "Could not concatenate to the buffer because it is not HTML safe."
end
end
diff --git a/guides/source/i18n.md b/guides/source/i18n.md
index 95dab83412..8d6d5c253d 100644
--- a/guides/source/i18n.md
+++ b/guides/source/i18n.md
@@ -853,7 +853,7 @@ Safe strings on the other hand are interpolated verbatim.
NOTE: Automatic conversion to HTML safe translate text is only available from the `translate` (or `t`) helper method. This works in views and controllers.
-
+
### Translations for Active Record Models