Closed DeeDeeG closed 6 years ago
This is ready to be looked over/reviewed. @tkwidmer, @mi-wood, mind taking a look at this?
Thanks for the comments, will get to these as soon as possible.
This is ready for another round of reviews, when someone gets the chance. @tkwidmer, @mi-wood
(See also this rebased version, which is the same thing, but with cleaner commit history:
commits: DeeDeeG:translation-ready-rebase
,
and the branch compared to develop: https://github.com/RefugeRestrooms/refugerestrooms/compare/develop...DeeDeeG:translation-ready-rebase
Would be willing to merge either one.)
I am working on translating the "Thanks for contacting us" strings. They're in app/controllers/contacts_controller.rb
Google Analytics broke one of the tests. :^/
Scenario: Show nearby restrooms when guessing # features/nearby.feature:4
Given a restroom exists in Winnipeg # features/step_definitions/restroom_steps.rb:1
Started GET "/" for 127.0.0.1 at 2018-01-19 19:37:28 +0000
Processing by PagesController#index as HTML
Rendering pages/index.html.haml within layouts/splash
Rendered layouts/_search.html.haml (6.6ms)
[ Skipping a few lines for brevity . . . ]
When I am in Winnipeg and I guess my location on the submission page # features/step_definitions/submission_steps.rb:29
Request to 'http://127.0.0.1:36316/' failed to reach server, check DNS and/or server status - Timed out with the following resources still waiting http://www.google-analytics.com/analytics.js (Capybara::Poltergeist::StatusFailError)
./features/step_definitions/submission_steps.rb:30:in `/^I am in (.*) and I guess my location on the submission page$/'
features/nearby.feature:6:in `When I am in Winnipeg and I guess my location on the submission page'
Then I should see an existing restroom nearby # features/step_definitions/restroom_steps.rb:9
Request to 'http://127.0.0.1:36316/' failed to reach server, check DNS and/or server status - Timed out with the following resources still waiting http://www.google-analytics.com/analytics.js (Capybara::Poltergeist::StatusFailError)
https://travis-ci.org/RefugeRestrooms/refugerestrooms/builds/330957933#L2181
[Edit: Re-submitted the same thing with a different commit ID (git commit --amend
, git push -f
)]
It passed this time. 👍 👍 👍 👍
Squash-and-merged this on the command-line:
git merge --squash new-translation-ready develop
So this PR is effectively merged in the following commit: https://github.com/RefugeRestrooms/refugerestrooms/commit/14e224173b4fa7b8c9b42c8cb5c17fc16d9ad722
Thanks everyone for the reviews!
Context
Fixes #419
Replaces "hard-coded" English text with translation strings
Only splash page is done as of writing, but will be adding more commits soon.Summary of Changes
Changes
html.haml
files to use translation stringsAdds the translation strings in
config/locales/[component_name].en.yml
Checklist
[ ] Added Documentation (Service and Code when required)