stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed gettext translations not being registered & updated french translation

Browse source
This commit is contained in:
Snaipe 2015-08-05 13:13:25 +02:00
parent f4d727a2ef
commit de0a0857c7
4 changed files with 69 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -9,8 +9,8 @@ add_subdirectory(samples)
set(PROJECT_VERSION "1.3.1") set(PROJECT_VERSION "1.3.1")
set(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) set(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
set(GettextTranslate_ALL) set(GettextTranslate_ALL 1)
set(GettextTranslate_GMO_BINARY) set(GettextTranslate_GMO_BINARY 1)
set(MODULE_DIR "${CMAKE_SOURCE_DIR}/.cmake/Modules") set(MODULE_DIR "${CMAKE_SOURCE_DIR}/.cmake/Modules")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${MODULE_DIR}) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${MODULE_DIR})

4
po/Makevars
View file

@ -8,7 +8,7 @@ subdir = po
top_builddir = .. top_builddir = ..
# These options get passed to xgettext. # These options get passed to xgettext.
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=N_s:1,2 --keyword=_s:1,2
# This is the copyright holder that gets inserted into the header of the # This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
@ -41,7 +41,7 @@ PACKAGE_GNU = no
# It can be your email address, or a mailing list address where translators # It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through # can write to without being subscribed, or the URL of a web page through
# which the translators can contact you. # which the translators can contact you.
MSGID_BUGS_ADDRESS = MSGID_BUGS_ADDRESS = franklinmathieu+criterion@gmail.com
# This is the list of locale categories, beyond LC_MESSAGES, for which the # This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty. # message catalogs shall be used. It is usually empty.

60
po/fr.po
View file

@ -7,8 +7,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: criterion 1.0.0\n" "Project-Id-Version: criterion 1.0.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: franklinmathieu+criterion@gmail.com\n"
"POT-Creation-Date: 2015-07-28 22:17+0200\n" "POT-Creation-Date: 2015-08-05 11:37+0200\n"
"PO-Revision-Date: 2015-04-03 17:58+0200\n" "PO-Revision-Date: 2015-04-03 17:58+0200\n"
"Last-Translator: <franklinmathieu@gmail.com>\n" "Last-Translator: <franklinmathieu@gmail.com>\n"
"Language-Team: French\n" "Language-Team: French\n"
@ -18,58 +18,54 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: src/log/normal.c:38 #: src/log/normal.c:51
#, c-format #, c-format
msgid "Criterion v%s\n" msgid "Criterion v%s\n"
msgstr "Criterion v%s\n" msgstr "Criterion v%s\n"
#: src/log/normal.c:42 #: src/log/normal.c:52
#, c-format
msgid "%1$s::%2$s\n"
msgstr "%1$s::%2$s\n"
#: src/log/normal.c:47 src/log/normal.c:121
#, c-format #, c-format
msgid " %s\n" msgid " %s\n"
msgstr " %s\n" msgstr " %s\n"
#: src/log/normal.c:76 #: src/log/normal.c:55 src/log/normal.c:57
#, c-format
msgid "%1$s::%2$s\n"
msgstr "%1$s::%2$s\n"
#: src/log/normal.c:56
#, fuzzy, c-format
msgid "%1$s::%2$s: (%3$3.2fs)\n"
msgstr "%1$s::%2$s: (%3$3.2fs)\n"
#: src/log/normal.c:58
#, c-format #, c-format
msgid "%1$s::%2$s: Test is disabled\n" msgid "%1$s::%2$s: Test is disabled\n"
msgstr "%1$s::%2$s: Le test est désactivé\n" msgstr "%1$s::%2$s: Le test est désactivé\n"
#: src/log/normal.c:77 #: src/log/normal.c:59
#, c-format #, c-format
msgid "%1$s::%2$s: Suite is disabled\n" msgid "%1$s::%2$s: Suite is disabled\n"
msgstr "%1$s::%2$s: La suite est désactivée\n" msgstr "%1$s::%2$s: La suite est désactivée\n"
#: src/log/normal.c:94 #: src/log/normal.c:60
#, c-format
msgid ""
"%1$sSynthesis: Tested: %2$s%3$lu%4$s | Passing: %5$s%6$lu%7$s | Failing: %8$s"
"%9$lu%10$s | Crashing: %11$s%12$lu%13$s %14$s\n"
msgstr ""
"%1$sSynthèse: Testés: %2$s%3$lu%4$s | Validés: %5$s%6$lu%7$s | Échoués: %8$s"
"%9$lu%10$s | Plantages: %11$s%12$lu%13$s %14$s\n"
#: src/log/normal.c:115
#, c-format #, c-format
msgid "%1$s%2$s%3$s:%4$s%5$d%6$s: Assertion failed: %7$s\n" msgid "%1$s%2$s%3$s:%4$s%5$d%6$s: Assertion failed: %7$s\n"
msgstr "%1$s%2$s%3$s:%4$s%5$d%6$s: Échec d'assertion: %7$s\n" msgstr "%1$s%2$s%3$s:%4$s%5$d%6$s: Échec d'assertion: %7$s\n"
#: src/log/normal.c:128 #: src/log/normal.c:61
#, c-format #, c-format
msgid "%1$s%2$s%3$s:%4$s%5$u%6$s: Unexpected signal caught below this line!\n" msgid "%1$s%2$s%3$s:%4$s%5$u%6$s: Unexpected signal caught below this line!\n"
msgstr "" msgstr ""
"%1$s%2$s%3$s:%4$s%5$u%6$s: Un signal inattendu a été reçu après cette " "%1$s%2$s%3$s:%4$s%5$u%6$s: Un signal inattendu a été reçu après cette "
"ligne!\n" "ligne!\n"
#: src/log/normal.c:132 #: src/log/normal.c:62
#, c-format #, c-format
msgid "%1$s::%2$s: CRASH!\n" msgid "%1$s::%2$s: CRASH!\n"
msgstr "%1$s::%2$s: PLANTAGE!\n" msgstr "%1$s::%2$s: PLANTAGE!\n"
#: src/log/normal.c:139 #: src/log/normal.c:63
#, fuzzy, c-format #, fuzzy, c-format
msgid "" msgid ""
"%1$sWarning! The test `%2$s::%3$s` crashed during its setup or teardown." "%1$sWarning! The test `%2$s::%3$s` crashed during its setup or teardown."
@ -77,3 +73,19 @@ msgid ""
msgstr "" msgstr ""
"%1$sAttention! Le test `%2$s::%3$s` a planté pendant son initialisation ou " "%1$sAttention! Le test `%2$s::%3$s` a planté pendant son initialisation ou "
"sa finalisation.%4$s\n" "sa finalisation.%4$s\n"
#: src/log/normal.c:64
#, c-format
msgid "Running %1$s%2$lu%3$s test from %4$s%5$s%6$s:\n"
msgid_plural "Running %1$s%2$lu%3$s tests from %4$s%5$s%6$s:\n"
msgstr[0] "Lancement de %1$s%2$lu%3$s test dans %4$s%5$s%6$s:\n"
msgstr[1] "Lancement de %1$s%2$lu%3$s tests dans %4$s%5$s%6$s:\n"
#: src/log/normal.c:66
#, c-format
msgid ""
"%1$sSynthesis: Tested: %2$s%3$lu%4$s | Passing: %5$s%6$lu%7$s | Failing: %8$s"
"%9$lu%10$s | Crashing: %11$s%12$lu%13$s %14$s\n"
msgstr ""
"%1$sSynthèse: Testés: %2$s%3$lu%4$s | Validés: %5$s%6$lu%7$s | Échoués: %8$s"
"%9$lu%10$s | Plantages: %11$s%12$lu%13$s %14$s\n"

54
src/log/normal.c
View file

@ -44,26 +44,30 @@
typedef const char *const msg_t; typedef const char *const msg_t;
static msg_t msg_pre_all = "Criterion v%s\n"; // Used to mark string for gettext
static msg_t msg_desc = " %s\n"; # define N_(Str) Str
# define N_s(Str, Pl) {Str, Pl}
static msg_t msg_pre_all = N_("Criterion v%s\n");
static msg_t msg_desc = N_(" %s\n");
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
static msg_t msg_pre_init = "%1$s::%2$s\n"; static msg_t msg_pre_init = N_("%1$s::%2$s\n");
static msg_t msg_post_test_timed = "%1$s::%2$s: (%3$3.2fs)\n"; static msg_t msg_post_test_timed = N_("%1$s::%2$s: (%3$3.2fs)\n");
static msg_t msg_post_test = "%1$s::%2$s\n"; static msg_t msg_post_test = N_("%1$s::%2$s\n");
static msg_t msg_post_suite_test = "%1$s::%2$s: Test is disabled\n"; static msg_t msg_post_suite_test = N_("%1$s::%2$s: Test is disabled\n");
static msg_t msg_post_suite_suite = "%1$s::%2$s: Suite is disabled\n"; static msg_t msg_post_suite_suite = N_("%1$s::%2$s: Suite is disabled\n");
static msg_t msg_assert_fail = "%1$s%2$s%3$s:%4$s%5$d%6$s: Assertion failed: %7$s\n"; static msg_t msg_assert_fail = N_("%1$s%2$s%3$s:%4$s%5$d%6$s: Assertion failed: %7$s\n");
static msg_t msg_test_crash_line = "%1$s%2$s%3$s:%4$s%5$u%6$s: Unexpected signal caught below this line!\n"; static msg_t msg_test_crash_line = N_("%1$s%2$s%3$s:%4$s%5$u%6$s: Unexpected signal caught below this line!\n");
static msg_t msg_test_crash = "%1$s::%2$s: CRASH!\n"; static msg_t msg_test_crash = N_("%1$s::%2$s: CRASH!\n");
static msg_t msg_test_other_crash = "%1$sWarning! The test `%2$s::%3$s` crashed during its setup or teardown.%4$s\n"; static msg_t msg_test_other_crash = N_("%1$sWarning! The test `%2$s::%3$s` crashed during its setup or teardown.%4$s\n");
static msg_t msg_pre_suite = "Running %1$s%2$lu%3$s test from %4$s%5$s%6$s:\n"; static msg_t msg_pre_suite[] = N_s("Running %1$s%2$lu%3$s test from %4$s%5$s%6$s:\n",
static msg_t msg_pre_suite_pl = "Running %1$s%2$lu%3$s tests from %4$s%5$s%6$s:\n"; "Running %1$s%2$lu%3$s tests from %4$s%5$s%6$s:\n");
static msg_t msg_post_all = "%1$sSynthesis: Tested: %2$s%3$lu%4$s " static msg_t msg_post_all = N_("%1$sSynthesis: Tested: %2$s%3$lu%4$s "
"| Passing: %5$s%6$lu%7$s " "| Passing: %5$s%6$lu%7$s "
"| Failing: %8$s%9$lu%10$s " "| Failing: %8$s%9$lu%10$s "
"| Crashing: %11$s%12$lu%13$s " "| Crashing: %11$s%12$lu%13$s "
"%14$s\n"; "%14$s\n");
#else #else
static msg_t msg_pre_init = "%s::%s\n"; static msg_t msg_pre_init = "%s::%s\n";
static msg_t msg_post_test_timed = "%s::%s: (%3.2fs)\n"; static msg_t msg_post_test_timed = "%s::%s: (%3.2fs)\n";
@ -74,13 +78,13 @@ static msg_t msg_assert_fail = "%s%s%s:%s%d%s: Assertion failed: %s\n";
static msg_t msg_test_crash_line = "%s%s%s:%s%u%s: Unexpected signal caught below this line!\n"; static msg_t msg_test_crash_line = "%s%s%s:%s%u%s: Unexpected signal caught below this line!\n";
static msg_t msg_test_crash = "%s::%s: CRASH!\n"; static msg_t msg_test_crash = "%s::%s: CRASH!\n";
static msg_t msg_test_other_crash = "%sWarning! The test `%s::%s` crashed during its setup or teardown.%s\n"; static msg_t msg_test_other_crash = "%sWarning! The test `%s::%s` crashed during its setup or teardown.%s\n";
static msg_t msg_pre_suite = "Running %s%lu%s test from %s%s%s:\n"; static msg_t msg_pre_suite[] = { "Running %s%lu%s test from %s%s%s:\n",
static msg_t msg_pre_suite_pl = "Running %s%lu%s tests from %s%s%s:\n"; "Running %s%lu%s tests from %s%s%s:\n" };
static msg_t msg_post_all = "%sSynthesis: Tested: %s%lu%s " static msg_t msg_post_all = "%sSynthesis: Tested: %s%lu%s "
"| Passing: %s%lu%s " "| Passing: %s%lu%s "
"| Failing: %s%lu%s " "| Failing: %s%lu%s "
"| Crashing: %s%lu%s " "| Crashing: %s%lu%s "
"%s\n"; "%s\n";
#endif #endif
void normal_log_pre_all(UNUSED struct criterion_test_set *set) { void normal_log_pre_all(UNUSED struct criterion_test_set *set) {
@ -194,7 +198,7 @@ void normal_log_other_crash(UNUSED struct criterion_test_stats *stats) {
void normal_log_pre_suite(struct criterion_suite_set *set) { void normal_log_pre_suite(struct criterion_suite_set *set) {
criterion_pinfo(CRITERION_PREFIX_EQUALS, criterion_pinfo(CRITERION_PREFIX_EQUALS,
_s(msg_pre_suite, msg_pre_suite_pl, set->tests->size), _s(msg_pre_suite[0], msg_pre_suite[1], set->tests->size),
FG_BLUE, (unsigned long) set->tests->size, RESET, FG_BLUE, (unsigned long) set->tests->size, RESET,
FG_GOLD, set->suite.name, RESET); FG_GOLD, set->suite.name, RESET);
} }