Keyword substitutions & field translation

Hello,

Here is the context:

• Multiligual site
• Entity translation
• Panels
• String substitions

On a multilingual site using entity translation, I was confronted with a case where string substitutions was the perfect solution to a simple problem. I added various nodes to a panels context and added a custom panels pane with keywords. Works well except for the field language.

I tracked down the problem to custom content type plugin of ctools (patch attached). The solution could be that simple, or I'm totally missing the big picture. If anyone has any thoughts on the subject, I would be willing to work on this if more work is required.

Cheers!