mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-06-06 01:21:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

Further clean up of error messages

Browse source
This commit is contained in:
Robin Stuart 2020-11-08 08:32:05 +00:00
parent 8f6f8b2cf5
commit 9ca8bc3bc0
8 changed files with 47 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/aztec.c
View file

@ -1285,7 +1285,7 @@ INTERNAL int aztec(struct zint_symbol *symbol, unsigned char source[], const siz
if (adjusted_length > data_maxsize) { if (adjusted_length > data_maxsize) {
symbol->err_origin = 505; symbol->err_origin = 505;
strcpy(symbol->errtxt, _("Data too long for specified Aztec Code symbol size")); strcpy(symbol->errtxt, _("Input too long for selected symbol size"));
return ZINT_ERROR_TOO_LONG; return ZINT_ERROR_TOO_LONG;
} }

2
backend/composite.c
View file

@ -1400,7 +1400,7 @@ INTERNAL int composite(struct zint_symbol *symbol, unsigned char source[], int l
if (length > 2990) { if (length > 2990) {
symbol->err_origin = 446; symbol->err_origin = 446;
strcpy(symbol->errtxt, _("2D component input data too long")); strcpy(symbol->errtxt, _("Input too long for selected 2D component"));
return ZINT_ERROR_TOO_LONG; return ZINT_ERROR_TOO_LONG;
} }

4
backend/library.c
View file

@ -192,9 +192,9 @@ static void error_tag(char error_string[], int error_number, int err_origin) {
strcpy(error_buffer, error_string); strcpy(error_buffer, error_string);
if (error_number >= ZINT_ERROR) { if (error_number >= ZINT_ERROR) {
sprintf(error_string, "Error %d: ", err_origin); sprintf(error_string, _("Error %d: "), err_origin);
} else { } else {
sprintf(error_string, "Warning %d: ", err_origin); sprintf(error_string, _("Warning %d: "), err_origin);
} }
strcat(error_string, error_buffer); strcat(error_string, error_buffer);

6
backend/pdf417.c
View file

@ -980,7 +980,7 @@ INTERNAL int micro_pdf417(struct zint_symbol *symbol, unsigned char chaine[], in
if ((symbol->option_2 == 1) && (mclength > 20)) { if ((symbol->option_2 == 1) && (mclength > 20)) {
/* the user specified 1 column but the data doesn't fit - go to automatic */ /* the user specified 1 column but the data doesn't fit - go to automatic */
symbol->err_origin = 469; symbol->err_origin = 469;
strcpy(symbol->errtxt, _("Specified symbol size too small for data")); strcpy(symbol->errtxt, _("Input too long for selected symbol size"));
if (symbol->warn_level == WARN_FAIL_ALL) { if (symbol->warn_level == WARN_FAIL_ALL) {
return ZINT_ERROR_INVALID_OPTION; return ZINT_ERROR_INVALID_OPTION;
} else { } else {
@ -992,7 +992,7 @@ INTERNAL int micro_pdf417(struct zint_symbol *symbol, unsigned char chaine[], in
if ((symbol->option_2 == 2) && (mclength > 37)) { if ((symbol->option_2 == 2) && (mclength > 37)) {
/* the user specified 2 columns but the data doesn't fit - go to automatic */ /* the user specified 2 columns but the data doesn't fit - go to automatic */
symbol->err_origin = 470; symbol->err_origin = 470;
strcpy(symbol->errtxt, _("Specified symbol size too small for data")); strcpy(symbol->errtxt, _("Input too long for selected symbol size"));
if (symbol->warn_level == WARN_FAIL_ALL) { if (symbol->warn_level == WARN_FAIL_ALL) {
return ZINT_ERROR_INVALID_OPTION; return ZINT_ERROR_INVALID_OPTION;
} else { } else {
@ -1004,7 +1004,7 @@ INTERNAL int micro_pdf417(struct zint_symbol *symbol, unsigned char chaine[], in
if ((symbol->option_2 == 3) && (mclength > 82)) { if ((symbol->option_2 == 3) && (mclength > 82)) {
/* the user specified 3 columns but the data doesn't fit - go to automatic */ /* the user specified 3 columns but the data doesn't fit - go to automatic */
symbol->err_origin = 471; symbol->err_origin = 471;
strcpy(symbol->errtxt, _("Specified symbol size too small for data")); strcpy(symbol->errtxt, _("Input too long for selected symbol size"));
if (symbol->warn_level == WARN_FAIL_ALL) { if (symbol->warn_level == WARN_FAIL_ALL) {
return ZINT_ERROR_INVALID_OPTION; return ZINT_ERROR_INVALID_OPTION;
} else { } else {

4
backend/png.c
View file

@ -58,14 +58,14 @@ struct mainprog_info_type {
static void writepng_error_handler(png_structp png_ptr, png_const_charp msg) { static void writepng_error_handler(png_structp png_ptr, png_const_charp msg) {
struct mainprog_info_type *graphic; struct mainprog_info_type *graphic;
fprintf(stderr, _("writepng libpng error: %s (F30)\n"), msg); fprintf(stderr, _("libpng error: %s\n"), msg);
fflush(stderr); fflush(stderr);
graphic = (struct mainprog_info_type*) png_get_error_ptr(png_ptr); graphic = (struct mainprog_info_type*) png_get_error_ptr(png_ptr);
if (graphic == NULL) { if (graphic == NULL) {
/* we are completely hosed now */ /* we are completely hosed now */
fprintf(stderr, fprintf(stderr,
_("writepng severe error: jmpbuf not recoverable; terminating. (F31)\n")); _("libpng error: jmpbuf not recoverable; terminating\n"));
fflush(stderr); fflush(stderr);
return; return;
} }

43
backend/po/libzint.pot
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: LIBZINT 2.9.1\n" "Project-Id-Version: libzint 2.9.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-11-07 19:17+0000\n" "POT-Creation-Date: 2020-11-08 08:26+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -25,10 +25,6 @@ msgstr ""
msgid " in linear component" msgid " in linear component"
msgstr "" msgstr ""
#: composite.c:1403
msgid "2D component input data too long"
msgstr ""
#: upcean.c:964 #: upcean.c:964
msgid "Add-on input wrong length" msgid "Add-on input wrong length"
msgstr "" msgstr ""
@ -90,14 +86,6 @@ msgstr ""
msgid "Data too long for reader initialisation symbol" msgid "Data too long for reader initialisation symbol"
msgstr "" msgstr ""
#: ultra.c:940
msgid "Data too long for selected error correction capacity"
msgstr ""
#: aztec.c:1288
msgid "Data too long for specified Aztec Code symbol size"
msgstr ""
#: pdf417.c:653 #: pdf417.c:653
msgid "Data too long for specified number of columns" msgid "Data too long for specified number of columns"
msgstr "" msgstr ""
@ -122,6 +110,11 @@ msgstr ""
msgid "Encoded data includes ECI" msgid "Encoded data includes ECI"
msgstr "" msgstr ""
#: library.c:195
#, c-format
msgid "Error %d: "
msgstr ""
#: qr.c:2380 #: qr.c:2380
msgid "Error correction level H not available" msgid "Error correction level H not available"
msgstr "" msgstr ""
@ -210,16 +203,17 @@ msgstr ""
msgid "Input too long" msgid "Input too long"
msgstr "" msgstr ""
#: composite.c:1281 composite.c:1324 #: composite.c:1281 composite.c:1324 composite.c:1403
msgid "Input too long for selected 2D component" msgid "Input too long for selected 2D component"
msgstr "" msgstr ""
#: aztec.c:1116 hanxin.c:1484 qr.c:1596 qr.c:2949 #: aztec.c:1116 hanxin.c:1484 qr.c:1596 qr.c:2949 ultra.c:940
msgid "Input too long for selected error correction level" msgid "Input too long for selected error correction level"
msgstr "" msgstr ""
#: code1.c:1439 dmatrix.c:1242 gridmtx.c:1010 hanxin.c:1498 qr.c:1685 qr.c:2510 #: aztec.c:1288 pdf417.c:983 pdf417.c:995 pdf417.c:1007 code1.c:1439
#: qr.c:2716 qr.c:3030 #: dmatrix.c:1242 gridmtx.c:1010 hanxin.c:1498 qr.c:1685 qr.c:2510 qr.c:2716
#: qr.c:3030
msgid "Input too long for selected symbol size" msgid "Input too long for selected symbol size"
msgstr "" msgstr ""
@ -479,10 +473,6 @@ msgstr ""
msgid "Specified symbol size is too large" msgid "Specified symbol size is too large"
msgstr "" msgstr ""
#: pdf417.c:983 pdf417.c:995 pdf417.c:1007
msgid "Specified symbol size too small for data"
msgstr ""
#: pdf417.c:959 #: pdf417.c:959
msgid "Specified width out of range" msgid "Specified width out of range"
msgstr "" msgstr ""
@ -533,16 +523,21 @@ msgstr ""
msgid "Version M1 supports error correction level L only" msgid "Version M1 supports error correction level L only"
msgstr "" msgstr ""
#: library.c:197
#, c-format
msgid "Warning %d: "
msgstr ""
#: png.c:175 #: png.c:175
msgid "libpng error occurred" msgid "libpng error occurred"
msgstr "" msgstr ""
#: png.c:61 #: png.c:61
#, c-format #, c-format
msgid "writepng libpng error: %s (F30)\n" msgid "libpng error: %s\n"
msgstr "" msgstr ""
#: png.c:68 #: png.c:68
#, c-format #, c-format
msgid "writepng severe error: jmpbuf not recoverable; terminating. (F31)\n" msgid "libpng error: jmpbuf not recoverable; terminating\n"
msgstr "" msgstr ""

41
backend/po/ru.po
View file

@ -6,7 +6,7 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: LIBZINT 2.9.1\n" "Project-Id-Version: libzint 2.9.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-11-07 21:47+0000\n" "POT-Creation-Date: 2020-11-07 21:47+0000\n"
"PO-Revision-Date: 2020-11-07 21:47+0000\n" "PO-Revision-Date: 2020-11-07 21:47+0000\n"
@ -25,10 +25,6 @@ msgstr ""
msgid " in linear component" msgid " in linear component"
msgstr "" msgstr ""
#: composite.c:1403
msgid "2D component input data too long"
msgstr ""
#: upcean.c:964 #: upcean.c:964
msgid "Add-on input wrong length" msgid "Add-on input wrong length"
msgstr "" msgstr ""
@ -90,14 +86,6 @@ msgstr ""
msgid "Data too long for reader initialisation symbol" msgid "Data too long for reader initialisation symbol"
msgstr "Данные слишком долго для читающего инициализирующего символа" msgstr "Данные слишком долго для читающего инициализирующего символа"
#: ultra.c:940
msgid "Data too long for selected error correction capacity"
msgstr ""
#: aztec.c:1288
msgid "Data too long for specified Aztec Code symbol size"
msgstr ""
#: pdf417.c:653 #: pdf417.c:653
msgid "Data too long for specified number of columns" msgid "Data too long for specified number of columns"
msgstr "" msgstr ""
@ -122,6 +110,11 @@ msgstr ""
msgid "Encoded data includes ECI" msgid "Encoded data includes ECI"
msgstr "" msgstr ""
#: library.c:195
#, c-format
msgid "Error %d: "
msgstr ""
#: qr.c:2380 #: qr.c:2380
msgid "Error correction level H not available" msgid "Error correction level H not available"
msgstr "Уровень исправления ошибок H недоступен" msgstr "Уровень исправления ошибок H недоступен"
@ -210,16 +203,17 @@ msgstr ""
msgid "Input too long" msgid "Input too long"
msgstr "Введено слишком много данных" msgstr "Введено слишком много данных"
#: composite.c:1281 composite.c:1324 #: composite.c:1281 composite.c:1324 composite.c:1403
msgid "Input too long for selected 2D component" msgid "Input too long for selected 2D component"
msgstr "Слишком много данных для выбранного 2d-компонента" msgstr "Слишком много данных для выбранного 2d-компонента"
#: aztec.c:1116 hanxin.c:1484 qr.c:1596 qr.c:2949 #: aztec.c:1116 hanxin.c:1484 qr.c:1596 qr.c:2949 ultra.c:940
msgid "Input too long for selected error correction level" msgid "Input too long for selected error correction level"
msgstr "Слишком длинный ввод для выбранного уровня коррекции ошибок" msgstr "Слишком длинный ввод для выбранного уровня коррекции ошибок"
#: code1.c:1439 dmatrix.c:1242 gridmtx.c:1010 hanxin.c:1498 qr.c:1685 qr.c:2510 #: aztec.c:1288 pdf417.c:983 pdf417.c:995 pdf417.c:1007 code1.c:1439
#: qr.c:2716 qr.c:3030 #: dmatrix.c:1242 gridmtx.c:1010 hanxin.c:1498 qr.c:1685 qr.c:2510 qr.c:2716
#: qr.c:3030
msgid "Input too long for selected symbol size" msgid "Input too long for selected symbol size"
msgstr "Слишком длинный ввод для выбранного размера символа" msgstr "Слишком длинный ввод для выбранного размера символа"
@ -479,10 +473,6 @@ msgstr ""
msgid "Specified symbol size is too large" msgid "Specified symbol size is too large"
msgstr "" msgstr ""
#: pdf417.c:983 pdf417.c:995 pdf417.c:1007
msgid "Specified symbol size too small for data"
msgstr ""
#: pdf417.c:959 #: pdf417.c:959
msgid "Specified width out of range" msgid "Specified width out of range"
msgstr "" msgstr ""
@ -533,16 +523,21 @@ msgstr ""
msgid "Version M1 supports error correction level L only" msgid "Version M1 supports error correction level L only"
msgstr "" msgstr ""
#: library.c:197
#, c-format
msgid "Warning %d: "
msgstr ""
#: png.c:175 #: png.c:175
msgid "libpng error occurred" msgid "libpng error occurred"
msgstr "" msgstr ""
#: png.c:61 #: png.c:61
#, c-format #, c-format
msgid "writepng libpng error: %s (F30)\n" msgid "libpng error: %s\n"
msgstr "" msgstr ""
#: png.c:68 #: png.c:68
#, c-format #, c-format
msgid "writepng severe error: jmpbuf not recoverable; terminating. (F31)\n" msgid "libpng error: jmpbuf not recoverable; terminating\n"
msgstr "" msgstr ""

2
backend/ultra.c
View file

@ -937,7 +937,7 @@ INTERNAL int ultracode(struct zint_symbol *symbol, const unsigned char source[],
total_cws = data_cw_count + qcc + 3; // 3 == TCC pattern + RSEC pattern + QCC pattern total_cws = data_cw_count + qcc + 3; // 3 == TCC pattern + RSEC pattern + QCC pattern
if (total_cws > 282) { if (total_cws > 282) {
symbol->err_origin = 591; symbol->err_origin = 591;
strcpy(symbol->errtxt, _("Data too long for selected error correction capacity")); strcpy(symbol->errtxt, _("Input too long for selected error correction level"));
return ZINT_ERROR_TOO_LONG; return ZINT_ERROR_TOO_LONG;
} }