Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7471348

Browse files
committed
Add NLS to pg_verifybackup
1 parent 60fbb4d commit 7471348

File tree

3 files changed

+24
-7
lines changed

3 files changed

+24
-7
lines changed

src/bin/pg_verifybackup/nls.mk

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# src/bin/pg_verifybackup/nls.mk
2+
CATALOG_NAME = pg_verifybackup
3+
AVAIL_LANGUAGES =
4+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
5+
parse_manifest.c \
6+
pg_verifybackup.c \
7+
../../common/fe_memutils.c \
8+
../../common/jsonapi.c
9+
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
10+
json_manifest_parse_failure:2 \
11+
error_cb:2 \
12+
report_backup_error:2 \
13+
report_fatal_error
14+
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
15+
error_cb:2:c-format \
16+
report_backup_error:2:c-format \
17+
report_fatal_error:1:c-format

src/bin/pg_verifybackup/parse_manifest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ typedef void (*json_manifest_perwalrange_callback)(JsonManifestParseContext *,
2929
TimeLineID tli,
3030
XLogRecPtr start_lsn, XLogRecPtr end_lsn);
3131
typedef void (*json_manifest_error_callback)(JsonManifestParseContext *,
32-
char *fmt, ...) pg_attribute_printf(2, 3)
32+
const char *fmt, ...) pg_attribute_printf(2, 3)
3333
pg_attribute_noreturn();
3434

3535
struct JsonManifestParseContext

src/bin/pg_verifybackup/pg_verifybackup.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ static void record_manifest_details_for_wal_range(JsonManifestParseContext *cont
124124
XLogRecPtr start_lsn,
125125
XLogRecPtr end_lsn);
126126
static void report_manifest_error(JsonManifestParseContext *context,
127-
char *fmt,...)
127+
const char *fmt,...)
128128
pg_attribute_printf(2, 3) pg_attribute_noreturn();
129129

130130
static void verify_backup_directory(verifier_context *context,
@@ -358,7 +358,7 @@ main(int argc, char **argv)
358358
* work quietly.
359359
*/
360360
if (!context.saw_any_error && !quiet)
361-
printf("backup successfully verified\n");
361+
printf(_("backup successfully verified\n"));
362362

363363
return context.saw_any_error ? 1 : 0;
364364
}
@@ -443,12 +443,12 @@ parse_manifest_file(char *manifest_path, manifest_files_hash **ht_p,
443443
* expects this function not to return.
444444
*/
445445
static void
446-
report_manifest_error(JsonManifestParseContext *context, char *fmt,...)
446+
report_manifest_error(JsonManifestParseContext *context, const char *fmt,...)
447447
{
448448
va_list ap;
449449

450450
va_start(ap, fmt);
451-
pg_log_generic_v(PG_LOG_FATAL, fmt, ap);
451+
pg_log_generic_v(PG_LOG_FATAL, gettext(fmt), ap);
452452
va_end(ap);
453453

454454
exit(1);
@@ -821,7 +821,7 @@ report_backup_error(verifier_context *context, const char *pg_restrict fmt,...)
821821
va_list ap;
822822

823823
va_start(ap, fmt);
824-
pg_log_generic_v(PG_LOG_ERROR, fmt, ap);
824+
pg_log_generic_v(PG_LOG_ERROR, gettext(fmt), ap);
825825
va_end(ap);
826826

827827
context->saw_any_error = true;
@@ -838,7 +838,7 @@ report_fatal_error(const char *pg_restrict fmt,...)
838838
va_list ap;
839839

840840
va_start(ap, fmt);
841-
pg_log_generic_v(PG_LOG_FATAL, fmt, ap);
841+
pg_log_generic_v(PG_LOG_FATAL, gettext(fmt), ap);
842842
va_end(ap);
843843

844844
exit(1);

0 commit comments

Comments
 (0)