gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/c9998a8a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/31c0fed1 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/784b6c94 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5c478713 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b5fdcfcb (commit)



commit c9998a8ad80b20601d238f1ad01b033045968b55
Merge: b5fdcfcb5 31c0fed1d
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jan 3 13:54:59 2020 -0800

    Merge Dave Dittman's missing whitespace into maint


commit 31c0fed1dc4d424dbb9900e3071938dc09313f5a
Author: Daniel Dittmann <ddittmann at gmx.net>
Date:   Thu Jan 2 14:02:04 2020 +0100

    test_gnc_setlocale: use trailing whitespaces

diff --git a/libgnucash/engine/test/test-gnc-date.c b/libgnucash/engine/test/test-gnc-date.c
index 86417325e..991d36918 100644
--- a/libgnucash/engine/test/test-gnc-date.c
+++ b/libgnucash/engine/test/test-gnc-date.c
@@ -486,11 +486,11 @@ test_gnc_setlocale (int category, gchar *locale)
         if (localeval != NULL)
             return;
     }
-    g_fprintf (stderr, "There are some differences between distros in the way they name"
-              " locales, and this can cause trouble with the locale-based"
-              " formatting. If you get the assert in this function, run locale -a"
-              " and make sure that en_US, en_GB, and fr_FR are installed and that"
-              " if a suffix is needed it's in the suffixes array.");
+    g_fprintf (stderr, "There are some differences between distros in the way they name "
+              "locales, and this can cause trouble with the locale-based "
+              "formatting. If you get the assert in this function, run locale -a "
+              "and make sure that en_US, en_GB, and fr_FR are installed and that "
+              "if a suffix is needed it's in the suffixes array.");
     g_assert_not_reached ();
 }
 /* timespecCanonicalDayTime

commit 784b6c9448d53cabaeaa8eea071b03ca9b37f2f9
Merge: 5c478713d e77db0671
Author: Daniel Dittmann <ddittmann at gmx.net>
Date:   Mon Dec 30 11:42:43 2019 +0000

    Merge remote-tracking branch 'upstream/maint' into maint


commit 5c478713d6fb92e073a8958fa17f56463edd5d4c
Author: Daniel Dittmann <ddittmann at gmx.net>
Date:   Mon Dec 30 00:38:09 2019 +0100

    test_gnc_setlocale: add missing whitespaces to diagnostic message

diff --git a/libgnucash/engine/test/test-gnc-date.c b/libgnucash/engine/test/test-gnc-date.c
index ab3795f4b..86417325e 100644
--- a/libgnucash/engine/test/test-gnc-date.c
+++ b/libgnucash/engine/test/test-gnc-date.c
@@ -487,10 +487,10 @@ test_gnc_setlocale (int category, gchar *locale)
             return;
     }
     g_fprintf (stderr, "There are some differences between distros in the way they name"
-              "locales, and this can cause trouble with the locale-based"
-              "formatting. If you get the assert in this function, run locale -a"
-              "and make sure that en_US, en_GB, and fr_FR are installed and that"
-              "if a suffix is needed it's in the suffixes array.");
+              " locales, and this can cause trouble with the locale-based"
+              " formatting. If you get the assert in this function, run locale -a"
+              " and make sure that en_US, en_GB, and fr_FR are installed and that"
+              " if a suffix is needed it's in the suffixes array.");
     g_assert_not_reached ();
 }
 /* timespecCanonicalDayTime



Summary of changes:
 libgnucash/engine/test/test-gnc-date.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)