diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-05-07 22:11:49 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-05-07 22:11:49 +0000 |
| commit | c91214d837562c6244053dfeaf99aa2d8b8deded (patch) | |
| tree | 1b3ddeb21999267f66f959406cb0c88f5e24b0bd /src/main.cpp | |
| parent | Move gettext initialization into separate function so it can be re-used (will... (diff) | |
| download | inkscape-c91214d837562c6244053dfeaf99aa2d8b8deded.tar.gz inkscape-c91214d837562c6244053dfeaf99aa2d8b8deded.zip | |
Move functions for switching gettext charset to helper/gettext.h
(bzr r15675.1.3)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index 02562383a..b2817fa97 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -857,10 +857,7 @@ static int sp_common_main( int argc, char const **argv, GSList **flDest ) // temporarily switch gettext encoding to locale, so that help messages can be output properly - std::string charset; - Glib::get_charset(charset); - - bind_textdomain_codeset(GETTEXT_PACKAGE, charset.c_str()); + Inkscape::bind_textdomain_codeset_console(); poptContext ctx = poptGetContext(NULL, argc, argv, options, 0); poptSetOtherOptionHelp(ctx, _("[OPTIONS...] [FILE...]\n\nAvailable options:")); @@ -871,7 +868,7 @@ static int sp_common_main( int argc, char const **argv, GSList **flDest ) poptFreeContext(ctx); // now switch gettext back to UTF-8 (for GUI) - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + Inkscape::bind_textdomain_codeset_utf8(); // Now let's see if the file list still holds up if ( needToRecodeParams ) |