Fix bug 1659: set correct language as source

Because the variable 'lang' was used for two different meanings,
the saved language was whatever was read last from the json
configuration.

Change-Id: I2abd7311f6d534f71ffdbec44c80138966d70e1c
Merge "Fix bug 1659: set correct language as source"