From: Eric Sunshine <sunshine@sunshineco.com>
To: Alexander Shopov <ash@kambanaria.org>
Cc: "Git List" <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>,
"Martin Ågren" <martin.agren@gmail.com>,
"Brandon Williams" <bmwill@google.com>,
"Jeff King" <peff@peff.net>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
"Jiang Xin" <worldhello.net@gmail.com>,
"Johannes Sixt" <j6t@kdbg.org>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: [PATCH 1/1] Mark messages for translations
Date: Tue, 6 Feb 2018 02:32:42 -0500 [thread overview]
Message-ID: <CAPig+cSOgNfz+cYdcvsbbaf74RB0QNnmqLs9Ld9xdmarMaqzEQ@mail.gmail.com> (raw)
In-Reply-To: <20180206061537.2573-2-ash@kambanaria.org>
On Tue, Feb 6, 2018 at 1:15 AM, Alexander Shopov <ash@kambanaria.org> wrote:
> Small changes in messages to fit the style and typography of rest
> Reuse already translated messages if possible
> Do not translate messages aimed at developers of git
> Fix unit tests depending on the original string
>
> Signed-off-by: Alexander Shopov <ash@kambanaria.org>
> ---
> diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh
> @@ -31,7 +31,7 @@ test_expect_success 'bad setup: invalid .git file format' '
> echo "git rev-parse accepted an invalid .git file"
> false
> fi &&
> - if ! grep "Invalid gitfile format" .err
> + if ! grep "invalid gitfile format" .err
Since these strings can now be translated, you'll probably need to use
'test_i18ngrep' rather than 'grep'. (See test_i18ngrep in
t/test-lib.sh.)
> then
> echo "git rev-parse returned wrong error"
> false
> @@ -45,7 +45,7 @@ test_expect_success 'bad setup: invalid .git file path' '
> echo "git rev-parse accepted an invalid .git file path"
> false
> fi &&
> - if ! grep "Not a git repository" .err
> + if ! grep "not a git repository" .err
> then
> echo "git rev-parse returned wrong error"
> false
> diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
> index d27f438bf..5743b482f 100755
> --- a/t/t0008-ignores.sh
> +++ b/t/t0008-ignores.sh
> @@ -307,7 +307,7 @@ test_expect_success_multi 'needs work tree' '' '
> cd .git &&
> test_check_ignore "foo" 128
> ) &&
> - stderr_contains "fatal: This operation must be run in a work tree"
> + stderr_contains "fatal: this operation must be run in a work tree"
> '
next prev parent reply other threads:[~2018-02-06 7:32 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-15 5:44 [PATCH 0/1] Marked end user messages for translation Alexander Shopov
2018-01-15 5:44 ` [PATCH 1/1] Mark messages for translations Alexander Shopov
2018-01-15 7:33 ` Johannes Sixt
[not found] ` <CAP6f5Mnn+pRdL6ihgwcqsTwyGy+EQfBbgPxkFmGLcWL-hJx-8g@mail.gmail.com>
[not found] ` <CAP6f5MnaMiqEMbGW_xj6X495jF=txpzeq+DEHOkz7VCg2D6D9w@mail.gmail.com>
2018-01-15 9:16 ` Alexander Shopov
2018-01-15 9:58 ` Eric Sunshine
2018-01-15 10:21 ` Duy Nguyen
2018-02-06 6:15 ` [PATCH 0/1] " Alexander Shopov
2018-02-06 6:15 ` [PATCH 1/1] " Alexander Shopov
2018-02-06 7:32 ` Eric Sunshine [this message]
2018-02-06 7:38 ` Jeff King
2018-02-09 7:44 ` [PATCH 0/1] " Alexander Shopov
2018-02-09 7:44 ` [PATCH 1/1] " Alexander Shopov
2018-02-09 18:20 ` Junio C Hamano
2018-02-09 19:15 ` Junio C Hamano
2018-02-09 19:30 ` Jeff King
2018-02-10 11:31 ` [PATCH] t0002: simplify error checking Jeff King
2018-02-12 15:03 ` [PATCH 1/1] Mark messages for translations Alexander Shopov
2018-02-12 15:15 ` Jeff King
2018-02-13 13:19 ` [PATCH 0/1] Mark messages for translation Alexander Shopov
2018-02-13 13:19 ` [PATCH 1/1] Mark messages for translations Alexander Shopov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPig+cSOgNfz+cYdcvsbbaf74RB0QNnmqLs9Ld9xdmarMaqzEQ@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=ash@kambanaria.org \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=martin.agren@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=worldhello.net@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).