Skip to content

Backport globalization#1029

Merged
Amir-61 merged 1 commit into2.xfrom
backport-globalization
Aug 10, 2016
Merged

Backport globalization#1029
Amir-61 merged 1 commit into2.xfrom
backport-globalization

Conversation

@Amir-61
Copy link
Copy Markdown
Contributor

@Amir-61 Amir-61 commented Aug 5, 2016

Backporting these 3 PRs of globalization:
#1022
#1024
#1026

This backporting needs very careful review since there were tons of merge conflicts and there is a possibility of doing something wrong!

I would like to get LGTM from @superkhau @0candy @jannyHou individually to make sure everything looks good and merge conflicts have been solved safely.

Thanks a lot!

@Amir-61
Copy link
Copy Markdown
Contributor Author

Amir-61 commented Aug 5, 2016

For now I have not squashed into one commit; I can do it if you think it is necessary after review.

Comment thread lib/dao.js Outdated
}
} else {
err = new Error(util.format('The order %j is not valid', order[i]));
err = new Error('The order %j is not valid', order[i]);
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.

g.f()

@Amir-61 Amir-61 self-assigned this Aug 5, 2016
Comment thread lib/include.js Outdated
if (!relation.polymorphic) {
cb(new Error('Relation.modelTo is not defined for relation' +
relationName + ' and is no polymorphic'));
cb(new Error(g.f('{{Relation.modelTo}} is not defined for relation %s and is no polymorphic',
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.

{{Polymorphic}}

@jannyHou
Copy link
Copy Markdown
Contributor

jannyHou commented Aug 5, 2016

LGTM, only two comments 👍

Comment thread package.json Outdated
"loopback-connector": "^2.1.0",
"node-uuid": "^1.4.2",
"qs": "^3.1.0",
"strong-globalize": "^2.6.0",
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.

^2.6.2

@superkhau
Copy link
Copy Markdown
Contributor

@Amir-61 Two comments, otherwise LGTM.

@superkhau
Copy link
Copy Markdown
Contributor

@Amir-61 Please squash before merging too.

Comment thread lib/datasource.js Outdated
// The connection fails, let's report it and hope it will be recovered in the next call
console.error('Connection fails: ', err, '\nIt will be retried for ' +
'the next request.');
console.error(g.f('Connection fails: %s\nIt will be retried for the next request.', err));
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.

just use g.error instead of console.error(g.f

@Amir-61 Amir-61 mentioned this pull request Aug 8, 2016
@Amir-61 Amir-61 force-pushed the backport-globalization branch 2 times, most recently from 225676f to 642838b Compare August 8, 2016 19:55
@Amir-61
Copy link
Copy Markdown
Contributor Author

Amir-61 commented Aug 8, 2016

@superkhau @jannyHou @0candy,

Thanks for reviewing! 🙇 I applied your feedback and I'm going to land it after checking CI.

Thanks!

Backport loopback-datasource-juggler#1022,
loopback-datasource-juggler#1024,
loopback-datasource-juggler#1026
@Amir-61 Amir-61 force-pushed the backport-globalization branch from bdae2a8 to 9da0e50 Compare August 10, 2016 01:52
@Amir-61 Amir-61 merged commit 5a20ea1 into 2.x Aug 10, 2016
@Amir-61 Amir-61 deleted the backport-globalization branch August 10, 2016 04:09
@Amir-61 Amir-61 removed the #review label Aug 10, 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.

4 participants