kconfig: drop localization support

The localization support is broken and appears unused.
There is no google hits on the update-po-config target.
And there is no recent (5 years) activity related to the localization.

So lets just drop this as it is no longer used.

Suggested-by: Ulf Magnusson <ulfalizer@gmail.com>
Suggested-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/config/conf.c b/config/conf.c
index e525e5ec0245822ffd918f83cd0d982c07038042..130335f371ec1c2ffc61404c8fd2d6812ae9a88b 100644 (file)
--- a/config/conf.c
+++ b/config/conf.c
@@ -3,7 +3,6 @@
  * Released under the terms of the GNU GPL v2.0.
  */
 
  * Released under the terms of the GNU GPL v2.0.
  */
 

-#include <locale.h>

 #include <ctype.h>
 #include <limits.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <limits.h>
 #include <stdio.h>


@@ -84,7 +83,7 @@ static int conf_askvalue(struct symbol *sym, const char *def)
        enum symbol_type type = sym_get_type(sym);
 
        if (!sym_has_value(sym))
        enum symbol_type type = sym_get_type(sym);
 
        if (!sym_has_value(sym))

-               printf(_("(NEW) "));
+               printf("(NEW) ");

 
        line[0] = '\n';
        line[1] = 0;
 
        line[0] = '\n';
        line[1] = 0;


@@ -130,7 +129,7 @@ static int conf_string(struct menu *menu)
        const char *def;
 
        while (1) {
        const char *def;
 
        while (1) {

-               printf("%*s%s ", indent - 1, "", _(menu->prompt->text));
+               printf("%*s%s ", indent - 1, "", menu->prompt->text);

                printf("(%s) ", sym->name);
                def = sym_get_string_value(sym);
                if (sym_get_string_value(sym))
                printf("(%s) ", sym->name);
                def = sym_get_string_value(sym);
                if (sym_get_string_value(sym))


@@ -163,7 +162,7 @@ static int conf_sym(struct menu *menu)
        tristate oldval, newval;
 
        while (1) {
        tristate oldval, newval;
 
        while (1) {

-               printf("%*s%s ", indent - 1, "", _(menu->prompt->text));
+               printf("%*s%s ", indent - 1, "", menu->prompt->text);

                if (sym->name)
                        printf("(%s) ", sym->name);
                putchar('[');
                if (sym->name)
                        printf("(%s) ", sym->name);
                putchar('[');


@@ -248,7 +247,7 @@ static int conf_choice(struct menu *menu)
                case no:
                        return 1;
                case mod:
                case no:
                        return 1;
                case mod:

-                       printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu)));
+                       printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));

                        return 0;
                case yes:
                        break;
                        return 0;
                case yes:
                        break;


@@ -258,7 +257,7 @@ static int conf_choice(struct menu *menu)
        while (1) {
                int cnt, def;
 
        while (1) {
                int cnt, def;
 

-               printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu)));
+               printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));

                def_sym = sym_get_choice_value(sym);
                cnt = def = 0;
                line[0] = 0;
                def_sym = sym_get_choice_value(sym);
                cnt = def = 0;
                line[0] = 0;


@@ -266,7 +265,7 @@ static int conf_choice(struct menu *menu)
                        if (!menu_is_visible(child))
                                continue;
                        if (!child->sym) {
                        if (!menu_is_visible(child))
                                continue;
                        if (!child->sym) {

-                               printf("%*c %s\n", indent, '*', _(menu_get_prompt(child)));
+                               printf("%*c %s\n", indent, '*', menu_get_prompt(child));

                                continue;
                        }
                        cnt++;
                                continue;
                        }
                        cnt++;


@@ -275,14 +274,14 @@ static int conf_choice(struct menu *menu)
                                printf("%*c", indent, '>');
                        } else
                                printf("%*c", indent, ' ');
                                printf("%*c", indent, '>');
                        } else
                                printf("%*c", indent, ' ');

-                       printf(" %d. %s", cnt, _(menu_get_prompt(child)));
+                       printf(" %d. %s", cnt, menu_get_prompt(child));

                        if (child->sym->name)
                                printf(" (%s)", child->sym->name);
                        if (!sym_has_value(child->sym))
                        if (child->sym->name)
                                printf(" (%s)", child->sym->name);
                        if (!sym_has_value(child->sym))

-                               printf(_(" (NEW)"));
+                               printf(" (NEW)");

                        printf("\n");
                }
                        printf("\n");
                }

-               printf(_("%*schoice"), indent - 1, "");
+               printf("%*schoice", indent - 1, "");

                if (cnt == 1) {
                        printf("[1]: 1\n");
                        goto conf_childs;
                if (cnt == 1) {
                        printf("[1]: 1\n");
                        goto conf_childs;


@@ -368,7 +367,7 @@ static void conf(struct menu *menu)
                        if (prompt)
                                printf("%*c\n%*c %s\n%*c\n",
                                        indent, '*',
                        if (prompt)
                                printf("%*c\n%*c %s\n%*c\n",
                                        indent, '*',

-                                       indent, '*', _(prompt),
+                                       indent, '*', prompt,

                                        indent, '*');
                default:
                        ;
                                        indent, '*');
                default:
                        ;


@@ -433,7 +432,7 @@ static void check_conf(struct menu *menu)
                                }
                        } else {
                                if (!conf_cnt++)
                                }
                        } else {
                                if (!conf_cnt++)

-                                       printf(_("*\n* Restart config...\n*\n"));
+                                       printf("*\n* Restart config...\n*\n");

                                rootEntry = menu_get_parent_menu(menu);
                                conf(rootEntry);
                        }
                                rootEntry = menu_get_parent_menu(menu);
                                conf(rootEntry);
                        }


@@ -485,10 +484,6 @@ int main(int ac, char **av)
        const char *name, *defconfig_file = NULL /* gcc uninit */;
        struct stat tmpstat;
 
        const char *name, *defconfig_file = NULL /* gcc uninit */;
        struct stat tmpstat;
 

-       setlocale(LC_ALL, "");
-       bindtextdomain(PACKAGE, LOCALEDIR);
-       textdomain(PACKAGE);
-

        tty_stdio = isatty(0) && isatty(1);
 
        while ((opt = getopt_long(ac, av, "s", long_opts, NULL)) != -1) {
        tty_stdio = isatty(0) && isatty(1);
 
        while ((opt = getopt_long(ac, av, "s", long_opts, NULL)) != -1) {


@@ -543,7 +538,7 @@ int main(int ac, char **av)
                }
        }
        if (ac == optind) {
                }
        }
        if (ac == optind) {

-               fprintf(stderr, _("%s: Kconfig file missing\n"), av[0]);
+               fprintf(stderr, "%s: Kconfig file missing\n", av[0]);

                conf_usage(progname);
                exit(1);
        }
                conf_usage(progname);
                exit(1);
        }


@@ -557,9 +552,9 @@ int main(int ac, char **av)
                        defconfig_file = conf_get_default_confname();
                if (conf_read(defconfig_file)) {
                        fprintf(stderr,
                        defconfig_file = conf_get_default_confname();
                if (conf_read(defconfig_file)) {
                        fprintf(stderr,

-                               _("***\n"
+                               "***\n"

                                  "*** Can't find default configuration \"%s\"!\n"
                                  "*** Can't find default configuration \"%s\"!\n"

-                                 "***\n"),
+                                 "***\n",

                                defconfig_file);
                        exit(1);
                }
                                defconfig_file);
                        exit(1);
                }


@@ -582,7 +577,7 @@ int main(int ac, char **av)
                if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
                        if (conf_read_simple(name, S_DEF_USER)) {
                                fprintf(stderr,
                if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
                        if (conf_read_simple(name, S_DEF_USER)) {
                                fprintf(stderr,

-                                       _("*** Can't read seed configuration \"%s\"!\n"),
+                                       "*** Can't read seed configuration \"%s\"!\n",

                                        name);
                                exit(1);
                        }
                                        name);
                                exit(1);
                        }


@@ -599,7 +594,7 @@ int main(int ac, char **av)
                if (conf_read_simple(name, S_DEF_USER) &&
                    conf_read_simple("all.config", S_DEF_USER)) {
                        fprintf(stderr,
                if (conf_read_simple(name, S_DEF_USER) &&
                    conf_read_simple("all.config", S_DEF_USER)) {
                        fprintf(stderr,

-                               _("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"),
+                               "*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n",

                                name);
                        exit(1);
                }
                                name);
                        exit(1);
                }


@@ -648,7 +643,7 @@ int main(int ac, char **av)
 
        if (input_mode == savedefconfig) {
                if (conf_write_defconfig(defconfig_file)) {
 
        if (input_mode == savedefconfig) {
                if (conf_write_defconfig(defconfig_file)) {

-                       fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),
+                       fprintf(stderr, "n*** Error while saving defconfig to: %s\n\n",

                                defconfig_file);
                        return 1;
                }
                                defconfig_file);
                        return 1;
                }


@@ -657,11 +652,11 @@ int main(int ac, char **av)
                 * build so we shall update autoconf.
                 */
                if (conf_write(NULL)) {
                 * build so we shall update autoconf.
                 */
                if (conf_write(NULL)) {

-                       fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
+                       fprintf(stderr, "\n*** Error during writing of the configuration.\n\n");

                        exit(1);
                }
                if (conf_write_autoconf()) {
                        exit(1);
                }
                if (conf_write_autoconf()) {

-                       fprintf(stderr, _("\n*** Error during update of the configuration.\n\n"));
+                       fprintf(stderr, "\n*** Error during update of the configuration.\n\n");

                        return 1;
                }
        }
                        return 1;
                }
        }

diff --git a/config/confdata.c b/config/confdata.c
index 21efc143abf386c2a4525a9a001b9b42a7b07bf8..94c5efa68912772b3b4ccade24c4c4073382978c 100644 (file)
--- a/config/confdata.c
+++ b/config/confdata.c
@@ -277,7 +277,7 @@ int conf_read_simple(const char *name, int def)
                        name = conf_expand_value(prop->expr->left.sym->name);
                        in = zconf_fopen(name);
                        if (in) {
                        name = conf_expand_value(prop->expr->left.sym->name);
                        in = zconf_fopen(name);
                        if (in) {

-                               conf_message(_("using defaults found in %s"),
+                               conf_message("using defaults found in %s",

                                         name);
                                goto load;
                        }
                                         name);
                                goto load;
                        }


@@ -877,7 +877,7 @@ next:
                        return 1;
        }
 
                        return 1;
        }
 

-       conf_message(_("configuration written to %s"), newname);
+       conf_message("configuration written to %s", newname);

 
        sym_set_change_count(0);
 
 
        sym_set_change_count(0);
 

diff --git a/config/lkc.h b/config/lkc.h
index f4394af6e4b81c8d0c0f18acf6eb97852e79cc72..2628bc6a21410ea9c3d712506917fb19949d7065 100644 (file)
--- a/config/lkc.h
+++ b/config/lkc.h
@@ -8,15 +8,6 @@
 
 #include "expr.h"
 
 
 #include "expr.h"
 

-#ifndef KBUILD_NO_NLS
-# include <libintl.h>
-#else
-static inline const char *gettext(const char *txt) { return txt; }
-static inline void textdomain(const char *domainname) {}
-static inline void bindtextdomain(const char *name, const char *dir) {}
-static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c; }
-#endif
-

 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif


@@ -29,11 +20,6 @@ extern "C" {
 #define PACKAGE "linux"
 #endif
 
 #define PACKAGE "linux"
 #endif
 

-#define LOCALEDIR "/usr/share/locale"
-
-#define _(text) gettext(text)
-#define N_(text) (text)
-

 #ifndef CONFIG_
 #define CONFIG_ "CONFIG_"
 #endif
 #ifndef CONFIG_
 #define CONFIG_ "CONFIG_"
 #endif

diff --git a/config/menu.c b/config/menu.c
index 5c5c1374b151f2a3b25217817d68a0af4b8a120f..068a4e4db20a4623225f5a16e01bc8dc5c926f4d 100644 (file)
--- a/config/menu.c
+++ b/config/menu.c
@@ -711,7 +711,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
        struct menu *submenu[8], *menu, *location = NULL;
        struct jump_key *jump = NULL;
 
        struct menu *submenu[8], *menu, *location = NULL;
        struct jump_key *jump = NULL;
 

-       str_printf(r, _("Prompt: %s\n"), _(prop->text));
+       str_printf(r, "Prompt: %s\n", prop->text);

        menu = prop->menu->parent;
        for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent) {
                bool accessible = menu_is_visible(menu);
        menu = prop->menu->parent;
        for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent) {
                bool accessible = menu_is_visible(menu);


@@ -744,16 +744,16 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
        }
 
        if (i > 0) {
        }
 
        if (i > 0) {

-               str_printf(r, _("  Location:\n"));
+               str_printf(r, "  Location:\n");

                for (j = 4; --i >= 0; j += 2) {
                        menu = submenu[i];
                        if (jump && menu == location)
                                jump->offset = strlen(r->s);
                        str_printf(r, "%*c-> %s", j, ' ',
                for (j = 4; --i >= 0; j += 2) {
                        menu = submenu[i];
                        if (jump && menu == location)
                                jump->offset = strlen(r->s);
                        str_printf(r, "%*c-> %s", j, ' ',

-                                  _(menu_get_prompt(menu)));
+                                  menu_get_prompt(menu));

                        if (menu->sym) {
                                str_printf(r, " (%s [=%s])", menu->sym->name ?
                        if (menu->sym) {
                                str_printf(r, " (%s [=%s])", menu->sym->name ?

-                                       menu->sym->name : _("<choice>"),
+                                       menu->sym->name : "<choice>",

                                        sym_get_string_value(menu->sym));
                        }
                        str_append(r, "\n");
                                        sym_get_string_value(menu->sym));
                        }
                        str_append(r, "\n");


@@ -817,23 +817,23 @@ static void get_symbol_str(struct gstr *r, struct symbol *sym,
 
        prop = get_symbol_prop(sym);
        if (prop) {
 
        prop = get_symbol_prop(sym);
        if (prop) {

-               str_printf(r, _("  Defined at %s:%d\n"), prop->menu->file->name,
+               str_printf(r, "  Defined at %s:%d\n", prop->menu->file->name,

                        prop->menu->lineno);
                if (!expr_is_yes(prop->visible.expr)) {
                        prop->menu->lineno);
                if (!expr_is_yes(prop->visible.expr)) {

-                       str_append(r, _("  Depends on: "));
+                       str_append(r, "  Depends on: ");

                        expr_gstr_print(prop->visible.expr, r);
                        str_append(r, "\n");
                }
        }
 
                        expr_gstr_print(prop->visible.expr, r);
                        str_append(r, "\n");
                }
        }
 

-       get_symbol_props_str(r, sym, P_SELECT, _("  Selects: "));
+       get_symbol_props_str(r, sym, P_SELECT, "  Selects: ");

        if (sym->rev_dep.expr) {
                expr_gstr_print_revdep(sym->rev_dep.expr, r, yes, "  Selected by [y]:\n");
                expr_gstr_print_revdep(sym->rev_dep.expr, r, mod, "  Selected by [m]:\n");
                expr_gstr_print_revdep(sym->rev_dep.expr, r, no, "  Selected by [n]:\n");
        }
 
        if (sym->rev_dep.expr) {
                expr_gstr_print_revdep(sym->rev_dep.expr, r, yes, "  Selected by [y]:\n");
                expr_gstr_print_revdep(sym->rev_dep.expr, r, mod, "  Selected by [m]:\n");
                expr_gstr_print_revdep(sym->rev_dep.expr, r, no, "  Selected by [n]:\n");
        }
 

-       get_symbol_props_str(r, sym, P_IMPLY, _("  Implies: "));
+       get_symbol_props_str(r, sym, P_IMPLY, "  Implies: ");

        if (sym->implied.expr) {
                expr_gstr_print_revdep(sym->implied.expr, r, yes, "  Implied by [y]:\n");
                expr_gstr_print_revdep(sym->implied.expr, r, mod, "  Implied by [m]:\n");
        if (sym->implied.expr) {
                expr_gstr_print_revdep(sym->implied.expr, r, yes, "  Implied by [y]:\n");
                expr_gstr_print_revdep(sym->implied.expr, r, mod, "  Implied by [m]:\n");


@@ -852,7 +852,7 @@ struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head)
        for (i = 0; sym_arr && (sym = sym_arr[i]); i++)
                get_symbol_str(&res, sym, head);
        if (!i)
        for (i = 0; sym_arr && (sym = sym_arr[i]); i++)
                get_symbol_str(&res, sym, head);
        if (!i)

-               str_append(&res, _("No matches found.\n"));
+               str_append(&res, "No matches found.\n");

        return res;
 }
 
        return res;
 }
 


@@ -867,7 +867,7 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
                        str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
                help_text = menu_get_help(menu);
        }
                        str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
                help_text = menu_get_help(menu);
        }

-       str_printf(help, "%s\n", _(help_text));
+       str_printf(help, "%s\n", help_text);

        if (sym)
                get_symbol_str(help, sym, NULL);
 }
        if (sym)
                get_symbol_str(help, sym, NULL);
 }

diff --git a/config/zconf.y b/config/zconf.y
index c292f27d41d883a707b533bc9c7e5556e81cd8d2..c9a1bcb5fce055b39cc1d4c064235ee9b06ffb7c 100644 (file)
--- a/config/zconf.y
+++ b/config/zconf.y
@@ -547,7 +547,7 @@ void conf_parse(const char *name)
                modules_sym = sym_find( "n" );
 
        tmp = rootmenu.prompt->text;
                modules_sym = sym_find( "n" );
 
        tmp = rootmenu.prompt->text;

-       rootmenu.prompt->text = _(rootmenu.prompt->text);
+       rootmenu.prompt->text = rootmenu.prompt->text;

        rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
        free((char*)tmp);
 
        rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
        free((char*)tmp);