pg_upgrade: Add NLS

Reviewed-by: Michael Paquier <[email protected]>

diff --git a/src/bin/pg_upgrade/function.c b/src/bin/pg_upgrade/function.c
index 30093407da9eec0921e4c586de1bd0bbe08a4acf..5b60f9f45981f0d38217c9db19265db1fac946ce 100644 (file)
--- a/src/bin/pg_upgrade/function.c
+++ b/src/bin/pg_upgrade/function.c
@@ -252,7 +252,7 @@ check_loadable_libraries(void)
            if (script == NULL && (script = fopen_priv(output_path, "w")) == NULL)
                pg_fatal("could not open file \"%s\": %s\n",
                         output_path, strerror(errno));
-           fprintf(script, "could not load library \"%s\":\n%s\n",
+           fprintf(script, _("could not load library \"%s\":\n%s\n"),
                    lib,
                    PQerrorMessage(conn));
        }

diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index 1200c7fca219aa869563ec1ac9eda5807754a5b5..8af9eacd28bde18d9c9bd4998633bf51c527cda6 100644 (file)
--- a/src/bin/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -238,7 +238,7 @@ report_unmatched_relation(const RelInfo *rel, const DbInfo *db, bool is_new_db)
            {
                snprintf(reldesc + strlen(reldesc),
                         sizeof(reldesc) - strlen(reldesc),
-                        " which is an index on \"%s.%s\"",
+                        _(" which is an index on \"%s.%s\""),
                         hrel->nspname, hrel->relname);
                /* Shift attention to index's table for toast check */
                rel = hrel;
@@ -248,7 +248,7 @@ report_unmatched_relation(const RelInfo *rel, const DbInfo *db, bool is_new_db)
        if (i >= db->rel_arr.nrels)
            snprintf(reldesc + strlen(reldesc),
                     sizeof(reldesc) - strlen(reldesc),
-                    " which is an index on OID %u", rel->indtable);
+                    _(" which is an index on OID %u"), rel->indtable);
    }
    if (rel->toastheap)
    {
@@ -260,7 +260,7 @@ report_unmatched_relation(const RelInfo *rel, const DbInfo *db, bool is_new_db)
            {
                snprintf(reldesc + strlen(reldesc),
                         sizeof(reldesc) - strlen(reldesc),
-                        " which is the TOAST table for \"%s.%s\"",
+                        _(" which is the TOAST table for \"%s.%s\""),
                         brel->nspname, brel->relname);
                break;
            }
@@ -268,7 +268,7 @@ report_unmatched_relation(const RelInfo *rel, const DbInfo *db, bool is_new_db)
        if (i >= db->rel_arr.nrels)
            snprintf(reldesc + strlen(reldesc),
                     sizeof(reldesc) - strlen(reldesc),
-                    " which is the TOAST table for OID %u", rel->toastheap);
+                    _(" which is the TOAST table for OID %u"), rel->toastheap);
    }
 
    if (is_new_db)

diff --git a/src/bin/pg_upgrade/nls.mk b/src/bin/pg_upgrade/nls.mk
new file mode 100644 (file)
index 0000000..a0c846d
--- /dev/null
+++ b/src/bin/pg_upgrade/nls.mk
@@ -0,0 +1,12 @@
+# src/bin/pg_upgrade/nls.mk
+CATALOG_NAME     = pg_upgrade
+AVAIL_LANGUAGES  =
+GETTEXT_FILES    = check.c controldata.c dump.c exec.c file.c function.c \
+                   info.c option.c parallel.c pg_upgrade.c relfilenode.c \
+                   server.c tablespace.c util.c version.c
+GETTEXT_TRIGGERS = pg_fatal pg_log:2 prep_status report_status:2
+GETTEXT_FLAGS    = \
+    pg_fatal:1:c-format \
+    pg_log:2:c-format \
+    prep_status:1:c-format \
+    report_status:2:c-format

diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
index 2e9a40c2b65b30ebfd88032fc998d07d081fb61d..12a49ff990161fc4f7c04d02696768e9feccf32d 100644 (file)
--- a/src/bin/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@ -240,13 +240,13 @@ parseCommandLine(int argc, char *argv[])
 
    /* Get values from env if not already set */
    check_required_directory(&old_cluster.bindir, NULL, "PGBINOLD", "-b",
-                            "old cluster binaries reside");
+                            _("old cluster binaries reside"));
    check_required_directory(&new_cluster.bindir, NULL, "PGBINNEW", "-B",
-                            "new cluster binaries reside");
+                            _("new cluster binaries reside"));
    check_required_directory(&old_cluster.pgdata, &old_cluster.pgconfig,
-                            "PGDATAOLD", "-d", "old cluster data resides");
+                            "PGDATAOLD", "-d", _("old cluster data resides"));
    check_required_directory(&new_cluster.pgdata, &new_cluster.pgconfig,
-                            "PGDATANEW", "-D", "new cluster data resides");
+                            "PGDATANEW", "-D", _("new cluster data resides"));
 
 #ifdef WIN32
 
@@ -275,56 +275,53 @@ parseCommandLine(int argc, char *argv[])
 static void
 usage(void)
 {
-   printf(_("pg_upgrade upgrades a PostgreSQL cluster to a different major version.\n\
-\nUsage:\n\
-  pg_upgrade [OPTION]...\n\
-\n\
-Options:\n\
-  -b, --old-bindir=BINDIR       old cluster executable directory\n\
-  -B, --new-bindir=BINDIR       new cluster executable directory\n\
-  -c, --check                   check clusters only, don't change any data\n\
-  -d, --old-datadir=DATADIR     old cluster data directory\n\
-  -D, --new-datadir=DATADIR     new cluster data directory\n\
-  -j, --jobs                    number of simultaneous processes or threads to use\n\
-  -k, --link                    link instead of copying files to new cluster\n\
-  -o, --old-options=OPTIONS     old cluster options to pass to the server\n\
-  -O, --new-options=OPTIONS     new cluster options to pass to the server\n\
-  -p, --old-port=PORT           old cluster port number (default %d)\n\
-  -P, --new-port=PORT           new cluster port number (default %d)\n\
-  -r, --retain                  retain SQL and log files after success\n\
-  -U, --username=NAME           cluster superuser (default \"%s\")\n\
-  -v, --verbose                 enable verbose internal logging\n\
-  -V, --version                 display version information, then exit\n\
-  -?, --help                    show this help, then exit\n\
-\n\
-Before running pg_upgrade you must:\n\
-  create a new database cluster (using the new version of initdb)\n\
-  shutdown the postmaster servicing the old cluster\n\
-  shutdown the postmaster servicing the new cluster\n\
-\n\
-When you run pg_upgrade, you must provide the following information:\n\
-  the data directory for the old cluster  (-d DATADIR)\n\
-  the data directory for the new cluster  (-D DATADIR)\n\
-  the \"bin\" directory for the old version (-b BINDIR)\n\
-  the \"bin\" directory for the new version (-B BINDIR)\n\
-\n\
-For example:\n\
-  pg_upgrade -d oldCluster/data -D newCluster/data -b oldCluster/bin -B newCluster/bin\n\
-or\n"), old_cluster.port, new_cluster.port, os_info.user);
+   printf(_("pg_upgrade upgrades a PostgreSQL cluster to a different major version.\n\n"));
+   printf(_("Usage:\n"));
+   printf(_("  pg_upgrade [OPTION]...\n\n"));
+   printf(_("Options:\n"));
+   printf(_("  -b, --old-bindir=BINDIR       old cluster executable directory\n"));
+   printf(_("  -B, --new-bindir=BINDIR       new cluster executable directory\n"));
+   printf(_("  -c, --check                   check clusters only, don't change any data\n"));
+   printf(_("  -d, --old-datadir=DATADIR     old cluster data directory\n"));
+   printf(_("  -D, --new-datadir=DATADIR     new cluster data directory\n"));
+   printf(_("  -j, --jobs                    number of simultaneous processes or threads to use\n"));
+   printf(_("  -k, --link                    link instead of copying files to new cluster\n"));
+   printf(_("  -o, --old-options=OPTIONS     old cluster options to pass to the server\n"));
+   printf(_("  -O, --new-options=OPTIONS     new cluster options to pass to the server\n"));
+   printf(_("  -p, --old-port=PORT           old cluster port number (default %d)\n"), old_cluster.port);
+   printf(_("  -P, --new-port=PORT           new cluster port number (default %d)\n"), new_cluster.port);
+   printf(_("  -r, --retain                  retain SQL and log files after success\n"));
+   printf(_("  -U, --username=NAME           cluster superuser (default \"%s\")\n"), os_info.user);
+   printf(_("  -v, --verbose                 enable verbose internal logging\n"));
+   printf(_("  -V, --version                 display version information, then exit\n"));
+   printf(_("  -?, --help                    show this help, then exit\n"));
+   printf(_("\n"
+            "Before running pg_upgrade you must:\n"
+            "  create a new database cluster (using the new version of initdb)\n"
+            "  shutdown the postmaster servicing the old cluster\n"
+            "  shutdown the postmaster servicing the new cluster\n"));
+   printf(_("\n"
+            "When you run pg_upgrade, you must provide the following information:\n"
+            "  the data directory for the old cluster  (-d DATADIR)\n"
+            "  the data directory for the new cluster  (-D DATADIR)\n"
+            "  the \"bin\" directory for the old version (-b BINDIR)\n"
+            "  the \"bin\" directory for the new version (-B BINDIR)\n"));
+   printf(_("\n"
+            "For example:\n"
+            "  pg_upgrade -d oldCluster/data -D newCluster/data -b oldCluster/bin -B newCluster/bin\n"
+            "or\n"));
 #ifndef WIN32
-   printf(_("\
-  $ export PGDATAOLD=oldCluster/data\n\
-  $ export PGDATANEW=newCluster/data\n\
-  $ export PGBINOLD=oldCluster/bin\n\
-  $ export PGBINNEW=newCluster/bin\n\
-  $ pg_upgrade\n"));
+   printf(_("  $ export PGDATAOLD=oldCluster/data\n"
+            "  $ export PGDATANEW=newCluster/data\n"
+            "  $ export PGBINOLD=oldCluster/bin\n"
+            "  $ export PGBINNEW=newCluster/bin\n"
+            "  $ pg_upgrade\n"));
 #else
-   printf(_("\
-  C:\\> set PGDATAOLD=oldCluster/data\n\
-  C:\\> set PGDATANEW=newCluster/data\n\
-  C:\\> set PGBINOLD=oldCluster/bin\n\
-  C:\\> set PGBINNEW=newCluster/bin\n\
-  C:\\> pg_upgrade\n"));
+   printf(_("  C:\\> set PGDATAOLD=oldCluster/data\n"
+            "  C:\\> set PGDATANEW=newCluster/data\n"
+            "  C:\\> set PGBINOLD=oldCluster/bin\n"
+            "  C:\\> set PGBINNEW=newCluster/bin\n"
+            "  C:\\> pg_upgrade\n"));
 #endif
    printf(_("\nReport bugs to <[email protected]>.\n"));
 }

diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
index 90c07205bf837dfba398ebf3b390631cc16d8503..0207d852cf10f2a5eac94ce6443befc08f6f9644 100644 (file)
--- a/src/bin/pg_upgrade/pg_upgrade.c
+++ b/src/bin/pg_upgrade/pg_upgrade.c
@@ -75,6 +75,7 @@ main(int argc, char **argv)
    char       *deletion_script_file_name = NULL;
    bool        live_check = false;
 
+   set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_upgrade"));
    parseCommandLine(argc, argv);
 
    get_restricted_token(os_info.progname);

diff --git a/src/bin/pg_upgrade/relfilenode.c b/src/bin/pg_upgrade/relfilenode.c
index c8c2a28f4e191036f32dc6427a6b56d0cf07924b..79e41d1dec266ed002b4d793c89be5dbcb674f9f 100644 (file)
--- a/src/bin/pg_upgrade/relfilenode.c
+++ b/src/bin/pg_upgrade/relfilenode.c
@@ -30,8 +30,10 @@ void
 transfer_all_new_tablespaces(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
                             char *old_pgdata, char *new_pgdata)
 {
-   pg_log(PG_REPORT, "%s user relation files\n",
-     user_opts.transfer_mode == TRANSFER_MODE_LINK ? "Linking" : "Copying");
+   if (user_opts.transfer_mode == TRANSFER_MODE_LINK)
+       pg_log(PG_REPORT, "Linking user relation files\n");
+   else
+       pg_log(PG_REPORT, "Copying user relation files\n");
 
    /*
     * Transferring files by tablespace is tricky because a single database

diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
index 12432bb1d07983c87078311191d8a72633d71e08..4892934c2e85d5dfdd227068cb33cff37e8827e5 100644 (file)
--- a/src/bin/pg_upgrade/server.c
+++ b/src/bin/pg_upgrade/server.c
@@ -36,7 +36,7 @@ connectToServer(ClusterInfo *cluster, const char *db_name)
        if (conn)
            PQfinish(conn);
 
-       printf("Failure, exiting\n");
+       printf(_("Failure, exiting\n"));
        exit(1);
    }
 
@@ -136,7 +136,7 @@ executeQueryOrDie(PGconn *conn, const char *fmt,...)
               PQerrorMessage(conn));
        PQclear(result);
        PQfinish(conn);
-       printf("Failure, exiting\n");
+       printf(_("Failure, exiting\n"));
        exit(1);
    }
    else

diff --git a/src/bin/pg_upgrade/util.c b/src/bin/pg_upgrade/util.c
index 52e891219b6273b18e6ece1100552be76efeeee3..4f27c72ba1bc8e0e3ac3245f969c71834c9b85fc 100644 (file)
--- a/src/bin/pg_upgrade/util.c
+++ b/src/bin/pg_upgrade/util.c
@@ -133,7 +133,7 @@ pg_log_v(eLogType type, const char *fmt, va_list ap)
 
        case PG_FATAL:
            printf("\n%s", message);
-           printf("Failure, exiting\n");
+           printf(_("Failure, exiting\n"));
            exit(1);
            break;
 
@@ -163,7 +163,7 @@ pg_fatal(const char *fmt,...)
    va_start(args, fmt);
    pg_log_v(PG_FATAL, fmt, args);
    va_end(args);
-   printf("Failure, exiting\n");
+   printf(_("Failure, exiting\n"));
    exit(1);
 }