Context implemenation and some test cases #116

sameercaresu · 2017-04-07T10:19:15Z

This is the implementation of pgettext and npgettext mentioned in #95.

I have added some test cases for pgettext and npgettext. Other tests, that I have not modified, are passing the tests as well.

Please let me know if you have any comments.

- if domain is mentioned it is ignored as it is not used in extraction.

sameercaresu · 2017-04-12T13:37:02Z

I have added implementation of dgettext, dngettext, dpgettext and dnpgettext.
If domain is used it is ignored during extraction.

ArmorDarks · 2017-04-12T13:49:49Z

Wow, that's nice! Thanks!

…keyword

sameercaresu · 2017-06-16T11:30:16Z

Any chance this could go into next release? Thanks.

BYK

Thanks a lot for the hard work! The code just needs some clean up and after that I think we're good to go.

BYK · 2017-06-16T18:08:14Z

lib/jsxgettext.js

+  }
+
+  // Always add the funcName as last element in return array
+  // If the gettext function's name starts with "np" (i.e. npgettext or np_) and its 3 arguments are strings, we regard it as context  


Is there documentation around this for existing gettext toolchain? If yes, it would be great to reference that here. If not, I'd like to hear more about your reasoning :)

I used GNU gettext as reference. npgettext is mentioned here. node-gettext implements this. Should I reference this here?

BYK · 2017-06-16T18:10:16Z

lib/jsxgettext.js

-
+    return [arg, node.arguments[1], funcName];
+
+  // If the gettext function's name starts with "p" (i.e. pgettext or p_) and its 2 arguments are strings, we regard it as context  


There's now a lot of repetition around argument type checks here so I think we should move them into their own function. Something like:

function areArgsString(args) { // magic return wand; }

Something like

// check if the args (object or array of objects) are function areArgsString(args) { return args && [].concat(args).every(function (arg) { return arg && (isStringLiteral(arg) || isStrConcatExpr(arg)) }); }

And we call it like
if (funcName.substr(0, 2) === "np" && areArgsString(node.arguments.slice(0, 3)))

BYK · 2017-06-16T18:11:03Z

lib/jsxgettext.js

@@ -143,7 +159,7 @@ function parse(sources, options) {

    // Always use the default context for now


Comment needs updating?

Ok. Should remove this as we are using context now.

BYK · 2017-06-16T18:12:30Z

lib/jsxgettext.js

+        if (!args)
          return;
-
+        var funcName = args.pop();


I think this logic should be isolated into getTranslatable. It should only return a structure with the fields context and translatable.

getTranslatable will return [context, translatable]

BYK · 2017-06-16T18:15:34Z

lib/jsxgettext.js

-      if (comments.extracted)
-        comments.extracted = comments.extracted.split('\n').filter(dedupeNCoalesce).join('\n');
+    Object.keys(translations).forEach(function (msgctxt) {
+      Object.keys(translations[msgctxt]).forEach(function (msgid){


How about you extract the inner function definition to outside of the forEach iterations and then pass msgctxt as the "context" argument to the inner forEach iteration? This way you can avoid redefining the inner function for each context iteration.

Something like

function extractComments(msgid) { if (!this[msgid].comments) return; if (this[msgid].comments.reference) this[msgid].comments.reference = this[msgid].comments.reference.split('\n').filter(dedupeNCoalesce).join('\n'); if (this[msgid].comments.extracted) this[msgid].comments.extracted = this[msgid].comments.extracted.split('\n').filter(dedupeNCoalesce).join('\n'); } Object.keys(translations).forEach(function (msgctxt) { Object.keys(translations[msgctxt]).forEach(extractComments, translations[msgctxt]); });

BYK · 2017-06-16T18:17:26Z

test/inputs/anonymous_functions.js

-testObj.gettext("I'm gonna get translated, yay!");
+testObj.pgettext("I'm gonna get translated, yay!");
 testObj.ngettext("I'm also gonna get translated!", "I'm the plural form!", 2);
+testObj.pgettext("context1", "I am translated in context!");


I'm not sure this reflects the real-world context usage since I expect them to come from a variable usually. What do you think? (I know if they are coming from a variable it is impossible to extract them as we do here in a static analysis)

That looks like a typeo. It was correct before
testObj.gettext("I'm gonna get translated, yay!")

sameercaresu · 2017-06-21T12:06:50Z

lib/jsxgettext.js

@@ -157,7 +173,7 @@ function parse(sources, options) {
    });


Should add other keywords to aliases

if (options.keyword) { Object.keys(options.keyword).forEach(function (index) { ['n', 'p', 'np', 'd', 'dn', 'dp', 'dnp'].forEach(function (keyword) { options.keyword.push(keyword + options.keyword[index]); }); }); }

sameercaresu · 2017-08-09T10:50:37Z

Hi I have made the requested changes. Please let me know if there's more changes needed.

kc-sameer added 4 commits April 7, 2017 11:50

Context implemenation and some test cases zaach#95

806ecb3

Correction jshint errors

6aacdf5

Adding ngettext, pgettext, npgettext as keyword options in cli

aff99ba

Implementing domain and context from zaach#95

e828232

- if domain is mentioned it is ignored as it is not used in extraction.

Ignore domain functions after cheking if they are defined in options …

b0c55d6

…keyword

BYK requested changes Jun 16, 2017

View reviewed changes

sameercaresu commented Jun 21, 2017

View reviewed changes

kc-sameer added 2 commits June 26, 2017 15:09

Implemented requested changes from the review

f822157

Correcting jshint errors

a904197


		return [arg, node.arguments[1], funcName];

		// If the gettext function's name starts with "p" (i.e. pgettext or p_) and its 2 arguments are strings, we regard it as context

		@@ -143,7 +159,7 @@ function parse(sources, options) {

		// Always use the default context for now

Context implemenation and some test cases #116

Are you sure you want to change the base?

Context implemenation and some test cases #116

Conversation

sameercaresu commented Apr 7, 2017

Uh oh!

sameercaresu commented Apr 12, 2017

Uh oh!

ArmorDarks commented Apr 12, 2017

Uh oh!

sameercaresu commented Jun 16, 2017

Uh oh!

BYK left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sameercaresu Jun 21, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sameercaresu commented Aug 9, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

sameercaresu Jun 21, 2017 •

edited

Loading