Skip to content

Backport of #2407#2581

Merged
0candy merged 1 commit into2.xfrom
backport/globalization
Aug 5, 2016
Merged

Backport of #2407#2581
0candy merged 1 commit into2.xfrom
backport/globalization

Conversation

@0candy
Copy link
Copy Markdown
Contributor

@0candy 0candy commented Aug 4, 2016

Backport of globalization

#2407
#2583

@0candy 0candy self-assigned this Aug 4, 2016
@0candy 0candy added the #review label Aug 4, 2016
Comment thread lib/application.js Outdated
app.boot = function(options) {
throw new Error(
'`app.boot` was removed, use the new module loopback-boot instead');
g.f('{{`app.boot`}} was removed, use the new module loopback-boot instead'));
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

{{loopback-boot}}

@superkhau
Copy link
Copy Markdown
Contributor

Two major rebase errors, the text in them is globalized properly however. Please fix those 2 and LGTM.

@0candy 0candy force-pushed the backport/globalization branch 4 times, most recently from 22754fb to a5c0b0b Compare August 4, 2016 22:11
Comment thread common/models/user.js Outdated

if (realmRequired && !query.realm) {
var err1 = new Error('realm is required');
var err1 = new Error(g.f('realm is required'));
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

What do you think about {{realm}}?

@superkhau
Copy link
Copy Markdown
Contributor

LGTM except the one comment.

@0candy 0candy force-pushed the backport/globalization branch 6 times, most recently from 840e5be to b40a5f0 Compare August 5, 2016 15:24
@0candy 0candy force-pushed the backport/globalization branch from b40a5f0 to 3767940 Compare August 5, 2016 15:55
@0candy 0candy merged commit 16c78a8 into 2.x Aug 5, 2016
@0candy 0candy deleted the backport/globalization branch August 5, 2016 18:44
@0candy 0candy removed the #review label Aug 5, 2016
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.

2 participants