Re: [PATCH v3 6/6] wt-status: begin error messages with lower-case

[Johannes Schindelin]

Hi Kuba,

On Wed, 5 Oct 2016, Jakub Narębski wrote:

> W dniu 04.10.2016 o 15:06, Johannes Schindelin pisze:
> 
> > The previous code still followed the old git-pull.sh code which did not
> > adhere to our new convention.
> 
> Good to know why it used its own convention.

Yeah, I figured that it is late, but still a good thing to explain this...

> > diff --git a/builtin/pull.c b/builtin/pull.c
> > index c639167..0bf9802 100644
> > --- a/builtin/pull.c
> > +++ b/builtin/pull.c
> > @@ -810,7 +810,7 @@ int cmd_pull(int argc, const char **argv, const char 
> > *prefix)
> >  
> > if (!autostash)
> > require_clean_work_tree(N_("pull with rebase"),
> > -   "Please commit or stash them.", 1, 0);
> > +   "please commit or stash them.", 1, 0);
> >  
> 
> Shouldn't those also be marked for translation with N_() or _()?

Of course!

Thanks,
Dscho

Re: [PATCH v3 6/6] wt-status: begin error messages with lower-case

[Jakub Narębski]

W dniu 04.10.2016 o 15:06, Johannes Schindelin pisze:

> The previous code still followed the old git-pull.sh code which did not
> adhere to our new convention.

Good to know why it used its own convention.
 
> Signed-off-by: Johannes Schindelin 
> ---
>  builtin/pull.c | 2 +-
>  wt-status.c| 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/builtin/pull.c b/builtin/pull.c
> index c639167..0bf9802 100644
> --- a/builtin/pull.c
> +++ b/builtin/pull.c
> @@ -810,7 +810,7 @@ int cmd_pull(int argc, const char **argv, const char 
> *prefix)
>  
>   if (!autostash)
>   require_clean_work_tree(N_("pull with rebase"),
> - "Please commit or stash them.", 1, 0);
> + "please commit or stash them.", 1, 0);
>  

Shouldn't those also be marked for translation with N_() or _()?

Best,
-- 
Jakub Narębski

[PATCH v3 6/6] wt-status: begin error messages with lower-case

[Johannes Schindelin]

The previous code still followed the old git-pull.sh code which did not
adhere to our new convention.

Signed-off-by: Johannes Schindelin 
---
 builtin/pull.c | 2 +-
 wt-status.c| 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/builtin/pull.c b/builtin/pull.c
index c639167..0bf9802 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -810,7 +810,7 @@ int cmd_pull(int argc, const char **argv, const char 
*prefix)
 
if (!autostash)
require_clean_work_tree(N_("pull with rebase"),
-   "Please commit or stash them.", 1, 0);
+   "please commit or stash them.", 1, 0);
 
if (get_rebase_fork_point(rebase_fork_point, repo, *refspecs))
hashclr(rebase_fork_point);
diff --git a/wt-status.c b/wt-status.c
index 061597a..010276b 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -2265,15 +2265,15 @@ int require_clean_work_tree(const char *action, const 
char *hint, int ignore_sub
 
if (has_unstaged_changes(ignore_submodules)) {
/* TRANSLATORS: the action is e.g. "pull with rebase" */
-   error(_("Cannot %s: You have unstaged changes."), _(action));
+   error(_("cannot %s: You have unstaged changes."), _(action));
err = 1;
}
 
if (has_uncommitted_changes(ignore_submodules)) {
if (err)
-   error(_("Additionally, your index contains uncommitted 
changes."));
+   error(_("additionally, your index contains uncommitted 
changes."));
else
-   error(_("Cannot %s: Your index contains uncommitted 
changes."),
+   error(_("cannot %s: Your index contains uncommitted 
changes."),
  _(action));
err = 1;
}
-- 
2.10.0.windows.1.325.ge6089c1