From 2aa8e0a56f39f0a44f4deb19c856314a7a473b2f Mon Sep 17 00:00:00 2001
From: Cassidy Kobewka <hello@cassidy.codes>
Date: Sun, 15 Apr 2018 10:42:56 -0400
Subject: Inclusive Language in Documentation Examples [ci skip]

---
 guides/source/action_view_overview.md |  4 ++--
 guides/source/i18n.md                 | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'guides')

diff --git a/guides/source/action_view_overview.md b/guides/source/action_view_overview.md
index c01d1082b6..37b8843d1e 100644
--- a/guides/source/action_view_overview.md
+++ b/guides/source/action_view_overview.md
@@ -1267,8 +1267,8 @@ password_field_tag 'pass'
 Creates a radio button; use groups of radio buttons named the same to allow users to select from a group of options.
 
 ```ruby
-radio_button_tag 'gender', 'male'
-# => <input id="gender_male" name="gender" type="radio" value="male" />
+radio_button_tag 'favorite_color', 'maroon'
+# => <input id="favorite_color_maroon" name="favorite_color" type="radio" value="maroon" />
 ```
 
 #### select_tag
diff --git a/guides/source/i18n.md b/guides/source/i18n.md
index 339b356a78..f1b6128762 100644
--- a/guides/source/i18n.md
+++ b/guides/source/i18n.md
@@ -829,14 +829,14 @@ For example when you add the following translations:
 en:
   activerecord:
     models:
-      user: Dude
+      user: Customer
     attributes:
       user:
         login: "Handle"
       # will translate User attribute "login" as "Handle"
 ```
 
-Then `User.model_name.human` will return "Dude" and `User.human_attribute_name("login")` will return "Handle".
+Then `User.model_name.human` will return "Customer" and `User.human_attribute_name("login")` will return "Handle".
 
 You can also set a plural form for model names, adding as following:
 
@@ -845,11 +845,11 @@ en:
   activerecord:
     models:
       user:
-        one: Dude
-        other: Dudes
+        one: Customer
+        other: Customers
 ```
 
-Then `User.model_name.human(count: 2)` will return "Dudes". With `count: 1` or without params will return "Dude".
+Then `User.model_name.human(count: 2)` will return "Customers". With `count: 1` or without params will return "Customer".
 
 In the event you need to access nested attributes within a given model, you should nest these under `model/attribute` at the model level of your translation file:
 
@@ -857,12 +857,12 @@ In the event you need to access nested attributes within a given model, you shou
 en:
   activerecord:
     attributes:
-      user/gender:
-        female: "Female"
-        male: "Male"
+      user/subscribed_to_newsletter:
+        true: "True"
+        false: "False"
 ```
 
-Then `User.human_attribute_name("gender.female")` will return "Female".
+Then `User.human_attribute_name("subscribed_to_newsletter.true")` will return "True".
 
 NOTE: If you are using a class which includes `ActiveModel` and does not inherit from `ActiveRecord::Base`, replace `activerecord` with `activemodel` in the above key paths.
 
-- 
cgit v1.2.3


From 3137a8739e7cb0885cb3f9f631dbca8107448ce5 Mon Sep 17 00:00:00 2001
From: Cassidy Kobewka <hello@cassidy.codes>
Date: Mon, 16 Apr 2018 19:09:45 -0400
Subject: Use string-based fields. [ci skip]

---
 guides/source/i18n.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'guides')

diff --git a/guides/source/i18n.md b/guides/source/i18n.md
index f1b6128762..f42ab15b8b 100644
--- a/guides/source/i18n.md
+++ b/guides/source/i18n.md
@@ -857,12 +857,12 @@ In the event you need to access nested attributes within a given model, you shou
 en:
   activerecord:
     attributes:
-      user/subscribed_to_newsletter:
-        true: "True"
-        false: "False"
+      user/role:
+        admin: "Admin"
+        contributor: "Contributor"
 ```
 
-Then `User.human_attribute_name("subscribed_to_newsletter.true")` will return "True".
+Then `User.human_attribute_name("role.admin")` will return "Admin".
 
 NOTE: If you are using a class which includes `ActiveModel` and does not inherit from `ActiveRecord::Base`, replace `activerecord` with `activemodel` in the above key paths.
 
-- 
cgit v1.2.3