Skip to content

Conversation

@damienpontifex
Copy link
Contributor

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh and ./bin/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: master for non-breaking changes and 3.0.0 branch for breaking (non-backward compatible) changes.

Description of the PR

see http://angularjs.blogspot.com.au/2017/01/branding-guidelines-for-angular-and.html for reason for naming change.

Previously TypescriptAngular referred to AngularJS and TypescriptAngular2 referred to Angular. This changes makes it clearer by using the names TypescriptAngularJs and TypescriptAngular to refer to AngularJS (1.x) and Angular (>2.x)

Generator language flag was already following this convention so usage shouldn't change but class naming follows this convention now.

@wing328 wing328 changed the base branch from 2.3.0 to master July 19, 2017 08:26
@wing328 wing328 added this to the v2.3.0 milestone Jul 19, 2017
@wing328
Copy link
Contributor

wing328 commented Jul 21, 2017

@damienpontifex thanks for the PR.

cc @Vrolijkx @taxpon @sebastianhaas @kenisteward @TiFu

@wing328
Copy link
Contributor

wing328 commented Jul 23, 2017

@damienpontifex when you've time, I wonder if you can rebase this PR on the latest master to help resolve the merge conflicts.

@damienpontifex
Copy link
Contributor Author

@wing328 done but build failures after rebase. Will have to spend a little longer resolving

io.swagger.codegen.languages.TypeScriptAngularClientCodegen
io.swagger.codegen.languages.TypeScriptAureliaClientCodegen
io.swagger.codegen.languages.TypeScriptAngularJsClientCodegen
>>>>>>> Rrename for angular and angularjs to reflect naming guidelines
Copy link
Contributor

Choose a reason for hiding this comment

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

@damienpontifex please remove this line.

@damienpontifex
Copy link
Contributor Author

@wing328 I think that's fixed it all. I can squash the changes into one commit when/If merged.

see http://angularjs.blogspot.com.au/2017/01/branding-guidelines-for-angular-and.html
- move makes typescript-angular -> typescript-angularjs
- move makes typescript-angular2 -> typescript-angular
Language string with generate was already this so generation shouldnt change
but class naming follows this convention now
@damienpontifex
Copy link
Contributor Author

@wing328 any further thoughts/feedback on this?

@wing328
Copy link
Contributor

wing328 commented Aug 4, 2017

@damienpontifex last time I checked, this PR is good to merge but I want to merge #6130 first

@wing328
Copy link
Contributor

wing328 commented Aug 25, 2017

#6310 has been merged into master.

Will merge this one over the weekend.

cc @Vrolijkx @taxpon @sebastianhaas @kenisteward @TiFu

@wing328 wing328 merged commit 14f0375 into swagger-api:master Aug 28, 2017
@wing328
Copy link
Contributor

wing328 commented Aug 28, 2017

@damienpontifex thanks for the PR, which has been merged into master. I've made the following minor changes:

d8fceda - update TS Angular-related Windows batch files
ccfe7f5 - minor fix to TS AngularJS bin script

@wing328 wing328 changed the title Codegen class rename for Angular and AngularJS to reflect naming guidelines [TypeScript] Codegen class rename for Angular and AngularJS to reflect naming guidelines Aug 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants