64b62de5df
While we support a reasonable list of layouts nowadays, we don't include many variants like `fr+oss`. Instead of directly falling back to the `us` layout, try stripping the variant first, as the base layout is likely closer to the expectation than `us`. https://gitlab.gnome.org/GNOME/gnome-shell/issues/1907 (cherry picked from commit c1ec7b2ffa5b4e5f8b6a31d9cb3eaed0712bd03a)