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

Add label for admin theme selector #11121

Merged
merged 3 commits into from
Jun 19, 2019

Conversation

alixrossi
Copy link
Contributor

Fixes the "theme" label in Administration/Site settings not having a translation string, and thus falling back to human_attribute_name. As an example:
image

Copy link
Member

@Gargron Gargron left a comment

Choose a reason for hiding this comment

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

What about setting_theme? I am confused

@Gargron
Copy link
Member

Gargron commented Jun 19, 2019

Oh this is for the admin settings, I see. Wouldn't it be easier to make the form explicitly use setting_theme label though? To avoid adding another translation

@alixrossi
Copy link
Contributor Author

Oh, right. I considered it, but only as directly replacing :theme with :setting_theme and refactoring accordingly, I didn't think of just changing the label.

@alixrossi alixrossi changed the title Add simple_form default for admin theme selector Add label for admin theme selector Jun 19, 2019
@Gargron Gargron merged commit 26d3b2e into mastodon:master Jun 19, 2019
@alixrossi alixrossi deleted the fix_sf_theme_label branch June 19, 2019 17:09
hiyuki2578 pushed a commit to ProjectMyosotis/mastodon that referenced this pull request Oct 2, 2019
* Add simple_form default for admin theme selector

* Revert "Add simple_form default for admin theme selector"

This reverts commit 0b736f7.

* Add setting_theme label to admin theme selector
messenjahofchrist pushed a commit to Origin-Creative/mastodon that referenced this pull request Jul 30, 2021
* Add simple_form default for admin theme selector

* Revert "Add simple_form default for admin theme selector"

This reverts commit 0b736f7.

* Add setting_theme label to admin theme selector
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.

2 participants