Merge "Make a hidden form field to keep the language code"