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

Arabian Text Trait Bug Fix #194

Merged
merged 1 commit into from
Feb 17, 2014
Merged

Arabian Text Trait Bug Fix #194

merged 1 commit into from
Feb 17, 2014

Conversation

EricB1
Copy link
Collaborator

@EricB1 EricB1 commented Feb 17, 2014

The Text for the Arabian trait is called
"TXT_KEY_TRAIT_LAND_TRADE_GOLD2" while CEP uses the same thing without
the '2'
This minor fix points the variables of Description and ShortDescription
to the CEP text instead of the vanilla text.

The Text for the Arabian trait is called
"TXT_KEY_TRAIT_LAND_TRADE_GOLD2" while CEP uses the same thing without
the '2'
This minor fix points the variables of Description and ShortDescription
to the CEP text instead of the vanilla text.
@stackpoint
Copy link
Contributor

@EricB1, you should just work directly on the project now that @Thalassicus has made you a project collaborator.

@stackpoint
Copy link
Contributor

You can also merge this pull yourself. Did you modify the google spreadsheet to reflect this text change?

@EricB1
Copy link
Collaborator Author

EricB1 commented Feb 17, 2014

I saw that I had been added as a project collaborator, but I didn't want to put through a change without input from others. This change is really just a bug fix and doesn't alter the design of the project. Do those types of changes need to go into the spreadsheet?

@EricB1
Copy link
Collaborator Author

EricB1 commented Feb 17, 2014

I also sent a request to get access to the google docs spreadsheet. It was blocking me.

@stackpoint
Copy link
Contributor

Follow the instructions here to join the group: #6 (comment)

@stackpoint
Copy link
Contributor

I misread your commit message. Did you update the policy text in the spreadsheets? And the tech path? I believe you modified both in previous merges.

stackpoint added a commit that referenced this pull request Feb 17, 2014
@stackpoint stackpoint merged commit b0b9d8f into Thalassicus:new-features Feb 17, 2014
@stackpoint
Copy link
Contributor

And there shouldn't be a problem with bug fixing like this and @Thalassicus has given you project permissions.

@EricB1
Copy link
Collaborator Author

EricB1 commented Feb 17, 2014

Okay I updated the spreadsheet for the policy changes and also for the tech prereq change. I didn't update anything for the small bug fix to Arabia as there's no spreadsheet data for something like that.

@stackpoint
Copy link
Contributor

Yeah, I thought the error was in the text itself instead of the name.

@GrantSP
Copy link
Collaborator

GrantSP commented Feb 17, 2014

Shouldn't a bugfix like this be added to the stable branch?
It isn't really a "new" feature.

@Thalassicus Thalassicus added this to the v3.15 milestone Mar 29, 2014
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.

4 participants