-
Notifications
You must be signed in to change notification settings - Fork 1.2k
feat (*): Add i18n support #2534
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
Open
stherrienaspnet
wants to merge
23
commits into
angular-fullstack:master
from
stherrienaspnet:i18nSupport
Open
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
049c549
imported app/index,js
stherrienaspnet 3354241
Imported yo-rc.json
stherrienaspnet 28f135e
imported yo-rc.json
stherrienaspnet 43d7ed4
Imported i18n files
stherrienaspnet 2b42b0e
Imported get-expected-files.js
stherrienaspnet 16ef89c
Imported app styling files
stherrienaspnet 8b7744e
Imported login files
stherrienaspnet 4a285d5
Imported settings files
stherrienaspnet 7189bfb
Imported signup
stherrienaspnet e05fe51
Imported admin files
stherrienaspnet 48e0481
Imported main
stherrienaspnet 50b3150
Imported footer files
stherrienaspnet 1aad830
Imported navbar files
stherrienaspnet 77eba3f
Imported app.js
stherrienaspnet cf971e0
Imported navbar component.js
stherrienaspnet c87f518
Imported user model and passport.js
stherrienaspnet 4bd9161
Imported app.config.js
stherrienaspnet 4941511
Fixed index file
stherrienaspnet 596bee1
All tests are passing now
stherrienaspnet fb65fc1
Added text for external auth0 provider
stherrienaspnet cea6aec
Completed pug integration
stherrienaspnet 5b163fa
json cocntent ordering
stherrienaspnet 197a8bc
Merge branch 'master' into i18nSupport
Awk34 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Added text for external auth0 provider
- Loading branch information
commit fb65fc1bcc3b69f28f3622b3b261e2cace37ee5a
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
templates/app/client/components/oauth-buttons(oauth)/oauth-buttons(html).html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
<% if(filters.facebookAuth) { %><a ng-class="classes" ng-click="OauthButtons.loginOauth('facebook')" class="btn<% if (filters.bootstrap) { %> btn-social<% } %> btn-facebook"> | ||
<i class="fa fa-facebook"></i> | ||
Connect with Facebook | ||
<span<% if (filters.i18nSupport) { %> translate="CONNECT_WITH_FACEBOOK"<% } %>><% if (!filters.i18nSupport) { %>Connect with Facebook<% } %></span> | ||
</a> | ||
<% } if (filters.googleAuth) { %><a ng-class="classes" ng-click="OauthButtons.loginOauth('google')" class="btn<% if (filters.bootstrap) { %> btn-social<% } %> btn-google"> | ||
<i class="fa fa-google-plus"></i> | ||
Connect with Google+ | ||
<span<% if (filters.i18nSupport) { %> translate="CONNECT_WITH_GOOGLE_PLUS"<% } %>><% if (!filters.i18nSupport) { %>Connect with Google+<% } %></span> | ||
</a> | ||
<% } if (filters.twitterAuth) { %><a ng-class="classes" ng-click="OauthButtons.loginOauth('twitter')" class="btn<% if (filters.bootstrap) { %> btn-social<% } %> btn-twitter"> | ||
<i class="fa fa-twitter"></i> | ||
Connect with Twitter | ||
</a><% } %> | ||
<span<% if (filters.i18nSupport) { %> translate="CONNECT_WITH_TWITTER"<% } %>><% if (!filters.i18nSupport) { %>Connect with Twitter<% } %></span> | ||
</a><% } %> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.