Translation: autocomplete on subqueue lists incorrect nodes

Hi,

Over the past days, I've been fighting nodequeue and translations. The project I'm working on, only allows management (adding/removing nodes) from the queue itself (admin/content/nodequeue/). Yet, we noticed that adding nodes through the autocomplete form keeps resulting in erratic behavior.

How to reproduce:

1. Install nodequeue and translation helpers
2. make sure you have i18n enabled and a translated node (try it with three languages)
3. Create a queue and enable 'Treat translation nodes as a single node' for that queue
4. add the translated node to the queue through the autocomplete form on the queue management page
5. On the corresponding view: add the 'node: source translation' per the instructions of Japser Knops' (http://drupal.org/node/433930#comment-2759852)
6. Add the 'Node translation: Content negotiation' filter.

Now run the view and look at the output. Depending on how you've configured your site to do multilangual support, the list will return the correct translated node for one language but not for another language.

The problem is the autocomplete box on the queue management form. The nodequeue_api_autocomplete function returns a list of nodes wit their nid's and node titles. With i18n support on, a rewrite of the query is performed which results in a set of node translations for the current language.

What nodequeue stores in the nodequeue_nodes table are those nid's of those node translations.

This causes problems on the views side: nid's of node translations who don't match the current language at that point (when viewing the queue) will still be shown or - depending on how you tried to configure the view - be removed by any Node translation filters you might try to use.

So, if you're managing the site in english and you add a translated node to the queue with 'Treat translation nodes as a single node' on, it will show that english node in the view when someone visits the french version of the site.

How to solve?

When 'treat translation nodes as a single node' is selected, nodequeue's autocomplete form should return the tnid's instead of the nid's of the listed nodes. The tnid of the node gets stored in nodequeue_nodes and Views can work it's magic through Jasper Knops' excellent relationship solution.

Weird thing is that the 'Add to nodequeue' and 'Remove from nodequeue' functions actually got this correct. Nodequeue has a nodequeue_get_content_id which fetches the tnid or nid depending on the i18n setting of the node transparently.

Anyway, patch attached solves this issue for me.