Skip to content

Commit 25593d7

Browse files
committed
psql: Small fixes for better translatability
1 parent 254a216 commit 25593d7

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/bin/psql/describe.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4088,7 +4088,7 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
40884088
(showTables || showMatViews || showIndexes))
40894089
appendPQExpBuffer(&buf,
40904090
",\n am.amname as \"%s\"",
4091-
gettext_noop("Access Method"));
4091+
gettext_noop("Access method"));
40924092

40934093
/*
40944094
* As of PostgreSQL 9.0, use pg_table_size() to show a more accurate

src/bin/psql/help.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ slashUsage(unsigned short int pager)
240240
fprintf(output, _(" \\des[+] [PATTERN] list foreign servers\n"));
241241
fprintf(output, _(" \\deu[+] [PATTERN] list user mappings\n"));
242242
fprintf(output, _(" \\dew[+] [PATTERN] list foreign-data wrappers\n"));
243-
fprintf(output, _(" \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"));
244-
fprintf(output, _(" list [only agg/normal/procedure/trigger/window] functions\n"));
243+
fprintf(output, _(" \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"
244+
" list [only agg/normal/procedure/trigger/window] functions\n"));
245245
fprintf(output, _(" \\dF[+] [PATTERN] list text search configurations\n"));
246246
fprintf(output, _(" \\dFd[+] [PATTERN] list text search dictionaries\n"));
247247
fprintf(output, _(" \\dFp[+] [PATTERN] list text search parsers\n"));
@@ -252,7 +252,8 @@ slashUsage(unsigned short int pager)
252252
fprintf(output, _(" \\dL[S+] [PATTERN] list procedural languages\n"));
253253
fprintf(output, _(" \\dm[S+] [PATTERN] list materialized views\n"));
254254
fprintf(output, _(" \\dn[S+] [PATTERN] list schemas\n"));
255-
fprintf(output, _(" \\do[S] [OPPTRN [TYPEPTRN [TYPEPTRN]]] list operators\n"));
255+
fprintf(output, _(" \\do[S] [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
256+
" list operators\n"));
256257
fprintf(output, _(" \\dO[S+] [PATTERN] list collations\n"));
257258
fprintf(output, _(" \\dp [PATTERN] list table, view, and sequence access privileges\n"));
258259
fprintf(output, _(" \\dP[itn+] [PATTERN] list [only index/table] partitioned relations [n=nested]\n"));

src/test/regress/expected/psql.out

+3-3
Original file line numberDiff line numberDiff line change
@@ -2846,7 +2846,7 @@ Access method: heap
28462846
-- AM is displayed for tables, indexes and materialized views.
28472847
\d+
28482848
List of relations
2849-
Schema | Name | Type | Owner | Persistence | Access Method | Size | Description
2849+
Schema | Name | Type | Owner | Persistence | Access method | Size | Description
28502850
-----------------+--------------------+-------------------+----------------------+-------------+---------------+---------+-------------
28512851
tableam_display | mat_view_heap_psql | materialized view | regress_display_role | permanent | heap_psql | 0 bytes |
28522852
tableam_display | tbl_heap | table | regress_display_role | permanent | heap | 0 bytes |
@@ -2856,15 +2856,15 @@ Access method: heap
28562856

28572857
\dt+
28582858
List of relations
2859-
Schema | Name | Type | Owner | Persistence | Access Method | Size | Description
2859+
Schema | Name | Type | Owner | Persistence | Access method | Size | Description
28602860
-----------------+---------------+-------+----------------------+-------------+---------------+---------+-------------
28612861
tableam_display | tbl_heap | table | regress_display_role | permanent | heap | 0 bytes |
28622862
tableam_display | tbl_heap_psql | table | regress_display_role | permanent | heap_psql | 0 bytes |
28632863
(2 rows)
28642864

28652865
\dm+
28662866
List of relations
2867-
Schema | Name | Type | Owner | Persistence | Access Method | Size | Description
2867+
Schema | Name | Type | Owner | Persistence | Access method | Size | Description
28682868
-----------------+--------------------+-------------------+----------------------+-------------+---------------+---------+-------------
28692869
tableam_display | mat_view_heap_psql | materialized view | regress_display_role | permanent | heap_psql | 0 bytes |
28702870
(1 row)

0 commit comments

Comments
 (0)