[gjs: 3/3] Merge branch '296-detect-locale'

[Philip Chimento <pchimento src gnome org>]

commit 5c119fd73895f4ce4d5ff66b195d0879674f8328
Merge: f9632133 8e0163a4
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Mar 7 23:17:50 2020 -0800

    Merge branch '296-detect-locale'
    
    https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/399

 build/choose-tests-locale.sh               |  4 ++++
 installed-tests/scripts/common.sh          |  4 ++--
 installed-tests/scripts/testCommandLine.sh |  4 ++--
 installed-tests/scripts/testWarnings.sh    |  4 ++--
 meson.build                                | 19 ++++++++++---------
 test/run-test                              |  9 ---------
 6 files changed, 20 insertions(+), 24 deletions(-)
---