Skip to content

locale: Make pot file generation stable #8010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
echoix merged 3 commits into from
Oct 5, 2026
Merged

locale: Make pot file generation stable #8010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a4fe76
libvector: Use the same plural string for vertices registered in buil…
claude Oct 3, 2026
b562817
locale: Sort the input file lists for xgettext
claude Oct 3, 2026
50e84cb
Apply batched suggestions from code review
echoix Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions lib/vector/Vlib/build_sfa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
\author Various updates for GRASS 7 by Martin Landa <landa.martin gmail.com>
*/

#include <inttypes.h>
#include <stdlib.h>

#include <grass/gis.h>
Expand Down Expand Up @@ -374,8 +375,9 @@ void build_pg(struct Map_info *Map, int build)
G_message(n_("One primitive registered", "%d primitives registered",
Map->plus.n_lines),
Map->plus.n_lines);
G_message(n_("One vertex registered", "%d vertices registered", npoints),
npoints);
G_message(n_("One vertex registered", "%" PRId64 " vertices registered",
(int64_t)npoints),
(int64_t)npoints);

Map->plus.built = GV_BUILD_BASE;

Expand Down Expand Up @@ -660,8 +662,9 @@ void build_ogr(struct Map_info *Map, int build)
G_message(n_("One primitive registered", "%d primitives registered",
Map->plus.n_lines),
Map->plus.n_lines);
G_message(n_("One vertex registered", "%d vertices registered", npoints),
npoints);
G_message(n_("One vertex registered", "%" PRId64 " vertices registered",
(int64_t)npoints),
(int64_t)npoints);

if (nskipped > 0)
G_warning(n_("One feature without geometry skipped",
Expand Down
8 changes: 4 additions & 4 deletions locale/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ MODDOMAIN = grassmods
WXPYDOMAIN = grasswxpy
DOMAINS = $(LIBDOMAIN) $(MODDOMAIN) $(WXPYDOMAIN)

LIB_POTFILES = find ../lib \( -name "*.c" -o -name "*.py" \) | xargs grep -l "_(\"\|n_(\""
MOD_POTFILES = find ../ \( -name "*.c" -o -name "*.cpp" \) | grep -v '../lib' | xargs grep -l "_(\"\|n_(\""
WXPY_POTFILES = find ../gui/wxpython -name '*.py' | xargs grep -l "_(\"\|n_(\""
LIB_POTFILES = find ../lib \( -name "*.c" -o -name "*.py" \) | LC_ALL=C sort | xargs grep -l "_(\"\|n_(\""
MOD_POTFILES = find ../ \( -name "*.c" -o -name "*.cpp" \) | grep -v '../lib' | LC_ALL=C sort | xargs grep -l "_(\"\|n_(\""
WXPY_POTFILES = find ../gui/wxpython -name '*.py' | LC_ALL=C sort | xargs grep -l "_(\"\|n_(\""
#For Python script module messages
MOD_PYFILES = find ../scripts -name '*.py' | xargs grep -l "_(\"\|n_(\""
MOD_PYFILES = find ../scripts -name '*.py' | LC_ALL=C sort | xargs grep -l "_(\"\|n_(\""

XGETTEXT_ARGS = --no-wrap --sort-by-file
MSGMERGE_ARGS = --no-wrap --sort-by-file --previous
Expand Down
Loading