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

Fix missing help_text_text translations #1888

Merged
merged 5 commits into from
Jul 14, 2020
Merged

Fix missing help_text_text translations #1888

merged 5 commits into from
Jul 14, 2020

Conversation

gr8bit
Copy link
Contributor

@gr8bit gr8bit commented Jul 8, 2020 •
edited
Loading

Fixes missing method exception for html_safe on missing hint translations. Also allows setting hint: false in elements.yml (e.g. while development).

Checklist

  • I have followed Pull Request guidelines
  • I have added a detailed description into each commit message
  • I have added tests to cover this change

tvdeyen
tvdeyen reviewed Jul 11, 2020
View reviewed changes
Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

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

Thanks. I think we should fix this at the root cause of the issues instead.

app/views/alchemy/admin/sites/_form.html.erb Outdated Show resolved Hide resolved
app/helpers/alchemy/admin/base_helper.rb Outdated Show resolved Hide resolved
@tvdeyen tvdeyen changed the title Fix false hint translations Fix missing help_text_text translations Jul 14, 2020
tvdeyen
tvdeyen requested changes Jul 14, 2020
View reviewed changes
Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

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

Thanks. This is a good change. Would you please add a test for the change to the lib/resource.rb class? The view does not need a spec.

lib/alchemy/resource.rb Show resolved Hide resolved
@tvdeyen tvdeyen added this to the 5.0 milestone Jul 14, 2020
@tvdeyen
Copy link
Member

tvdeyen commented Jul 14, 2020

@gr8bit I would like to add this to the 5.0 release as this breaks for all sites not having the translations in place, but a browser with non-English locale

tvdeyen
tvdeyen approved these changes Jul 14, 2020
View reviewed changes
Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

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

Thanks

@tvdeyen tvdeyen merged commit 896cef6 into AlchemyCMS:master Jul 14, 2020
@gr8bit gr8bit deleted the fix-false-hint-translations branch July 14, 2020 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tvdeyen tvdeyen tvdeyen approved these changes

Assignees
No one assigned
Labels
needs tests
Projects
None yet
Milestone
5.0
Development

Successfully merging this pull request may close these issues.
2 participants
@gr8bit @tvdeyen