{"thread":{"id":"26797","subject":"[PATCH] git status: fix grammar when in detached head","startedAt":"2011-03-19T21:33:29Z","lastAt":"2011-03-19T22:16:10Z","messageCount":2,"participants":["Piotr Krukowiecki","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"163781","messageId":"4D852129.7050205@gmail.com","threadId":"26797","inReplyTo":null,"subject":"[PATCH] git status: fix grammar when in detached head","fromName":"Piotr Krukowiecki","fromEmail":"piotr.krukowiecki@gmail.com","sentAt":"2011-03-19T21:33:29Z","receivedAt":"2011-03-19T21:33:29Z","isPatch":true,"sender":{"key":"piotr.krukowiecki@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3259959?v=4"},"body":"\nSigned-off-by: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>\n---\n wt-status.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\nNot a native English speaker, but IMO the previous version isn't \ncorrect.\n\ndiff --git a/wt-status.c b/wt-status.c\nindex 4daa8bb..3214f52 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -643,7 +643,7 @@ void wt_status_print(struct wt_status *s)\n \t\telse if (!strcmp(branch_name, \"HEAD\")) {\n \t\t\tbranch_name = \"\";\n \t\t\tbranch_status_color = color(WT_STATUS_NOBRANCH, s);\n-\t\t\ton_what = \"Not currently on any branch.\";\n+\t\t\ton_what = \"Not on any branch currently.\";\n \t\t}\n \t\tcolor_fprintf(s->fp, color(WT_STATUS_HEADER, s), \"# \");\n \t\tcolor_fprintf(s->fp, branch_status_color, \"%s\", on_what);\n-- \n1.7.4.1.295.ged435\n\n-- \nPiotr Krukowiecki\n"},{"id":"163785","messageId":"20110319221610.GA7116@sigill.intra.peff.net","threadId":"26797","inReplyTo":"4D852129.7050205@gmail.com","subject":"Re: [PATCH] git status: fix grammar when in detached head","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2011-03-19T22:16:10Z","receivedAt":"2011-03-19T22:16:10Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sat, Mar 19, 2011 at 10:33:29PM +0100, Piotr Krukowiecki wrote:\n\n> Not a native English speaker, but IMO the previous version isn't \n> correct.\n\nThe previous version is fine (well, it's not actually a complete\nsentence because it doesn't contain a verb, but that seems not to be the\nissue).\n\nBreaking it down with the implied beginning, it is:\n\n  [You are] not currently on any branch.\n    |   |    |      |     \\------------/\n    1   2    3      4           5\n\n1 = subject\n2 = verb\n3 = adverb (modifying \"are\")\n4 = adverb (modifying \"are\")\n5 = prepositional phrase functioning as predicate nominative\n\nYou can put an adverb before or after the verb it modifies. For clarity,\nit's usually a good idea to keep the adverb close to its verb, though in\nsimple sentences it's not necessary, and putting the adverb at the\nbeginning or end of the sentence can emphasize it.\n\nSo:\n\n> diff --git a/wt-status.c b/wt-status.c\n> index 4daa8bb..3214f52 100644\n> --- a/wt-status.c\n> +++ b/wt-status.c\n> @@ -643,7 +643,7 @@ void wt_status_print(struct wt_status *s)\n>  \t\telse if (!strcmp(branch_name, \"HEAD\")) {\n>  \t\t\tbranch_name = \"\";\n>  \t\t\tbranch_status_color = color(WT_STATUS_NOBRANCH, s);\n> -\t\t\ton_what = \"Not currently on any branch.\";\n> +\t\t\ton_what = \"Not on any branch currently.\";\n\nBoth are correct, as is \"Currently not on any branch.\" As would be \"You\ncurrently are not on any branch\" if we were including the implied\nsubject and verb.\n\nI think the current version is my favorite, as it gives the most\nemphasis to \"not\" and \"branch\", but that is just personal taste. At any\nrate, I'd rather not change it lightly as things like editor syntax\nhighlighters recognize the current phrase (though I suppose they may\nsoon have to deal with i18n issues anyway).\n\n-Peff\n"}]}