From 78b3c8ed32e9b92a840ad6c87857d7d9c5765a5e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 16 Aug 2017 16:45:34 +0200 Subject: [PATCH] Python-i18n: allow None as a gettext path (searches default) --- src/libcalamares/PythonJobApi.cpp | 4 ++-- src/libcalamares/PythonJobApi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp index 705467f25..d7d78c9ce 100644 --- a/src/libcalamares/PythonJobApi.cpp +++ b/src/libcalamares/PythonJobApi.cpp @@ -240,12 +240,12 @@ gettext_languages() return pyList; } -std::string +bp::object gettext_path() { // TODO: distinguish between -d runs and normal runs // TODO: can we detect DESTDIR-installs? - return std::string(); + return bp::object(); // None } diff --git a/src/libcalamares/PythonJobApi.h b/src/libcalamares/PythonJobApi.h index a732e005b..3d31c474e 100644 --- a/src/libcalamares/PythonJobApi.h +++ b/src/libcalamares/PythonJobApi.h @@ -61,7 +61,7 @@ std::string check_target_env_output( const boost::python::list& args, std::string obscure( const std::string& string ); -std::string gettext_path(); +boost::python::object gettext_path(); boost::python::list gettext_languages();