{"thread":{"id":"24893","subject":"[PATCH 2/3] Makefile: provide a --msgid-bugs-address to xgettext(1)","startedAt":"2010-08-28T17:54:20Z","lastAt":"2010-08-30T14:35:26Z","messageCount":5,"participants":["Ævar Arnfjörð Bjarmason"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"149171","messageId":"1283018063-4256-1-git-send-email-avarab@gmail.com","threadId":"24893","inReplyTo":null,"subject":"[PATCH 0/3] gettext: minor fixes","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-28T17:54:20Z","receivedAt":"2010-08-28T17:54:20Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Here are some trivial fixes to the gettext infrastructure. I\nencountered these while doing more significant work.\n\nIt's based on next, and the gettext series I'm about to send soon will\nbe based on this one.\n\nÆvar Arnfjörð Bjarmason (3):\n gettext: update test/is.po to match t/t0200/test.c\n Makefile: provide a --msgid-bugs-address to xgettext(1)\n gettext: msgmerge is.po and add Language: header\n\n Makefile | 7 ++++---\n po/is.po | 10 ++++++----\n t/t0200-gettext-basic.sh | 2 +-\n 3 files changed, 11 insertions(+), 8 deletions(-)\n\n-- \n1.7.2.2.513.g82b8\n"},{"id":"149172","messageId":"1283018063-4256-2-git-send-email-avarab@gmail.com","threadId":"24893","inReplyTo":"1283018063-4256-1-git-send-email-avarab@gmail.com","subject":"[PATCH 1/3] gettext: update test/is.po to match t/t0200/test.c","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-28T17:54:21Z","receivedAt":"2010-08-28T17:54:21Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change test.c to use '' quotes around \"git help COMMAND\" as git.c\ndoes. An earlier version of the gettext series didn't use '' quotes,\nbut I hadn't run msgmerge since then so I didn't spot it.\n\nFor reference, the msgmerge command:\n\n msgmerge --backup=off -U is.po git.pot\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n po/is.po | 4 ++--\n t/t0200-gettext-basic.sh | 2 +-\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/po/is.po b/po/is.po\nindex 95739f1..2f3a220 100644\n--- a/po/is.po\n+++ b/po/is.po\n@@ -10,8 +10,8 @@ msgstr \"\"\n \"Content-Transfer-Encoding: 8bit\\n\"\n \n #: t/t0200/test.c:4\n-msgid \"See git help COMMAND for more information on a specific command.\"\n-msgstr \"Sjá git help SKIPUN til að sjá hjálp fyrir tiltekna skipun.\"\n+msgid \"See 'git help COMMAND' for more information on a specific command.\"\n+msgstr \"Sjá 'git help SKIPUN' til að sjá hjálp fyrir tiltekna skipun.\"\n \n #. TRANSLATORS: This is a test. You don't need to translate it.\n #: t/t0200/test.c:9\ndiff --git a/t/t0200-gettext-basic.sh b/t/t0200-gettext-basic.sh\nindex 522338d..e8b7710 100755\n--- a/t/t0200-gettext-basic.sh\n+++ b/t/t0200-gettext-basic.sh\n@@ -69,7 +69,7 @@ test_expect_success GETTEXT_LOCALE 'xgettext: C extraction of _() and N_() strin\n printf \"Sjá git help SKIPUN til að sjá hjálp fyrir tiltekna skipun.\" >>expect &&\n LANGUAGE=is LC_ALL=\"$is_IS_locale\" gettext \"TEST: A C test string\" >actual &&\n printf \"\\n\" >>actual &&\n- LANGUAGE=is LC_ALL=\"$is_IS_locale\" gettext \"See git help COMMAND for more information on a specific command.\" >>actual &&\n+ LANGUAGE=is LC_ALL=\"$is_IS_locale\" gettext \"See '\\''git help COMMAND'\\'' for more information on a specific command.\" >>actual &&\n test_cmp expect actual\n '\n \n-- \n1.7.2.2.513.g82b8\n"},{"id":"149170","messageId":"1283018063-4256-3-git-send-email-avarab@gmail.com","threadId":"24893","inReplyTo":"1283018063-4256-1-git-send-email-avarab@gmail.com","subject":"[PATCH 2/3] Makefile: provide a --msgid-bugs-address to xgettext(1)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-28T17:54:22Z","receivedAt":"2010-08-28T17:54:22Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change the invocations of xgettext to use the --msgid-bugs-address\noption. This has the effect of adding a Report-Msgid-Bugs-To header to\nthe git.pot and the derived *.po files. Doing so is recommended by the\ngettext manual.\n\nIf this isn't added the Report-Msgid-Bugs-To already in po/is.po will\nbe removed by msgmerge(1).\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n Makefile | 7 ++++---\n 1 files changed, 4 insertions(+), 3 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 62d526a..155b69b 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -2008,10 +2008,11 @@ cscope:\n \t$(RM) cscope*\n \t$(FIND) . -name '*.[hcS]' -print | xargs cscope -b\n \n+POT_BUGS = Git Mailing List \n pot:\n-\t$(XGETTEXT) --add-comments --keyword=_ --keyword=N_ --output=po/git.pot --language=C $(C_OBJ:o=c) t/t0200/test.c\n-\t$(XGETTEXT) --add-comments --join-existing --output=po/git.pot --language=Shell $(SCRIPT_SH) t/t0200/test.sh\n-\t$(XGETTEXT) --add-comments --join-existing --keyword=__ --output=po/git.pot --language=Perl $(SCRIPT_PERL) t/t0200/test.perl\n+\t$(XGETTEXT) --msgid-bugs-address=\"$(POT_BUGS)\" --add-comments --keyword=_ --keyword=N_ --output=po/git.pot --language=C $(C_OBJ:o=c) t/t0200/test.c\n+\t$(XGETTEXT) --msgid-bugs-address=\"$(POT_BUGS)\" --add-comments --join-existing --output=po/git.pot --language=Shell $(SCRIPT_SH) t/t0200/test.sh\n+\t$(XGETTEXT) --msgid-bugs-address=\"$(POT_BUGS)\" --add-comments --join-existing --keyword=__ --output=po/git.pot --language=Perl $(SCRIPT_PERL) t/t0200/test.perl\n \n POFILES := $(wildcard po/*.po)\n MOFILES := $(patsubst po/%.po,share/locale/%/LC_MESSAGES/git.mo,$(POFILES))\n-- \n1.7.2.2.513.g82b8\n"},{"id":"149173","messageId":"1283018063-4256-4-git-send-email-avarab@gmail.com","threadId":"24893","inReplyTo":"1283018063-4256-1-git-send-email-avarab@gmail.com","subject":"[PATCH 3/3] gettext: msgmerge is.po and add Language: header","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-28T17:54:23Z","receivedAt":"2010-08-28T17:54:23Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change is.po to use the header order added by msgmerge(1), this'll\nmake subsequent diffs to it smaller and easier to manage. While I'm at\nit add a Language header indicating that the file is in\nIcelandic.\n\nWhen we add more *.po files later we should add a Language header to\nthose as well.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n po/is.po | 6 ++++--\n 1 files changed, 4 insertions(+), 2 deletions(-)\n\ndiff --git a/po/is.po b/po/is.po\nindex 2f3a220..d34cade 100644\n--- a/po/is.po\n+++ b/po/is.po\n@@ -1,10 +1,12 @@\n msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: Git\\n\"\n-\"PO-Revision-Date: 2010-06-05 19:06 +0000\\n\"\n-\"Language-Team: Git Mailing List \\n\"\n \"Report-Msgid-Bugs-To: Git Mailing List \\n\"\n+\"POT-Creation-Date: 2010-08-28 17:38+0000\\n\"\n+\"PO-Revision-Date: 2010-08-28 17:27+0000\\n\"\n \"Last-Translator: Ævar Arnfjörð Bjarmason \\n\"\n+\"Language-Team: Git Mailing List \\n\"\n+\"Language: is\\n\"\n \"MIME-Version: 1.0\\n\"\n \"Content-Type: text/plain; charset=UTF-8\\n\"\n \"Content-Transfer-Encoding: 8bit\\n\"\n-- \n1.7.2.2.513.g82b8\n"},{"id":"149330","messageId":"AANLkTikdw_azkLvFuGECx+twEcijyhyLVUoYG389xUxx@mail.gmail.com","threadId":"24893","inReplyTo":"1283018063-4256-1-git-send-email-avarab@gmail.com","subject":"Re: [PATCH 0/3] gettext: minor fixes","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-30T14:35:26Z","receivedAt":"2010-08-30T14:35:26Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Sat, Aug 28, 2010 at 17:54, Ævar Arnfjörð Bjarmason wrote:\n> Here are some trivial fixes to the gettext infrastructure. I\n> encountered these while doing more significant work.\n>\n> It's based on next, and the gettext series I'm about to send soon will\n> be based on this one.\n\nPlease disregard this series. It has a bug, and in any case it's\nbetter folded into a future gettext series that I'll submit later.\n"}]}