gnucash maint: Multiple changes pushed

[Frank H.Ellenberger]

Updated	 via  https://github.com/Gnucash/gnucash/commit/04c31a5d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/07821be6 (commit)
	from  https://github.com/Gnucash/gnucash/commit/50d3b6b5 (commit)



commit 04c31a5d06ed701722bb8cb2da8e822aba3dd067
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Dec 21 06:29:31 2018 +0100

    Bug 796988 - Untranslated string in CSV transaction importer
    
    caused by a wrong path

diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
index 389f7e3..e460d3c 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
@@ -2059,11 +2059,11 @@ CsvImpTransAssist::assist_summary_page_prepare ()
     gtk_assistant_remove_action_widget (csv_imp_asst, help_button);
     gtk_assistant_remove_action_widget (csv_imp_asst, cancel_button);
 
+    // FIXME Rather than passing a locale generator below we probably should set std::locale::global appropriately somewhere.
     bl::generator gen;
-    gen.add_messages_path(gnc_path_get_datadir());
-    gen.add_messages_domain(PACKAGE);
+    gen.add_messages_path(gnc_path_get_localedir());
+    gen.add_messages_domain(GETTEXT_PACKAGE);
 
-    // FIXME Rather than passing a locale generator below we probably should set std::locale::global appropriately somewhere.
     auto text = std::string("<span size=\"medium\"><b>");
     /* Translators: {1} will be replaced with a filename */
     text += (bl::format (bl::translate ("The transactions were imported from file '{1}'.")) % m_file_name).str(gen(""));

commit 07821be68d5309226b755db48e8bb37501b41438
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Dec 21 06:04:05 2018 +0100

    de.po: fix 1 MsgStr to test boost::locale::tramslate
    
    preparation for Bug 796988

diff --git a/po/de.po b/po/de.po
index 0cb6281..7a9c276 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19865,9 +19865,8 @@ msgstr ""
 
 #. Translators: {1} will be replaced with a filename
 #: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2034
-#, fuzzy
 msgid "The transactions were imported from file '{1}'."
-msgstr "Die Buchungen wurden aus der Datei »%s« importiert."
+msgstr "Die Buchungen wurden aus der Datei »{1}« importiert."
 
 #: gnucash/import-export/csv-imp/csv-account-import.c:251
 #, c-format



Summary of changes:
 gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp | 6 +++---
 po/de.po                                                     | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)