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

ER-742 CMS microcopy resources #744

Merged
merged 15 commits into from
Aug 9, 2023
Merged

ER-742 CMS microcopy resources #744

merged 15 commits into from
Aug 9, 2023

Conversation

peterdavidhamilton
Copy link
Contributor

@peterdavidhamilton peterdavidhamilton commented Jul 27, 2023 •
edited
Loading

ER-742

NB: revert CONTENTFUL_PREVIEW before merging

  1. user.show.your_setting_details_html
  2. user.show.your_email_preferences_html
  3. user.show.training_emails_true
  4. user.show.training_emails_false
  5. activemodel.errors.models.user.attributes.current_password.blank
  6. activemodel.errors.models.user.attributes.current_password.invalid
  7. activemodel.errors.models.user.attributes.first_name.blank
  8. activemodel.errors.models.user.attributes.last_name.blank
  9. activemodel.errors.models.user.attributes.email.blank
  10. activemodel.errors.models.user.attributes.email.invalid
  11. activemodel.errors.models.user.attributes.password.blank
  12. activemodel.errors.models.user.attributes.password.too_short
  13. activemodel.errors.models.user.attributes.password_confirmation.confirmation
  14. activemodel.errors.models.user.attributes.terms_and_conditions_agreed_at.blank
  15. activemodel.errors.models.user.attributes.setting_type_id.blank
  16. activemodel.errors.models.user.attributes.setting_type_id.inclusion
  17. activemodel.errors.models.user.attributes.setting_type_other.blank
  18. activemodel.errors.models.user.attributes.role_type.blank
  19. activemodel.errors.models.user.attributes.role_type_other.blank
  20. activemodel.errors.models.user.attributes.local_authority.blank
  21. activemodel.errors.models.user.attributes.training_emails.blank
  22. activemodel.errors.models.user.attributes.early_years_emails.blank
  23. activerecord.errors.models.response.attributes.answers.blank
  24. activerecord.errors.models.user_answer.attributes.answer.blank
  25. activerecord.errors.models.user.attributes.current_password.blank
  26. activerecord.errors.models.user.attributes.current_password.invalid
  27. activerecord.errors.models.user.attributes.first_name.blank
  28. activerecord.errors.models.user.attributes.last_name.blank
  29. activerecord.errors.models.user.attributes.postcode.blank
  30. activerecord.errors.models.user.attributes.postcode.invalid
  31. activerecord.errors.models.user.attributes.email.blank
  32. activerecord.errors.models.user.attributes.email.invalid
  33. activerecord.errors.models.user.attributes.password.blank
  34. activerecord.errors.models.user.attributes.password.too_short
  35. activerecord.errors.models.user.attributes.password_confirmation.confirmation
  36. activerecord.errors.models.user.attributes.terms_and_conditions_agreed_at.blank
  37. activerecord.errors.models.user.attributes.ofsted_number.invalid
  38. phase_banner
  39. page_number
  40. links.change
  41. links.save
  42. banners.alert
  43. banners.error
  44. banners.important
  45. banners.notice
  46. date_completed
  47. registration.names.edit.heading
  48. registration.names.edit.body
  49. registration.names.edit.button
  50. registration.names.update.complete_update
  51. registration.setting_types.edit.heading
  52. registration.setting_types.edit.body
  53. registration.setting_types.edit.button
  54. registration.setting_types.edit.link_to_setting_type_other
  55. registration.setting_types.edit.autocomplete_not_found
  56. registration.setting_types.update.complete_registration
  57. registration.setting_types.update.update_registration
  58. registration.setting_types.update.complete_update
  59. registration.setting_type_others.edit.heading
  60. registration.setting_type_others.edit.body
  61. registration.setting_type_others.edit.button
  62. registration.setting_type_others.update.complete_registration
  63. registration.setting_type_others.update.update_registration
  64. registration.setting_type_others.update.complete_update
  65. registration.local_authorities.edit.heading
  66. registration.local_authorities.edit.body
  67. registration.local_authorities.edit.button
  68. registration.local_authorities.edit.multiple_local_authorities
  69. registration.local_authorities.edit.autocomplete_not_found
  70. registration.local_authorities.update.complete_registration
  71. registration.local_authorities.update.update_registration
  72. registration.local_authorities.update.complete_update
  73. registration.role_types.edit.heading
  74. registration.role_types.edit.body
  75. registration.role_types.edit.button
  76. registration.role_types.edit.link_to_role_type_other
  77. registration.role_types.update.complete_registration
  78. registration.role_types.update.update_registration
  79. registration.role_types.update.complete_update
  80. registration.role_type_others.edit.heading
  81. registration.role_type_others.edit.body
  82. registration.role_type_others.edit.button
  83. registration.role_type_others.update.complete_registration
  84. registration.role_type_others.update.update_registration
  85. registration.role_type_others.update.complete_update
  86. registration.training_emails.edit.heading
  87. registration.training_emails.edit.body
  88. registration.training_emails.edit.opt_in
  89. registration.training_emails.edit.opt_out
  90. registration.training_emails.edit.button
  91. registration.training_emails.update.complete_registration
  92. registration.training_emails.update.update_registration
  93. registration.training_emails.update.complete_update
  94. registration.early_years_emails.edit.heading
  95. registration.early_years_emails.edit.body
  96. registration.early_years_emails.edit.opt_in
  97. registration.early_years_emails.edit.opt_out
  98. registration.early_years_emails.edit.button
  99. registration.early_years_emails.update.complete_registration
  100. registration.early_years_emails.update.update_registration
  101. registration.early_years_emails.update.complete_update
  102. setting_type.heading
  103. password.last_changed
  104. password.hardness
  105. password.remember_me
  106. module_indicator.completed
  107. module_indicator.started
  108. module_indicator.not_started
  109. module_indicator.failed
  110. module_call_to_action.completed
  111. module_call_to_action.failed
  112. module_call_to_action.started
  113. module_call_to_action.not_started
  114. experts.heading
  115. experts.summary
  116. experts.body
  117. prompt.info
  118. prompt.book
  119. prompt.brain
  120. prompt.note
  121. prompt.test
  122. timeout.heading
  123. timeout.body
  124. timeout.noscript
  125. summary_intro.heading
  126. summary_intro.body
  127. assessment_intro.heading
  128. assessment_intro.body
  129. confidence_intro.heading
  130. confidence_intro.body
  131. thankyou.heading
  132. thankyou.body
  133. certificate.heading
  134. interruption_page.heading
  135. interruption_page.body
  136. close_account.body
  137. close_account.button
  138. close_account.confirm.heading
  139. close_account.confirm.body
  140. close_account.confirm.confirm_button
  141. close_account.confirm.cancel_button
  142. close_account.closed.heading
  143. close_account.closed.body
  144. training.assessments.heading
  145. training.assessments.show.incorrect
  146. training.assessments.show.pass.heading
  147. training.assessments.show.pass.text
  148. training.assessments.show.fail.heading
  149. training.assessments.show.fail.text
  150. assessment_results.heading
  151. assessment_results.body
  152. assessment_results.show.incorrect
  153. assessment_results.show.pass.heading
  154. assessment_results.show.pass.text
  155. assessment_results.show.fail.heading
  156. assessment_results.show.fail.text
  157. helpers.label.user.first_name
  158. helpers.label.user.last_name
  159. helpers.label.user.email
  160. helpers.label.user.password
  161. helpers.label.user.current_password
  162. helpers.label.user.password_confirmation
  163. helpers.label.user.postcode
  164. helpers.label.user.setting_type
  165. helpers.label.user.setting_type_other
  166. helpers.label.user.ofsted_number
  167. helpers.hint.user.postcode
  168. helpers.hint.user.ofsted_number
  169. helpers.hint.user.current_password
  170. notice.email_changed
  171. html_title.home.index
  172. html_title.learning.show
  173. html_title.notes.show
  174. html_title.user.show
  175. html_title.user.edit_name
  176. html_title.user.edit_email
  177. html_title.user.edit_password
  178. html_title.user.edit_postcode
  179. html_title.user.edit_ofsted_number
  180. html_title.user.edit_setting_type
  181. html_title.user.check_email_confirmation
  182. html_title.user.check_email_password_reset
  183. html_title.user.edit_training_emails
  184. html_title.timeout.timeout_user
  185. html_title.users/sessions.new
  186. html_title.passwords.new
  187. html_title.passwords.edit
  188. html_title.registrations.new
  189. html_title.registrations.edit
  190. html_title.confirmations.new
  191. html_title.confirmations.show
  192. html_title.devise/unlocks.new
  193. html_title.devise/unlocks.show
  194. html_title.settings.show.cookie_policy
  195. html_title.settings.show.cookie-policy
  196. html_title.training_modules.index
  197. html_title.content_pages.show.what-to-expect
  198. html_title.static.show.accessibility-statement
  199. html_title.static.show.new-registration
  200. html_title.static.show.other-problems-signing-in
  201. html_title.static.show.privacy-policy
  202. html_title.static.show.sitemap
  203. html_title.static.show.terms-and-conditions
  204. html_title.static.show.whats-new
  205. html_title.static.show.wifi-and-data
  206. html_title.static.show.promotional-materials
  207. html_title.training/modules.index
  208. html_title.training/pages.show.what-to-expect
  209. home.hero
  210. home.thumb
  211. home.about
  212. home.login
  213. about.enrol
  214. about.course
  215. about.summary
  216. cookie_policy.legend
  217. cookie_policy.flash
  218. cookie_policy.body
  219. module.overview.summary
  220. module.overview.progress
  221. notes.intro
  222. emails.confirmation.summary
  223. emails.confirmation.intro
  224. emails.confirmation.recipient
  225. emails.password_reset
  226. emails.summary
  227. emails.not_received
  228. emails.no_access
  229. emails.different

@peterdavidhamilton
PoC
fc1a137
@peterdavidhamilton
WIP
ab01fb4
@peterdavidhamilton
Homepage body text
f282471
@peterdavidhamilton
Variable interpolation using I18n backend
630f92e
@peterdavidhamilton
Course/module overviews and seeding locales
0339d8f
@peterdavidhamilton
Merge remote-tracking branch 'origin/main' into ER-742-microcopy
e95bf09
@peterdavidhamilton
- Convert cookie policy and account email pages consolidating keys
f2ab34f 
- Limit deprecated specs as this feature uncouples from YAML completely
- Update docs, relevant training content to follow
- Add CMS migration and locales seed task
- Create i18n keys for all new resources
- Prepare preview mechanism only for staging

TODO
- remove variable assignment from check_email_confirmation template
@peterdavidhamilton
- remove variable assignment from view layer
46dda37 
- tidy missing locale for phase banner
@viezly
Copy link

viezly bot commented Jul 27, 2023 •
edited
Loading

This pull request is split into 6 parts for easier review.
👀 Review pull request on Viezly

Changed files are located in these folders:

  • app/controllers
  • app/forms/users
  • app/helpers
  • app/models/page
  • app/views
  • cms
  • config
  • lib
  • spec/helpers
  • spec/lib
  • spec/models

@peterdavidhamilton peterdavidhamilton added the deployed Review app deployed for testing label Jul 27, 2023
@peterdavidhamilton peterdavidhamilton temporarily deployed to content July 27, 2023 10:01 — with GitHub Actions Inactive
@github-actions
Copy link

https://ey-recovery-pr-744.london.cloudapps.digital

@peterdavidhamilton
- replace commented locales
6efa4cd 
- test injecting new locales derived by form helper
@peterdavidhamilton peterdavidhamilton temporarily deployed to content July 28, 2023 09:33 — with GitHub Actions Inactive
@github-actions github-actions bot added documentation Improvements or additions to documentation content Course and page content changes labels Jul 28, 2023
@peterdavidhamilton peterdavidhamilton temporarily deployed to test July 28, 2023 09:54 — with GitHub Actions Inactive
@peterdavidhamilton peterdavidhamilton temporarily deployed to content July 28, 2023 09:54 — with GitHub Actions Inactive
@github-actions github-actions bot added the terraform Changes to Terraform detected label Jul 28, 2023
@peterdavidhamilton peterdavidhamilton marked this pull request as ready for review August 1, 2023 10:37
@peterdavidhamilton peterdavidhamilton added this to the Next Release milestone Aug 1, 2023
jack-coggin
jack-coggin approved these changes Aug 1, 2023
View reviewed changes
Copy link
Contributor

@jack-coggin jack-coggin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Looks good to me

@peterdavidhamilton peterdavidhamilton temporarily deployed to test August 1, 2023 14:36 — with GitHub Actions Inactive
@peterdavidhamilton peterdavidhamilton temporarily deployed to content August 1, 2023 14:36 — with GitHub Actions Inactive
ebrett
ebrett approved these changes Aug 3, 2023
View reviewed changes
Copy link
Contributor

@ebrett ebrett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this a lot (tried to do something similar on HFEYP but the other developers thought I was crazy). It would be great to start moving HFEYP to contentful.

@peterdavidhamilton peterdavidhamilton temporarily deployed to test August 9, 2023 07:51 — with GitHub Actions Inactive
@peterdavidhamilton peterdavidhamilton temporarily deployed to content August 9, 2023 07:51 — with GitHub Actions Inactive
@github-actions github-actions bot removed the terraform Changes to Terraform detected label Aug 9, 2023
@peterdavidhamilton peterdavidhamilton added this pull request to the merge queue Aug 9, 2023
Merged via the queue into main with commit 6267e16 Aug 9, 2023
3 of 4 checks passed
@peterdavidhamilton peterdavidhamilton temporarily deployed to development August 9, 2023 08:14 — with GitHub Actions Inactive
@peterdavidhamilton peterdavidhamilton deleted the ER-742-microcopy branch August 9, 2023 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ebrett ebrett ebrett approved these changes

@jack-coggin jack-coggin jack-coggin approved these changes

@Jimbo991 Jimbo991 Awaiting requested review from Jimbo991

@clairejoneseyfs clairejoneseyfs Awaiting requested review from clairejoneseyfs

Assignees
No one assigned
Labels
content Course and page content changes deployed Review app deployed for testing documentation Improvements or additions to documentation
Projects
None yet
Milestone
v0.9.0
Development

Successfully merging this pull request may close these issues.
3 participants
@peterdavidhamilton @ebrett @jack-coggin