From b765ea1918044806b43dfe0e739ea921421df5c9 Mon Sep 17 00:00:00 2001 From: Robin Stuart Date: Sat, 21 Nov 2020 17:05:10 +0000 Subject: [PATCH] Link libzint to i18n And now it works! --- backend/library.c | 16 +++++++++++++ backend/po/libzint.pot | 46 ++++++++++++++++++------------------- backend/po/ru/libzint.po | 49 ++++++++++++++++++++-------------------- 3 files changed, 64 insertions(+), 47 deletions(-) diff --git a/backend/library.c b/backend/library.c index 31f7a694..4f9337d0 100644 --- a/backend/library.c +++ b/backend/library.c @@ -1071,6 +1071,12 @@ static int escape_char_process(struct zint_symbol *symbol, unsigned char *input_ return error_number; } +void set_i18n() { + setlocale (LC_ALL, ""); + bindtextdomain ("libzint", "/usr/share/locale/"); + textdomain ("libzint"); +} + int ZBarcode_Encode(struct zint_symbol *symbol, const unsigned char *source, int in_length) { int error_number, error_buffer; #ifdef _MSC_VER @@ -1079,6 +1085,8 @@ int ZBarcode_Encode(struct zint_symbol *symbol, const unsigned char *source, int if (!symbol) return ZINT_ERROR_INVALID_DATA; + set_i18n(); + error_number = 0; if (source == NULL) { @@ -1354,6 +1362,8 @@ int ZBarcode_Print(struct zint_symbol *symbol, int rotate_angle) { int error_number; if (!symbol) return ZINT_ERROR_INVALID_DATA; + + set_i18n(); switch (rotate_angle) { case 0: @@ -1447,6 +1457,8 @@ int ZBarcode_Buffer(struct zint_symbol *symbol, int rotate_angle) { int error_number; if (!symbol) return ZINT_ERROR_INVALID_DATA; + + set_i18n(); switch (rotate_angle) { case 0: @@ -1479,6 +1491,8 @@ int ZBarcode_Buffer_Vector(struct zint_symbol *symbol, int rotate_angle) { int error_number; if (!symbol) return ZINT_ERROR_INVALID_DATA; + + set_i18n(); switch (rotate_angle) { case 0: @@ -1569,6 +1583,8 @@ int ZBarcode_Encode_File(struct zint_symbol *symbol, char *filename) { int ret; if (!symbol) return ZINT_ERROR_INVALID_DATA; + + set_i18n(); if (!filename) { symbol->err_origin = 239; diff --git a/backend/po/libzint.pot b/backend/po/libzint.pot index d971a454..8a803c74 100644 --- a/backend/po/libzint.pot +++ b/backend/po/libzint.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libzint 2.9\n" "Report-Msgid-Bugs-To: rstuart114@gmail.com\n" -"POT-Creation-Date: 2020-11-20 19:56+0000\n" +"POT-Creation-Date: 2020-11-21 16:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: library.c:1306 +#: library.c:1314 msgid " in 2D component" msgstr "" @@ -42,7 +42,7 @@ msgstr "" msgid "Can't open output file" msgstr "" -#: library.c:1135 +#: library.c:1143 msgid "Codabar 18 not supported" msgstr "" @@ -106,7 +106,7 @@ msgstr "" msgid "Empty data field in input data" msgstr "" -#: library.c:1335 +#: library.c:1343 msgid "Encoded data includes ECI" msgstr "" @@ -135,7 +135,7 @@ msgstr "" msgid "Extended ASCII characters are not supported by GS1" msgstr "" -#: library.c:1575 +#: library.c:1591 msgid "Filename NULL" msgstr "" @@ -143,7 +143,7 @@ msgstr "" msgid "Found nested brackets in input data" msgstr "" -#: library.c:1160 +#: library.c:1168 msgid "General Parcel Code not supported" msgstr "" @@ -163,20 +163,20 @@ msgstr "" msgid "Incorrect SBN check" msgstr "" -#: library.c:1086 +#: library.c:1094 msgid "Input data NULL" msgstr "" -#: library.c:1607 +#: library.c:1623 msgid "Input file empty or unseekable" msgstr "" -#: library.c:1632 +#: library.c:1648 #, c-format msgid "Input file read error (%.30s)" msgstr "" -#: library.c:1600 +#: library.c:1616 msgid "Input file too long" msgstr "" @@ -251,7 +251,7 @@ msgstr "" msgid "Insufficient memory for pixel buffer" msgstr "" -#: library.c:1618 +#: library.c:1634 msgid "Internal memory error" msgstr "" @@ -287,7 +287,7 @@ msgstr "" msgid "Invalid DPD identifier" msgstr "" -#: dotcode.c:1329 library.c:1257 pdf417.c:568 pdf417.c:907 gridmtx.c:976 +#: dotcode.c:1329 library.c:1265 pdf417.c:568 pdf417.c:907 gridmtx.c:976 msgid "Invalid ECI" msgstr "" @@ -361,7 +361,7 @@ msgstr "" msgid "Invalid data length for AI " msgstr "" -#: library.c:1264 +#: library.c:1272 msgid "Invalid dot size" msgstr "" @@ -397,7 +397,7 @@ msgstr "" msgid "Invalid rMQR symbol size" msgstr "" -#: library.c:1366 library.c:1459 library.c:1491 +#: library.c:1376 library.c:1471 library.c:1505 msgid "Invalid rotation angle" msgstr "" @@ -421,7 +421,7 @@ msgstr "" msgid "NUL characters not permitted in GS1 mode" msgstr "" -#: library.c:1095 +#: library.c:1103 msgid "No input data" msgstr "" @@ -457,11 +457,11 @@ msgstr "" msgid "Security value out of range" msgstr "" -#: library.c:1374 library.c:1467 library.c:1499 +#: library.c:1384 library.c:1479 library.c:1513 msgid "Selected symbology cannot be rendered as dots" msgstr "" -#: library.c:1316 +#: library.c:1324 msgid "Selected symbology does not support GS1 mode" msgstr "" @@ -477,16 +477,16 @@ msgstr "" msgid "Specified width out of range" msgstr "" -#: library.c:1253 +#: library.c:1261 msgid "Symbology does not support ECI switching" msgstr "" -#: library.c:1117 library.c:1181 library.c:1190 library.c:1213 library.c:1225 -#: library.c:1236 +#: library.c:1125 library.c:1189 library.c:1198 library.c:1221 library.c:1233 +#: library.c:1244 msgid "Symbology out of range" msgstr "" -#: library.c:1146 +#: library.c:1154 msgid "UPCD1 not supported" msgstr "" @@ -494,7 +494,7 @@ msgstr "" msgid "UPNQR does not support GS-1 encoding" msgstr "" -#: library.c:1587 +#: library.c:1603 #, c-format msgid "Unable to read input file (%.30s)" msgstr "" @@ -503,7 +503,7 @@ msgstr "" msgid "Unicode sequences of more than 3 bytes not supported" msgstr "" -#: library.c:1431 library.c:1437 +#: library.c:1441 library.c:1447 msgid "Unknown output format" msgstr "" diff --git a/backend/po/ru/libzint.po b/backend/po/ru/libzint.po index 5b29b36a..901caa60 100644 --- a/backend/po/ru/libzint.po +++ b/backend/po/ru/libzint.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libzint 2.9\n" "Report-Msgid-Bugs-To: rstuart114@gmail.com\n" -"POT-Creation-Date: 2020-11-20 19:05+0000\n" +"POT-Creation-Date: 2020-11-21 16:40+0000\n" "PO-Revision-Date: 2020-11-20 19:10+0000\n" "Last-Translator: Василий Павлов \n" "Language-Team: Russian\n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: library.c:1306 +#: library.c:1314 msgid " in 2D component" msgstr "" @@ -43,7 +43,7 @@ msgstr "" msgid "Can't open output file" msgstr "Не могу открыть выходной файл" -#: library.c:1135 +#: library.c:1143 msgid "Codabar 18 not supported" msgstr "" @@ -107,7 +107,7 @@ msgstr "" msgid "Empty data field in input data" msgstr "" -#: library.c:1335 +#: library.c:1343 msgid "Encoded data includes ECI" msgstr "" @@ -136,7 +136,7 @@ msgstr "Уровень исправления ошибок Q недоступе msgid "Extended ASCII characters are not supported by GS1" msgstr "Расширенная таблица символов ASCII не поддерживается GS1" -#: library.c:1575 +#: library.c:1591 msgid "Filename NULL" msgstr "" @@ -144,7 +144,7 @@ msgstr "" msgid "Found nested brackets in input data" msgstr "" -#: library.c:1160 +#: library.c:1168 msgid "General Parcel Code not supported" msgstr "" @@ -164,20 +164,20 @@ msgstr "Неверная проверка ISBN" msgid "Incorrect SBN check" msgstr "Неверная проверка SBN" -#: library.c:1086 +#: library.c:1094 msgid "Input data NULL" msgstr "" -#: library.c:1607 +#: library.c:1623 msgid "Input file empty or unseekable" msgstr "" -#: library.c:1632 +#: library.c:1648 #, c-format msgid "Input file read error (%.30s)" msgstr "" -#: library.c:1600 +#: library.c:1616 msgid "Input file too long" msgstr "" @@ -220,7 +220,8 @@ msgstr "Слишком длинный ввод для выбранного ра #: aztec.c:1017 msgid "Input too long or too many extended ASCII characters" -msgstr "Выходные данные слишком длинные или слишком много расширенных символов ASCII" +msgstr "" +"Выходные данные слишком длинные или слишком много расширенных символов ASCII" #: medical.c:220 msgid "Input too short" @@ -252,7 +253,7 @@ msgstr "" msgid "Insufficient memory for pixel buffer" msgstr "Недостаточно памяти для пиксельного буфера" -#: library.c:1618 +#: library.c:1634 msgid "Internal memory error" msgstr "" @@ -288,7 +289,7 @@ msgstr "" msgid "Invalid DPD identifier" msgstr "" -#: dotcode.c:1329 library.c:1257 pdf417.c:568 pdf417.c:907 gridmtx.c:976 +#: dotcode.c:1329 library.c:1265 pdf417.c:568 pdf417.c:907 gridmtx.c:976 msgid "Invalid ECI" msgstr "" @@ -362,7 +363,7 @@ msgstr "" msgid "Invalid data length for AI " msgstr "" -#: library.c:1264 +#: library.c:1272 msgid "Invalid dot size" msgstr "Недопустимый размер точек" @@ -398,7 +399,7 @@ msgstr "" msgid "Invalid rMQR symbol size" msgstr "" -#: library.c:1366 library.c:1459 library.c:1491 +#: library.c:1376 library.c:1471 library.c:1505 msgid "Invalid rotation angle" msgstr "Недопустимый угол поворота" @@ -422,7 +423,7 @@ msgstr "Плохо сформированный целевой цвет" msgid "NUL characters not permitted in GS1 mode" msgstr "NULL-символы не разрешены в режиме GS1" -#: library.c:1095 +#: library.c:1103 msgid "No input data" msgstr "" @@ -458,11 +459,11 @@ msgstr "" msgid "Security value out of range" msgstr "" -#: library.c:1374 library.c:1467 library.c:1499 +#: library.c:1384 library.c:1479 library.c:1513 msgid "Selected symbology cannot be rendered as dots" msgstr "" -#: library.c:1316 +#: library.c:1324 msgid "Selected symbology does not support GS1 mode" msgstr "" @@ -478,16 +479,16 @@ msgstr "" msgid "Specified width out of range" msgstr "" -#: library.c:1253 +#: library.c:1261 msgid "Symbology does not support ECI switching" msgstr "" -#: library.c:1117 library.c:1181 library.c:1190 library.c:1213 library.c:1225 -#: library.c:1236 +#: library.c:1125 library.c:1189 library.c:1198 library.c:1221 library.c:1233 +#: library.c:1244 msgid "Symbology out of range" msgstr "Символика вне диапазона" -#: library.c:1146 +#: library.c:1154 msgid "UPCD1 not supported" msgstr "UPCD1 не поддерживается" @@ -495,7 +496,7 @@ msgstr "UPCD1 не поддерживается" msgid "UPNQR does not support GS-1 encoding" msgstr "UPNQR не поддерживает кодирование GS-1" -#: library.c:1587 +#: library.c:1603 #, c-format msgid "Unable to read input file (%.30s)" msgstr "" @@ -504,7 +505,7 @@ msgstr "" msgid "Unicode sequences of more than 3 bytes not supported" msgstr "Unicode-последовательности более 3-х байтов не поддерживаются" -#: library.c:1431 library.c:1437 +#: library.c:1441 library.c:1447 msgid "Unknown output format" msgstr ""