X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/99cde35bb58605e86541acd812860c222e375af2..8302d372469527e0df9773357b7a0ad105d34958:/src/cdecl99.c
diff --git a/src/cdecl99.c b/src/cdecl99.c
index 99b5d63..bebdfff 100644
--- a/src/cdecl99.c
+++ b/src/cdecl99.c
@@ -1,6 +1,6 @@
/*
* Command line utility for making sense of C declarations.
- * Copyright © 2011-2012 Nick Bowler
+ * Copyright © 2011-2012, 2020 Nick Bowler
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -13,8 +13,9 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*/
+
#include
#include
#include
@@ -23,13 +24,16 @@
#include
#include
#include
-#include
-#include
#include
-#include "readline.h"
#include "history.h"
#include "cdecl.h"
+#include
+#include
+#include
+#include
+#include
+
#define _(x) gettext(x)
#define N_(x) x
#define PN_(c, x) x
@@ -78,12 +82,22 @@ static struct helptext {
static void print_version(void)
{
+ const char *copysign = "(C)";
+ void *convsign = NULL;
+
+ if (ENABLE_NLS) {
+ convsign = str_iconv("\xc2\xa9", "UTF-8", locale_charset());
+ if (convsign)
+ copysign = convsign;
+ }
+
puts(PACKAGE_STRING);
- /* TRANSLATORS: (C) must *always* be translated as ©. */
- printf("Copyright %s 2011 Nick Bowler.\n", gettext("(C)"));
- puts("License GPLv3+: GNU GPL version 3 or later .");
+ printf("Copyright %s 2020 Nick Bowler.\n", copysign);
+ puts("License GPLv3+: GNU GPL version 3 or any later version.");
puts("This is free software: you are free to change and redistribute it.");
puts("There is NO WARRANTY, to the extent permitted by law.");
+
+ free(convsign);
}
static void print_usage(FILE *f)
@@ -478,13 +492,13 @@ static int repl_noninteractive(void)
/* Initialize gettext and setup translated long options. */
static void init_i18n(void)
{
+ if (!ENABLE_NLS)
+ return;
+
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
- if (!ENABLE_NLS)
- return;
-
for (int i = 0, j = NOPTS; i < NOPTS; i++) {
const char *tname = pgettext_expr("longopt", lopts[i].name);