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 duplicate translation classes #3674

Merged
merged 2 commits into from
Aug 9, 2019

Conversation

javierm
Copy link
Member

@javierm javierm commented Aug 8, 2019

Objectives

Remove code we accidentally duplicated when merging the translations branch into the master branch.

@javierm javierm self-assigned this Aug 8, 2019
We accidentally added them twice when rebasing the translations branch.
We're moving the code for the phases translation class to the same place
in the code the other translation classes are: right after including the
Globalizable module.
@javierm javierm force-pushed the remove_duplicate_translation_classes branch from 489ba52 to e500d15 Compare August 8, 2019 16:49
@javierm
Copy link
Member Author

javierm commented Aug 9, 2019

Travis failure was caused by network issues in Travis and is not related to this pull request.

@javierm javierm merged commit 072d53f into master Aug 9, 2019
@javierm javierm deleted the remove_duplicate_translation_classes branch August 9, 2019 12:01
notapatch pushed a commit to notapatch/consul that referenced this pull request Aug 13, 2019
…translation_classes

Remove duplicate translation classes
@javierm javierm added this to Release 1.1.0 in Roadmap Sep 10, 2019
smarques pushed a commit to venetochevogliamo/consul that referenced this pull request Apr 29, 2020
…translation_classes

Remove duplicate translation classes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Roadmap
  
Release 1.1.0
Development

Successfully merging this pull request may close these issues.

None yet

1 participant