Issue #1269136 by bforchhammer: Correct language handling--author=bforchhammer <bforchhammer@216396.no-reply.drupal.org>