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

Remove requirement to have messages.pot to use babel_extract #2847

Merged
merged 1 commit into from
Oct 18, 2018

Conversation

eyal0
Copy link
Contributor

@eyal0 eyal0 commented Oct 11, 2018

  • Your changes are not possible to do through a plugin and relevant
    to a large audience (ideally all users of OctoPrint)
  • If your changes are large or otherwise disruptive: You have
    made sure your changes don't interfere with current development by
    talking it through with the maintainers, e.g. through a
    Brainstorming ticket
  • Your PR targets OctoPrint's devel branch, or maintenance if it's
    a bug fix for an issue present in the current stable version (no PRs
    against master or anything else please)
  • Your PR was opened from a custom branch on your repository
    (no PRs from your version of master, maintenance or devel please),
    e.g. dev/my_new_feature or fix/my_bugfix
  • Your PR only contains relevant changes: no unrelated files,
    no dead code, ideally only one commit - rebase and squash your PR
    if necessary!
  • Your changes follow the existing coding style
  • If your changes include style sheets: You have modified the
    .less source files, not the .css files (those are generated with
    lessc)
  • You have tested your changes (please state how!) - ideally you
    have added unit tests
  • You have run the existing unit tests against your changes and
    nothing broke
  • You have added yourself to the AUTHORS.md file :)

What does this PR do and why is it necessary?

Fixes #2846

How was it tested? How can it be tested by the reviewer?

See #2846

What are the relevant tickets if any?

#2846

@foosel
Copy link
Member

foosel commented Oct 18, 2018

I can honestly no longer remember why I did check for the existence, but removing that check makes sense.

Since this is basically a bug fix though, could you do this PR against the maintenance branch so it will be part of 1.3.10 and not have to wait until 1.4.0? Thanks!

@eyal0 eyal0 changed the base branch from devel to maintenance October 18, 2018 15:52
@eyal0 eyal0 force-pushed the always_babel_extract branch from 6e3cbb8 to 0259867 Compare October 18, 2018 16:34
@eyal0
Copy link
Contributor Author

eyal0 commented Oct 18, 2018

@foosel foosel merged commit e094352 into OctoPrint:maintenance Oct 18, 2018
@foosel
Copy link
Member

foosel commented Oct 18, 2018

And merged, thanks!

@foosel foosel modified the milestone: 1.3.10 Oct 31, 2018
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 28, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants