dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7e12c58
)
Added gettext calls.
author
Peter Verthez
<Peter.Verthez@advalvas.be>
Tue, 11 Dec 2001 21:03:50 +0000
(21:03 +0000)
committer
Peter Verthez
<Peter.Verthez@advalvas.be>
Tue, 11 Dec 2001 21:03:50 +0000
(21:03 +0000)
gedcom/encoding.c
patch
|
blob
|
history
gedcom/gedcom.y
patch
|
blob
|
history
gedcom/gedcom_lex_common.c
patch
|
blob
|
history
gedcom/message.c
patch
|
blob
|
history
po/POTFILES.in
patch
|
blob
|
history
diff --git
a/gedcom/encoding.c
b/gedcom/encoding.c
index a801b5fb0506f6db6b07ded492d076c13ef50211..0c7af44d652b855ed6e71912b430e0484bc7ac4a 100644
(file)
--- a/
gedcom/encoding.c
+++ b/
gedcom/encoding.c
@@
-64,7
+64,7
@@
void add_encoding(char *gedcom_n, char* charwidth, char *iconv_n)
strcpy(nodeptr->iconv_name, iconv_n);
datum = tsearch(nodeptr, &encoding_mapping, node_compare);
if ((datum == NULL) || (*datum != nodeptr)) {
strcpy(nodeptr->iconv_name, iconv_n);
datum = tsearch(nodeptr, &encoding_mapping, node_compare);
if ((datum == NULL) || (*datum != nodeptr)) {
- gedcom_warning(
"Duplicate entry found for encoding '%s', ignoring"
,
+ gedcom_warning(
_("Duplicate entry found for encoding '%s', ignoring")
,
gedcom_n);
}
}
gedcom_n);
}
}
@@
-81,7
+81,7
@@
char* get_encoding(char* gedcom_n, ENCODING enc)
datum = tfind(&search_node, &encoding_mapping, node_compare);
free(buffer);
if (datum == NULL) {
datum = tfind(&search_node, &encoding_mapping, node_compare);
free(buffer);
if (datum == NULL) {
- gedcom_error(
"No encoding found for '%s'"
, gedcom_n);
+ gedcom_error(
_("No encoding found for '%s'")
, gedcom_n);
return NULL;
}
else {
return NULL;
}
else {
@@
-118,7
+118,7
@@
void init_encodings()
GCONV_SEARCH_PATH, gconv_path, PKGDATADIR);
}
if (putenv(new_gconv_path) != 0) {
GCONV_SEARCH_PATH, gconv_path, PKGDATADIR);
}
if (putenv(new_gconv_path) != 0) {
- gedcom_warning(
"Failed updating environment variable %s"
,
+ gedcom_warning(
_("Failed updating environment variable %s")
,
GCONV_SEARCH_PATH);
}
}
GCONV_SEARCH_PATH);
}
}
@@
-131,13
+131,13
@@
void init_encodings()
in = fopen(path, "r");
}
if (in == NULL) {
in = fopen(path, "r");
}
if (in == NULL) {
- gedcom_warning(
"Could not open encoding configuration file '%s'"
,
+ gedcom_warning(
_("Could not open encoding configuration file '%s'")
,
ENCODING_CONF_FILE);
}
else {
while (fgets(buffer, sizeof(buffer), in) != NULL) {
if (buffer[strlen(buffer) - 1] != '\n') {
ENCODING_CONF_FILE);
}
else {
while (fgets(buffer, sizeof(buffer), in) != NULL) {
if (buffer[strlen(buffer) - 1] != '\n') {
- gedcom_error(
"Line too long in encoding configuration file '%s'"
,
+ gedcom_error(
_("Line too long in encoding configuration file '%s'")
,
ENCODING_CONF_FILE);
return;
}
ENCODING_CONF_FILE);
return;
}
@@
-146,7
+146,7
@@
void init_encodings()
add_encoding(gedcom_n, charwidth, iconv_n);
}
else {
add_encoding(gedcom_n, charwidth, iconv_n);
}
else {
- gedcom_error(
"Missing data in encoding configuration file '%s'"
,
+ gedcom_error(
_("Missing data in encoding configuration file '%s'")
,
ENCODING_CONF_FILE);
return;
}
ENCODING_CONF_FILE);
return;
}
@@
-178,7
+178,7
@@
int open_conv_to_internal(char* fromcode)
conv_buf_size = 0;
cd_to_internal = iconv_open(INTERNAL_ENCODING, encoding);
if (cd_to_internal == (iconv_t) -1) {
conv_buf_size = 0;
cd_to_internal = iconv_open(INTERNAL_ENCODING, encoding);
if (cd_to_internal == (iconv_t) -1) {
- gedcom_error(
"Error opening conversion context for encoding %s: %s"
,
+ gedcom_error(
_("Error opening conversion context for encoding %s: %s")
,
encoding, strerror(errno));
}
}
encoding, strerror(errno));
}
}
diff --git
a/gedcom/gedcom.y
b/gedcom/gedcom.y
index 3765b7b25090f090bebba66c6f641ebec5a3f350..dbef9e505cd1f54359c4270c6c446316fe10cb75 100644
(file)
--- a/
gedcom/gedcom.y
+++ b/
gedcom/gedcom.y
@@
-197,7
+197,7
@@
int compat_mode(int flags);
#define CHK(TAG) \
{ if (!check_occurrence(TAG_##TAG)) { \
char* parenttag = get_parenttag(); \
#define CHK(TAG) \
{ if (!check_occurrence(TAG_##TAG)) { \
char* parenttag = get_parenttag(); \
- gedcom_error(
"The tag '%s' is mandatory within '%s', but missing",
\
+ gedcom_error(
_("The tag '%s' is mandatory within '%s', but missing"),
\
#TAG, parenttag); \
HANDLE_ERROR; \
} \
#TAG, parenttag); \
HANDLE_ERROR; \
} \
@@
-219,20
+219,19
@@
int compat_mode(int flags);
{ int num = count_tag(TAG_##CHILDTAG); \
if (num > MAX) { \
char* parenttag = get_parenttag(); \
{ int num = count_tag(TAG_##CHILDTAG); \
if (num > MAX) { \
char* parenttag = get_parenttag(); \
- gedcom_error("The tag '%s' can maximally occur %d " \
- "time(s) within '%s'", \
+ gedcom_error(_("The tag '%s' can maximally occur %d time(s) within '%s'"), \
#CHILDTAG, MAX, parenttag); \
HANDLE_ERROR; \
} \
}
#define INVALID_TAG(CHILDTAG) \
{ char* parenttag = get_parenttag(); \
#CHILDTAG, MAX, parenttag); \
HANDLE_ERROR; \
} \
}
#define INVALID_TAG(CHILDTAG) \
{ char* parenttag = get_parenttag(); \
- gedcom_error(
"The tag '%s' is not a valid tag within '%s'",
\
+ gedcom_error(
_("The tag '%s' is not a valid tag within '%s'"),
\
CHILDTAG, parenttag); \
HANDLE_ERROR; \
}
#define INVALID_TOP_TAG(CHILDTAG) \
CHILDTAG, parenttag); \
HANDLE_ERROR; \
}
#define INVALID_TOP_TAG(CHILDTAG) \
- { gedcom_error(
"The tag '%s' is not a valid top-level tag",
\
+ { gedcom_error(
_("The tag '%s' is not a valid top-level tag"),
\
CHILDTAG); \
HANDLE_ERROR; \
}
CHILDTAG); \
HANDLE_ERROR; \
}
@@
-1044,12
+1043,11
@@
note_rec : OPEN DELIM POINTER DELIM TAG_NOTE note_line_item
note_line_item : /* empty */
{ if (!compat_mode(C_FTREE)) {
note_line_item : /* empty */
{ if (!compat_mode(C_FTREE)) {
- gedcom_error(
"Missing value"
); YYERROR;
+ gedcom_error(
_("Missing value")
); YYERROR;
}
}
| DELIM line_item
}
}
| DELIM line_item
- { gedcom_debug_print("==Val: %s==\n", $2);
- $$ = $2; }
+ { $$ = $2; }
;
note_subs : /* empty */
;
note_subs : /* empty */
@@
-2265,7
+2263,7
@@
no_std_rec : user_rec /* 0:M */
user_rec : OPEN DELIM opt_xref USERTAG
{ if ($4[0] != '_') {
user_rec : OPEN DELIM opt_xref USERTAG
{ if ($4[0] != '_') {
- gedcom_error(
"Undefined tag (and not a valid user tag): %s"
,
+ gedcom_error(
_("Undefined tag (and not a valid user tag): %s")
,
$4);
YYERROR;
}
$4);
YYERROR;
}
@@
-2281,7
+2279,7
@@
user_rec : OPEN DELIM opt_xref USERTAG
;
user_sect : OPEN DELIM opt_xref USERTAG
{ if ($4[0] != '_') {
;
user_sect : OPEN DELIM opt_xref USERTAG
{ if ($4[0] != '_') {
- gedcom_error(
"Undefined tag (and not a valid user tag): %s"
,
+ gedcom_error(
_("Undefined tag (and not a valid user tag): %s")
,
$4);
YYERROR;
}
$4);
YYERROR;
}
@@
-2313,14
+2311,12
@@
line_value : POINTER { $$ = $1; }
| line_item { $$ = $1; }
;
| line_item { $$ = $1; }
;
-mand_pointer : /* empty */ { gedcom_error("Missing pointer"); YYERROR; }
- | DELIM POINTER { gedcom_debug_print("==Ptr: %s==\n", $2);
- $$ = $2; }
+mand_pointer : /* empty */ { gedcom_error(_("Missing pointer")); YYERROR; }
+ | DELIM POINTER { $$ = $2; }
;
;
-mand_line_item : /* empty */ { gedcom_error("Missing value"); YYERROR; }
- | DELIM line_item { gedcom_debug_print("==Val: %s==\n", $2);
- $$ = $2; }
+mand_line_item : /* empty */ { gedcom_error(_("Missing value")); YYERROR; }
+ | DELIM line_item { $$ = $2; }
;
opt_line_item : /* empty */ { }
;
opt_line_item : /* empty */ { }
@@
-2386,7
+2382,7
@@
gen_rec_norm : OPEN DELIM opt_xref anystdtag
;
gen_rec_top : OPEN DELIM anytoptag
;
gen_rec_top : OPEN DELIM anytoptag
- { gedcom_error(
"Missing cross-reference"
); YYERROR; }
+ { gedcom_error(
_("Missing cross-reference")
); YYERROR; }
opt_value opt_sects CLOSE
{ }
;
opt_value opt_sects CLOSE
{ }
;
@@
-2549,13
+2545,13
@@
void push_countarray()
{
int *count = NULL;
if (count_level > MAXGEDCLEVEL) {
{
int *count = NULL;
if (count_level > MAXGEDCLEVEL) {
- gedcom_error(
"Internal error: count array overflow"
);
+ gedcom_error(
_("Internal error: count array overflow")
);
exit(1);
}
else {
count = (int *)calloc(YYNTOKENS, sizeof(int));
if (count == NULL) {
exit(1);
}
else {
count = (int *)calloc(YYNTOKENS, sizeof(int));
if (count == NULL) {
- gedcom_error(
"Internal error: count array calloc error"
);
+ gedcom_error(
_("Internal error: count array calloc error")
);
exit(1);
}
else {
exit(1);
}
else {
@@
-2600,7
+2596,7
@@
void pop_countarray()
{
int *count;
if (count_level < 0) {
{
int *count;
if (count_level < 0) {
- gedcom_error(
"Internal error: count array underflow"
);
+ gedcom_error(
_("Internal error: count array underflow")
);
exit(1);
}
else {
exit(1);
}
else {
@@
-2660,9
+2656,8
@@
void gedcom_set_compat_handling(int enable_compat)
void set_compatibility(char* program)
{
if (compat_enabled) {
void set_compatibility(char* program)
{
if (compat_enabled) {
- gedcom_debug_print("==== Program: %s\n", program);
if (! strncmp(program, "ftree", 6)) {
if (! strncmp(program, "ftree", 6)) {
- gedcom_warning(
"Enabling compatibility with 'ftree'"
);
+ gedcom_warning(
_("Enabling compatibility with 'ftree'")
);
compatibility = C_FTREE;
}
else {
compatibility = C_FTREE;
}
else {
diff --git
a/gedcom/gedcom_lex_common.c
b/gedcom/gedcom_lex_common.c
index d528b02cbe83bf6e3086df8e4f2d3539928439c5..93c26f3bf6197f4e772f80b154b3d1297dd9f33d 100644
(file)
--- a/
gedcom/gedcom_lex_common.c
+++ b/
gedcom/gedcom_lex_common.c
@@
-97,7
+97,7
@@
int test_loop(ENCODING enc, char* code)
{ if (line_len != (size_t)-1) { \
line_len += strlen(yytext); \
if (line_len > MAXGEDCLINELEN * encoding_width) { \
{ if (line_len != (size_t)-1) { \
line_len += strlen(yytext); \
if (line_len > MAXGEDCLINELEN * encoding_width) { \
- gedcom_error(
"Line too long, max %d characters",
\
+ gedcom_error(
_("Line too long, max %d characters"),
\
MAXGEDCLINELEN); \
line_len = (size_t)-1; \
return BADTOKEN; \
MAXGEDCLINELEN); \
line_len = (size_t)-1; \
return BADTOKEN; \
@@
-170,7
+170,7
@@
int test_loop(ENCODING enc, char* code)
#define ACTION_0_DIGITS \
#define ACTION_0_DIGITS \
- { gedcom_error (
"Level number with leading zero");
\
+ { gedcom_error (
_("Level number with leading zero"));
\
return BADTOKEN; \
}
return BADTOKEN; \
}
@@
-179,7
+179,7
@@
int test_loop(ENCODING enc, char* code)
{ int level = atoi(TO_INTERNAL(yytext, str_buf)); \
CHECK_LINE_LEN; \
if ((level < 0) || (level > MAXGEDCLEVEL)) { \
{ int level = atoi(TO_INTERNAL(yytext, str_buf)); \
CHECK_LINE_LEN; \
if ((level < 0) || (level > MAXGEDCLEVEL)) { \
- gedcom_error (
"Level number out of range [0..%d]",
\
+ gedcom_error (
_("Level number out of range [0..%d]"),
\
MAXGEDCLEVEL); \
return BADTOKEN; \
} \
MAXGEDCLEVEL); \
return BADTOKEN; \
} \
@@
-197,8
+197,7
@@
int test_loop(ENCODING enc, char* code)
} \
else { \
/* should never happen (error to GEDCOM spec) */ \
} \
else { \
/* should never happen (error to GEDCOM spec) */ \
- gedcom_error ("GEDCOM level number is %d higher than " \
- "previous", \
+ gedcom_error (_("GEDCOM level number is %d higher than previous"), \
level_diff); \
return BADTOKEN; \
} \
level_diff); \
return BADTOKEN; \
} \
@@
-207,7
+206,7
@@
int test_loop(ENCODING enc, char* code)
#define ACTION_ALPHANUM \
{ if (strlen(yytext) > MAXGEDCTAGLEN * encoding_width) { \
#define ACTION_ALPHANUM \
{ if (strlen(yytext) > MAXGEDCTAGLEN * encoding_width) { \
- gedcom_error(
"Tag '%s' too long, max %d characters",
\
+ gedcom_error(
_("Tag '%s' too long, max %d characters"),
\
yytext, MAXGEDCTAGLEN); \
return BADTOKEN; \
} \
yytext, MAXGEDCTAGLEN); \
return BADTOKEN; \
} \
@@
-249,7
+248,7
@@
int test_loop(ENCODING enc, char* code)
#define ACTION_POINTER \
{ CHECK_LINE_LEN; \
if (strlen(yytext) > MAXGEDCPTRLEN * encoding_width) { \
#define ACTION_POINTER \
{ CHECK_LINE_LEN; \
if (strlen(yytext) > MAXGEDCPTRLEN * encoding_width) { \
- gedcom_error(
"Pointer '%s' too long, max %d characters",
\
+ gedcom_error(
_("Pointer '%s' too long, max %d characters"),
\
yytext, MAXGEDCPTRLEN); \
return BADTOKEN; \
} \
yytext, MAXGEDCPTRLEN); \
return BADTOKEN; \
} \
@@
-293,7
+292,7
@@
int test_loop(ENCODING enc, char* code)
#define ACTION_UNEXPECTED \
#define ACTION_UNEXPECTED \
- { gedcom_error(
"Unexpected character: '%s' (0x%02x)",
\
+ { gedcom_error(
_("Unexpected character: '%s' (0x%02x)"),
\
yytext, yytext[0]); \
return BADTOKEN; \
}
yytext, yytext[0]); \
return BADTOKEN; \
}
diff --git
a/gedcom/message.c
b/gedcom/message.c
index f2f41301d17a5093b17d992076edb2e57f181ccb..49e91e5ad1c19102cfab8b7a3e92bd8bbd347506 100644
(file)
--- a/
gedcom/message.c
+++ b/
gedcom/message.c
@@
-106,7
+106,7
@@
int gedcom_warning(char* s, ...)
va_list ap;
reset_mess_buffer();
va_list ap;
reset_mess_buffer();
- safe_buf_append(
"Warning on line %d: "
, line_no);
+ safe_buf_append(
_("Warning on line %d: ")
, line_no);
va_start(ap, s);
res = safe_buf_vappend(s, ap);
va_end(ap);
va_start(ap, s);
res = safe_buf_vappend(s, ap);
va_end(ap);
@@
-123,7
+123,7
@@
int gedcom_error(char* s, ...)
va_list ap;
reset_mess_buffer();
va_list ap;
reset_mess_buffer();
- safe_buf_append(
"Error on line %d: "
, line_no);
+ safe_buf_append(
_("Error on line %d: ")
, line_no);
va_start(ap, s);
res = safe_buf_vappend(s, ap);
va_end(ap);
va_start(ap, s);
res = safe_buf_vappend(s, ap);
va_end(ap);
diff --git
a/po/POTFILES.in
b/po/POTFILES.in
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..01e55bea905ac7b8e7075aa7e5dc1919118664cb 100644
(file)
--- a/
po/POTFILES.in
+++ b/
po/POTFILES.in
@@
-0,0
+1,4
@@
+gedcom/encoding.c
+gedcom/gedcom.y
+gedcom/gedcom_lex_common.c
+gedcom/multilex.c