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.

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

More i18n omissions #3541

Closed
wants to merge 10 commits into from
Closed

Conversation

ghost
Copy link

@ghost ghost commented Feb 19, 2019

Extracts strings from template to allow i18n.

@samvera/hyrax-code-reviewers

@ghost ghost changed the title Translate "joined on" in profile page. More i18n omissions Feb 19, 2019
@ghost
Copy link
Author

ghost commented Feb 20, 2019

@jmfrenzel I think you'll want to improve German translations before the branch is merged.
@samvera/hyrax-code-reviewers I think the last test failure (Selenium::WebDriver::Error::WebDriverError) is not related to the changes I made.

@cjcolvar
Copy link
Member

@j-dornbusch Those errors just came up in a different PR so I'm investigating. Hopefully it can be cleared up soon!

Copy link
Contributor

@jmfrenzel jmfrenzel left a comment

Choose a reason for hiding this comment

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

Thanks for pinging @j-dornbusch Please consider this changes in your PR.
NB: This PR resolves some of missing _i18n listed in #1386

config/locales/hyrax.de.yml Outdated Show resolved Hide resolved
config/locales/hyrax.de.yml Outdated Show resolved Hide resolved
config/locales/hyrax.de.yml Outdated Show resolved Hide resolved
config/locales/hyrax.de.yml Outdated Show resolved Hide resolved
config/locales/hyrax.de.yml Outdated Show resolved Hide resolved
config/locales/hyrax.de.yml Outdated Show resolved Hide resolved
config/locales/hyrax.de.yml Outdated Show resolved Hide resolved
config/locales/hyrax.de.yml Outdated Show resolved Hide resolved
config/locales/hyrax.de.yml Outdated Show resolved Hide resolved
config/locales/hyrax.de.yml Outdated Show resolved Hide resolved
@jmfrenzel
Copy link
Contributor

NB: This PR resolves some of missing _i18n listed in #1386

@cjcolvar
Copy link
Member

cjcolvar commented Feb 20, 2019

@j-dornbusch If you rebase from master, you'll get #3548 which should fix the failing tests due to chromedriver. The chromedriver issue is still being sorted out. I'll comment here once there is a solution.

@ghost ghost force-pushed the more-i18n-omissions branch from ae841fa to f24a2c2 Compare February 21, 2019 06:17
jmfrenzel
jmfrenzel previously approved these changes Feb 21, 2019
@ghost ghost marked this pull request as ready for review February 21, 2019 15:57
@cjcolvar
Copy link
Member

@j-dornbusch The chromedriver issue should be solved for now so I think it should pass CI if you rebase this PR on master.

@scherztc scherztc self-assigned this Feb 27, 2019
joachim.dornbusch@ehess.fr added 2 commits February 27, 2019 19:39
Translate title in file show page.

Translate "Depositor" in file show page.

Translate fields in file show page.

Case problem

Translate actions in file show page.

Translate "sort and per page" for collections show view in back office

Translate "sort and per page" for collections show view in front office

Translate title in "sort and per page" for collections show view in front office

Page crashes in french because of missing entries in i18n file

Fix test failing with "translation missing: en.hyrax.collections.sort_and_per_page.html.erb.sort_by_html"

Translate "choose file" in collection branding tab

Translate delete banner controls in collection branding tab

Translate second "choose file" in collection branding tab

Translate "link url" in collection branding tab

Translate "alt text", "link url", "previous" in collection branding tab

Translate search controles in collection sharing tab

Translate roles in collection sharing tab

Fix test failing with "translation missing: en.hyrax.collections.sort_and_per_page.html.erb.sort_by_html"

German translations improvements
@ghost
Copy link
Author

ghost commented Feb 28, 2019

@cjcolvar Here, there are no more failures on circleci.

@cjcolvar
Copy link
Member

@j-dornbusch This is looking good but it looks like your squashed rebase includes the chromedriver commit. That should already be in master so it should be removed from your commit and the build should still pass.

@ghost ghost force-pushed the more-i18n-omissions branch from 5555360 to ac85acf Compare February 28, 2019 16:41
@ghost
Copy link
Author

ghost commented Feb 28, 2019

@cjcolvar Did I squash too many commits ? I tried to cancel the squash but I'm not sure of the result.

@cjcolvar
Copy link
Member

That took care of the CI build changes that leaked in, but now it looks like something got lost since there are failing tests in spec/features/collection_multi_membership_spec.rb.

@ghost
Copy link
Author

ghost commented Mar 1, 2019

@cjcolvar I can't reproduce the test failure locally.

rspec ./spec/features/collection_multi_membership_spec.rb
...
Finished in 1 minute 1.9 seconds (files took 4 seconds to load)
8 examples, 0 failures

I'm on the right branch, everything has been pushed.
git status

On branch more-i18n-omissions
Your branch is up-to-date with 'origin/more-i18n-omissions'.

@cjcolvar
Copy link
Member

cjcolvar commented Mar 1, 2019

👍 I restarted the build. Let's see what happens this time.

@cjcolvar
Copy link
Member

cjcolvar commented Mar 1, 2019

There are still 3 failures but slightly different than last time. I'm going to see what I can find out by testing locally.

@cjcolvar
Copy link
Member

cjcolvar commented Mar 1, 2019

Locally, I'm occasionally seeing one failing test in the collection_multi_membership_spec but not the others so I'm rerunning the build again now to see if we can get a passable build so this can be merged. At that point I'll create an issue for the randomly failing test.

@cjcolvar
Copy link
Member

cjcolvar commented Mar 1, 2019

Now circle is saying the opposite: only the two service tests are failing:
./spec/services/hyrax/embargo_service_spec.rb:33
./spec/services/hyrax/lease_service_spec.rb:33

@samvera/hyrax-code-reviewers Anyone else have ideas about this?

@cjcolvar
Copy link
Member

cjcolvar commented Mar 4, 2019

I'm guessing that this is failing for the same reasons as the embargo and lease services are failing in hydra-access-controls: https://travis-ci.org/samvera/hydra-head/jobs/501631455
I'm going to dig into this more now since it could be breaking all new hydra-head dependent apps.

Use [* TO *] to work with old and new versions of AF and Solr
@cjcolvar
Copy link
Member

cjcolvar commented Mar 6, 2019

@j-dornbusch #3559 got merged. Do you mind rebasing one more time?

joachim.dornbusch@ehess.fr added 4 commits March 6, 2019 04:58
Translate title in file show page.

Translate "Depositor" in file show page.

Translate fields in file show page.

Case problem

Translate actions in file show page.

Translate "sort and per page" for collections show view in back office

Translate "sort and per page" for collections show view in front office

Translate title in "sort and per page" for collections show view in front office

Page crashes in french because of missing entries in i18n file

Fix test failing with "translation missing: en.hyrax.collections.sort_and_per_page.html.erb.sort_by_html"

Translate "choose file" in collection branding tab

Translate delete banner controls in collection branding tab

Translate second "choose file" in collection branding tab

Translate "link url" in collection branding tab

Translate "alt text", "link url", "previous" in collection branding tab

Translate search controles in collection sharing tab

Translate roles in collection sharing tab

Fix test failing with "translation missing: en.hyrax.collections.sort_and_per_page.html.erb.sort_by_html"

German translations improvements
@ghost
Copy link
Author

ghost commented Mar 6, 2019

@cjcolvar I rebased and force-pushed.

git checkout master
git fetch upstream
git rebase upstream/master
git checkout more-i18n-omissions
git rebase master
git push --force

@ghost
Copy link
Author

ghost commented Mar 6, 2019

@cjcolvar I can reproduce the "spec/features/work_show_spec.rb" failure locally, so I will investigate it.

@ghost
Copy link
Author

ghost commented Mar 6, 2019

@cjcolvar The test fails randomly locally, but very rarely. By setting breakpoints, I do not notice anything particular. I can not fail it in debug mode, it still succeeds.

@cjcolvar
Copy link
Member

cjcolvar commented Mar 6, 2019

Somehow that rebase brought in my commits to master from #3559. I think those should be removed and I'll restart the circle build until it is green.

@cjcolvar
Copy link
Member

@j-dornbusch Is there anything I can do to help resolve the git history issue and help this get merged? Would you like me to make a new PR with the rebase reapplied?

@ghost
Copy link
Author

ghost commented Mar 22, 2019

Yes @cjcolvar this PR is now old and we have some tickets on our Hyrax instance that depend on it. If you have a solution I will be grateful.

@cjcolvar
Copy link
Member

Closing now that #3708 was merged.

@cjcolvar cjcolvar closed this Mar 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants