Dr. Werner Fink 2018-09-06 13:41:32 +00:00 committed by Git OBS Bridge
parent 105ad5af85
commit 597fe24582
2 changed files with 9 additions and 5 deletions

View File

@ -1,7 +1,7 @@
--- ---
src/main.c | 20 ++++++++++++++------ src/main.c | 18 ++++++++++++------
src/u_print.c | 1 + src/u_print.c | 1 +
2 files changed, 15 insertions(+), 6 deletions(-) 2 files changed, 13 insertions(+), 6 deletions(-)
--- src/main.c --- src/main.c
+++ src/main.c 2018-09-06 11:16:21.842867881 +0000 +++ src/main.c 2018-09-06 11:16:21.842867881 +0000
@ -43,15 +43,13 @@
/************************************************************/ /************************************************************/
/* if the international option has been set, set the locale */ /* if the international option has been set, set the locale */
/************************************************************/ /************************************************************/
@@ -1612,6 +1613,13 @@ setup_visual(int *argc_p, char **argv, A @@ -1612,6 +1613,11 @@ setup_visual(int *argc_p, char **argv, A
*/ */
tool = XtAppInitialize (&tool_app, "Fig", options, XtNumber (options), argc_p, argv, tool = XtAppInitialize (&tool_app, "Fig", options, XtNumber (options), argc_p, argv,
(String *) NULL, args, 0); (String *) NULL, args, 0);
+#ifdef I18N +#ifdef I18N
+ setlocale(LC_ALL, ""); + setlocale(LC_ALL, "");
+ setlocale(LC_NUMERIC, "C"); + setlocale(LC_NUMERIC, "C");
+ if (strcasestr(nl_langinfo(CODESET),"UTF-8"))
+ setlocale(LC_CTYPE, "C");
+ XtSetLanguageProc(tool_app, NULL, NULL); + XtSetLanguageProc(tool_app, NULL, NULL);
+#endif /* I18N */ +#endif /* I18N */
/* save important info */ /* save important info */

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Sep 6 13:40:48 UTC 2018 - Dr. Werner Fink <werner@suse.de>
- Revert workaround from locale patch as it breaks UTF-8 text
in file and object handling
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 6 11:32:18 UTC 2018 - Dr. Werner Fink <werner@suse.de> Thu Sep 6 11:32:18 UTC 2018 - Dr. Werner Fink <werner@suse.de>