Re: Updating gettext autoconf macros to 0.21

[Vincent Lefevre]

On 2021-02-21 14:58:06 -0800, Kevin J. McCarthy wrote:
> On Sat, Feb 20, 2021 at 03:16:17PM -0800, Kevin J. McCarthy wrote:
> > I'll merge the branch into master tomorrow, but if anyone has the time
> > please give it a test.
> 
> I've merged the branch into master.  As before, please let me know if you
> find any problems.  Thank you.

Thanks. Everything works fine now.

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Re: Updating gettext autoconf macros to 0.21

[Vincent Lefevre]

On 2021-02-21 09:50:06 +0100, Rene Kita wrote:
> On Sat, Feb 20, 2021 at 06:51:44PM +0100, Vincent Lefevre wrote:
> > I don't understand how you can get the same gmo file since in
> > ccc18061, the dependency on the OPS* file is gone.
> Because I diffed the _output_ of the help text you get after pressing
> '?' in the index.

The solution is to look at the size of the gmo file. After the change,
the generated gmo file was significantly smaller.

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Re: Updating gettext autoconf macros to 0.21

[Kevin J. McCarthy]

On Sat, Feb 20, 2021 at 03:16:17PM -0800, Kevin J. McCarthy wrote:
I'll merge the branch into master tomorrow, but if anyone has the time 
please give it a test.


I've merged the branch into master.  As before, please let me know if 
you find any problems.  Thank you.


--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA


signature.asc
Description: PGP signature

Re: Updating gettext autoconf macros to 0.21

[Kevin J. McCarthy]

On Sun, Feb 21, 2021 at 10:06:32AM +0100, Rene Kita wrote:

On Sat, Feb 20, 2021 at 03:16:17PM -0800, Kevin J. McCarthy wrote:

I've help menu fixes to branch 'kevin/gettext-bugs-v2' on gitlab. (NOTE:
this is a different branch from before.)

[...]

I'll merge the branch into master tomorrow, but if anyone has the time
please give it a test.

After getting my configure options straight I can confirm that the help
text is now translated (and was not translated before).


Great, thanks for help testing it!  The PO file machinery can be tricky 
to test, and I'm not all that familiar with their intricacies myself 
either.  So I appreciate the help.


--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA


signature.asc
Description: PGP signature

Re: Updating gettext autoconf macros to 0.21

[Rene Kita]

On Sat, Feb 20, 2021 at 03:16:17PM -0800, Kevin J. McCarthy wrote:
> I've help menu fixes to branch 'kevin/gettext-bugs-v2' on gitlab. (NOTE:
> this is a different branch from before.)
[...]
> I'll merge the branch into master tomorrow, but if anyone has the time
> please give it a test.
After getting my configure options straight I can confirm that the help
text is now translated (and was not translated before).

Re: Updating gettext autoconf macros to 0.21

[Rene Kita]

On Sat, Feb 20, 2021 at 06:51:44PM +0100, Vincent Lefevre wrote:
> On 2021-02-20 12:48:33 +0100, Rene Kita wrote:
> > On Thu, Feb 18, 2021 at 11:28:02PM +0100, Vincent Lefevre wrote:
> > > The messages in the help are no longer translated, e.g. previously:
> > > 
> > > [...]
> > > ^N  next-threadaller à la discussion suivante
> > > ^P  previous-threadaller à la discussion précédente
> > > [...]
> > I cannot reproduce this. Using 'LANG=fr_FR.utf8 ./mutt -R' I get the
> > translated result.
> 
> If you want to test translations, you need to run "make install"
> instead of running mutt from the build directory. Otherwise you
> are testing a wrong translation file.
In fact what I did was wrong and I tested the wrong translation file.

In my case using 'make install' did not really help as I configure with
'--prefix' and this path is not tried by mutt. Also I had a stray
translation file in the right place, which was then used by mutt. So
basically I always saw the same translation.

After removing all translation files and copying the created file to the
right place I could reproduce the problem. Thanks for pointing me in the
right direction.


> > In addition I build current master (ccc18061) and master~1 (9635fad4)
> > and diff'd the help text for de_DE, they are equal.

> I don't understand how you can get the same gmo file since in
> ccc18061, the dependency on the OPS* file is gone.
Because I diffed the _output_ of the help text you get after pressing
'?' in the index.

Re: Updating gettext autoconf macros to 0.21

[Kevin J. McCarthy]

I've help menu fixes to branch 'kevin/gettext-bugs-v2' on gitlab. 
(NOTE: this is a different branch from before.)


This branch generates the help menu translation strings directly from 
the OPS files.  I recommend performing a 'make maintainer-clean' and 
then running './prepare [your options]' to ensure you work from a clean 
environment.


I'll merge the branch into master tomorrow, but if anyone has the time
please give it a test.

Thank you!

--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA


signature.asc
Description: PGP signature

Re: Updating gettext autoconf macros to 0.21

[Kevin J. McCarthy]

On Sat, Feb 20, 2021 at 06:51:44PM +0100, Vincent Lefevre wrote:

I don't understand how you can get the same gmo file since in
ccc18061, the dependency on the OPS* file is gone.


As an update, I'm working on a fix to directly generate the translation 
strings from the OPS* files.  I should have that pushed up this weekend.


--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA


signature.asc
Description: PGP signature

Re: Updating gettext autoconf macros to 0.21

[Vincent Lefevre]

On 2021-02-20 12:48:33 +0100, Rene Kita wrote:
> On Thu, Feb 18, 2021 at 11:28:02PM +0100, Vincent Lefevre wrote:
> > The messages in the help are no longer translated, e.g. previously:
> > 
> > [...]
> > ^N  next-threadaller à la discussion suivante
> > ^P  previous-threadaller à la discussion précédente
> > [...]
> I cannot reproduce this. Using 'LANG=fr_FR.utf8 ./mutt -R' I get the
> translated result.

If you want to test translations, you need to run "make install"
instead of running mutt from the build directory. Otherwise you
are testing a wrong translation file.

> In addition I build current master (ccc18061) and master~1 (9635fad4)
> and diff'd the help text for de_DE, they are equal.

I get:

9635fad4
-rw-r--r-- 1 vinc17 vinc17 129082 2021-02-20 18:46:58 po/de.gmo
-rw-r--r-- 1 vinc17 vinc17 132084 2021-02-20 18:46:58 po/fr.gmo

ccc18061
-rw-r--r-- 1 vinc17 vinc17 106424 2021-02-20 18:48:54 po/de.gmo
-rw-r--r-- 1 vinc17 vinc17 109071 2021-02-20 18:48:54 po/fr.gmo

I don't understand how you can get the same gmo file since in
ccc18061, the dependency on the OPS* file is gone.

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Re: Updating gettext autoconf macros to 0.21

[Rene Kita]

On Thu, Feb 18, 2021 at 11:28:02PM +0100, Vincent Lefevre wrote:
> The messages in the help are no longer translated, e.g. previously:
> 
> [...]
> ^N  next-threadaller à la discussion suivante
> ^P  previous-threadaller à la discussion précédente
> [...]
I cannot reproduce this. Using 'LANG=fr_FR.utf8 ./mutt -R' I get the
translated result.

In addition I build current master (ccc18061) and master~1 (9635fad4)
and diff'd the help text for de_DE, they are equal.

(Ubuntu 20.04.2. LTS (Focal Fossa))

Re: Updating gettext autoconf macros to 0.21

[Kevin J. McCarthy]

On Fri, Feb 19, 2021 at 02:00:51AM +0100, Vincent Lefevre wrote:

An important change is:

diff --git a/po/POTFILES.in b/po/POTFILES.in
index c7fdd935..62329627 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -44,6 +44,7 @@ imap/util.c
init.c
init.h
keymap.c
+keymap_alldefs.h
lib.c
listmenu.c
main.c

Indeed, I suppose that without keymap_alldefs.h in POTFILES,
the associated translations are ignored.


Just as an update, I'm still working on this.  The fixes in the branch 
(including the above) did "fix" things when building out of git, but 
fail with a separate src and build directory.


The gettext manual helpfully suggests to just not use generated files 
for input :-).  So this is probably why the customization occurred in 
the past.


Please let me work on this over the weekend to see what I can come up
with.  I'd rather not revert, because the issue will hang over Mutt in
the future...

--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA


signature.asc
Description: PGP signature

Re: Updating gettext autoconf macros to 0.21

[Vincent Lefevre]

On 2021-02-18 16:27:26 -0800, Kevin J. McCarthy wrote:
> On Thu, Feb 18, 2021 at 03:54:17PM -0800, Kevin J. McCarthy wrote:
> > I'm still working on the help screen issue.  The dependency was a
> > problem, and I believe I've worked around that.  However, I'm still
> > getting the missing translation problem.  I will work on it more tonight
> > and see what I can find.
> 
> The problem went away when I force rebuilt everything, including
> po/mutt.pot.  I still need to investigate more what's going on, because I
> think something it not right.
> 
> I've pushed a branch to 'kevin/gettext-bugs' with two work-in-progress
> commits:
>   - one forcing the keymap_alldefs.h regeneration in the top-level
> Makefile.am.
>   - the next restores the --add-comments=L10N option for xgettext.

An important change is:

diff --git a/po/POTFILES.in b/po/POTFILES.in
index c7fdd935..62329627 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -44,6 +44,7 @@ imap/util.c
 init.c
 init.h
 keymap.c
+keymap_alldefs.h
 lib.c
 listmenu.c
 main.c

Indeed, I suppose that without keymap_alldefs.h in POTFILES,
the associated translations are ignored.

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Re: Updating gettext autoconf macros to 0.21

[Vincent Lefevre]

On 2021-02-18 16:27:26 -0800, Kevin J. McCarthy wrote:
> The problem went away when I force rebuilt everything, including
> po/mutt.pot.  I still need to investigate more what's going on, because I
> think something it not right.
> 
> I've pushed a branch to 'kevin/gettext-bugs' with two work-in-progress
> commits:
>   - one forcing the keymap_alldefs.h regeneration in the top-level
> Makefile.am.
>   - the next restores the --add-comments=L10N option for xgettext.

Indeed, keymap_alldefs.h is not built by default. But even when
I remove po/mutt.pot and I build keymap_alldefs.h manually, then
everything, I get the same issue.

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Re: Updating gettext autoconf macros to 0.21

[Kevin J. McCarthy]

On Thu, Feb 18, 2021 at 03:54:17PM -0800, Kevin J. McCarthy wrote:
I'm still working on the help screen issue.  The dependency was a 
problem, and I believe I've worked around that.  However, I'm still 
getting the missing translation problem.  I will work on it more 
tonight and see what I can find.


The problem went away when I force rebuilt everything, including 
po/mutt.pot.  I still need to investigate more what's going on, because 
I think something it not right.


I've pushed a branch to 'kevin/gettext-bugs' with two work-in-progress 
commits:
  - one forcing the keymap_alldefs.h regeneration in the top-level 
Makefile.am.

  - the next restores the --add-comments=L10N option for xgettext.

--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA


signature.asc
Description: PGP signature

Re: Updating gettext autoconf macros to 0.21

[Vincent Lefevre]

On 2021-02-19 00:38:11 +0100, Vincent Lefevre wrote:
> I've reverted the change. With 0.21 as the version, this makes
> autoreconf fail on Debian stable because gettext is too old.
> But gettext 0.21 isn't really required. Lowering the version
> e.g. to 0.19 makes autopoint fail with both gettext 0.19 and
> gettext 0.21. I'm wondering why. This macro may be buggy. Or
> is there something wrong with the new Mutt code?

The reason is the following. Without an AM_GNU_GETTEXT_VERSION line,
autoreconf doesn't do anything about gettext. This does not seem to
be needed for Mutt, so that everything is fine. But when this line
is provided, autoreconf runs autopoint, which complains because it
wants to override files already present in Mutt's repository (this
is a bug in autoreconf, because --install without --force isn't
supposed to add existing files). To avoid the failure, --force can
be added, but it yields modifications in these gettext files already
present in Mutt's repository.

A workaround to avoid autopoint is to run

  AUTOPOINT=true autoreconf --install

(so that "true" will be run instead of "autopoint"). But the warning
may be less annoying.

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Re: Updating gettext autoconf macros to 0.21

[Kevin J. McCarthy]

On Fri, Feb 19, 2021 at 12:38:11AM +0100, Vincent Lefevre wrote:

On 2021-02-19 00:04:20 +0100, Vincent Lefevre wrote:

I've just pushed a commit that does that (with 0.21 as the version):
the warning has disappeared.


I've reverted the change. With 0.21 as the version, this makes
autoreconf fail on Debian stable because gettext is too old.
But gettext 0.21 isn't really required. Lowering the version
e.g. to 0.19 makes autopoint fail with both gettext 0.19 and
gettext 0.21. I'm wondering why. This macro may be buggy. Or
is there something wrong with the new Mutt code?


I remember reading something about the _VERSION macro enforcing versions 
across developers, for when the generated files are not checked into the 
repos.  Otherwise it shouldn't be used.


I'm still working on the help screen issue.  The dependency was a 
problem, and I believe I've worked around that.  However, I'm still 
getting the missing translation problem.  I will work on it more tonight 
and see what I can find.


--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA


signature.asc
Description: PGP signature

Re: Updating gettext autoconf macros to 0.21

[Vincent Lefevre]

On 2021-02-19 00:04:20 +0100, Vincent Lefevre wrote:
> I've just pushed a commit that does that (with 0.21 as the version):
> the warning has disappeared.

I've reverted the change. With 0.21 as the version, this makes
autoreconf fail on Debian stable because gettext is too old.
But gettext 0.21 isn't really required. Lowering the version
e.g. to 0.19 makes autopoint fail with both gettext 0.19 and
gettext 0.21. I'm wondering why. This macro may be buggy. Or
is there something wrong with the new Mutt code?

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Re: Updating gettext autoconf macros to 0.21

[Vincent Lefevre]

On 2021-02-18 14:53:24 -0800, Kevin J. McCarthy wrote:
> On Thu, Feb 18, 2021 at 11:28:02PM +0100, Vincent Lefevre wrote:
> > A minor issue: autoreconf gives:
> > 
> > autoreconf: configure.ac: AM_GNU_GETTEXT is used, but not 
> > AM_GNU_GETTEXT_VERSION
> 
> I did see that, but I'm not sure what to do about it.  Do you have any
> advice?

A web search:

https://github.com/swh/ladspa/issues/20

with the same warning, and they just added an AM_GNU_GETTEXT_VERSION
line:

https://github.com/gentoo/gentoo/blob/15e6c749fedcecf606c368ee689ab051ab71c0db/media-plugins/swh-plugins/files/swh-plugins-0.4.15-gettext.patch

I've just pushed a commit that does that (with 0.21 as the version):
the warning has disappeared.

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Re: Updating gettext autoconf macros to 0.21

[Kevin J. McCarthy]

On Thu, Feb 18, 2021 at 11:28:02PM +0100, Vincent Lefevre wrote:

The messages in the help are no longer translated, e.g. previously:


Ah.  I missed that!  Sorry I'll work on rebuilding that functionality.


A minor issue: autoreconf gives:

autoreconf: configure.ac: AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION


I did see that, but I'm not sure what to do about it.  Do you have any 
advice?


--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA


signature.asc
Description: PGP signature

Re: Updating gettext autoconf macros to 0.21

[Vincent Lefevre]

On 2021-02-18 23:28:02 +0100, Vincent Lefevre wrote:
> The messages in the help are no longer translated, e.g. previously:
> 
> [...]
> ^N  next-threadaller à la discussion suivante
> ^P  previous-threadaller à la discussion précédente
> [...]
> Aide pour index (22%)
> 
> and now:
> 
> [...]
> ^N  next-threadjump to the next thread
> ^P  previous-threadjump to previous thread
> [...]
> Aide pour index (25%)

They correspond to the OPS* files, and I see in the commit diff:

-$(top_builddir)/keymap_alldefs.h: $(top_srcdir)/OPS $(top_srcdir)/OPS.SIDEBAR 
$(top_srcdir)/OPS.PGP $(top_srcdir)/OPS.MIX $(top_srcdir)/OPS.CRYPT 
$(top_srcdir)/OPS.SMIME $(top_srcdir)/gen_defs
-   ( cd $(top_builddir) && $(MAKE) keymap_alldefs.h )

but nothing to replace that.

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Re: Updating gettext autoconf macros to 0.21

[Vincent Lefevre]

Hi,

On 2021-02-18 13:37:17 -0800, Kevin J. McCarthy wrote:
> On Wed, Feb 17, 2021 at 04:00:19PM -0800, Kevin J. McCarthy wrote:
> > I'm going to merge and push the branch up to master tomorrow.  Please
> > let me know if you see any problems (either before or after the merge).
> 
> I've merged this into master.  Thank you Dave and Rene for helping test it
> out.  Again, if anyone notices any problems, please don't hesitate to let me
> know.

The messages in the help are no longer translated, e.g. previously:

[...]
^N  next-threadaller à la discussion suivante
^P  previous-threadaller à la discussion précédente
[...]
Aide pour index (22%)

and now:

[...]
^N  next-threadjump to the next thread
^P  previous-threadjump to previous thread
[...]
Aide pour index (25%)

A minor issue: autoreconf gives:

autoreconf: configure.ac: AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Re: Updating gettext autoconf macros to 0.21

[Kevin J. McCarthy]

On Wed, Feb 17, 2021 at 04:00:19PM -0800, Kevin J. McCarthy wrote:
I'm going to merge and push the branch up to master tomorrow.  Please 
let me know if you see any problems (either before or after the 
merge).


I've merged this into master.  Thank you Dave and Rene for helping test 
it out.  Again, if anyone notices any problems, please don't hesitate to 
let me know.


--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA


signature.asc
Description: PGP signature

Re: Updating gettext autoconf macros to 0.21

[Rene Kita]

On Sun, Feb 14, 2021 at 06:57:29PM +0100, Rene Kita wrote:
> On Sun, Feb 14, 2021 at 09:47:40AM -0800, Kevin J. McCarthy wrote:
> > On Sun, Feb 14, 2021 at 05:34:23PM +0100, Rene Kita wrote:
> > > Does is make sense to test this with locale "en_US.UTF-8"?
> > 
> > It helps to build with any locale, and at least make sure it runs. Testing
> > with another locale is of course also helpful.  I quickly tried another one,
> > but since I don't regularly do so, it's easy for me to miss seeing a
> > problem.  :)
> OK, running it with en_US.UTF-8 now.
No problems here, still using it.

Re: Updating gettext autoconf macros to 0.21

[David J. Weller-Fahy]

* Kevin J. McCarthy  [2021-02-12 12:48 -0500]:

On Thu, Feb 11, 2021 at 07:27:00PM -0500, David J. Weller-Fahy wrote:

I've successfully configured/made the branch, and will run it for a
few days to see if I get anything wonky. :)


Thank you Dave.


No issues here so far - I've been running it since my last message.

-dave


signature.asc
Description: PGP signature

Re: Updating gettext autoconf macros to 0.21

[Kevin J. McCarthy]

On Thu, Feb 11, 2021 at 03:10:57PM -0800, Kevin J. McCarthy wrote:

TL;DR:
I've had on my todo list for a while to dig into the gettext autoconf 
stuff and see if I could upgrade it.  I've pushed the result to branch 
'kevin/gettext-update' on gitlab (or sr.ht).  If you have a chance, 
please give the branch a test.


I'm going to merge and push the branch up to master tomorrow.  Please 
let me know if you see any problems (either before or after the merge).


Thank you!

--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA


signature.asc
Description: PGP signature

Re: Updating gettext autoconf macros to 0.21

[Kevin J. McCarthy]

On Sun, Feb 14, 2021 at 06:57:29PM +0100, Rene Kita wrote:

Including this commit I still got one untracked file
'po/remove-potcdate.sed', but no changed tracked files.


Thanks!  I noticed that too, but unfortunately after I sent the email. 
I've added it to the gitignore file in another commit.


--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA


signature.asc
Description: PGP signature

Re: Updating gettext autoconf macros to 0.21

[Rene Kita]

On Sun, Feb 14, 2021 at 09:47:40AM -0800, Kevin J. McCarthy wrote:
> On Sun, Feb 14, 2021 at 05:34:23PM +0100, Rene Kita wrote:
> > Does is make sense to test this with locale "en_US.UTF-8"?
> 
> It helps to build with any locale, and at least make sure it runs. Testing
> with another locale is of course also helpful.  I quickly tried another one,
> but since I don't regularly do so, it's easy for me to miss seeing a
> problem.  :)
OK, running it with en_US.UTF-8 now.

> > JFYI:
> > Not sure if this intended at the moment or you got some ignore magic
> > going, but after building this branch the repo is left in dirty state
> > here.
> 
> That's a good point.  I *did* notice it updated all the po files the first
> time.  I thought it might have just been an update artifact, but that's not
> a good thing if it happens to everyone who checks out the git repos.
> 
> Hmmm... it looks like there is a Makevars variable, PO_DEPENDS_ON_POT, that
> might address this problem.  Let me set that to 'no' and add a commit for
> that.
Including this commit I still got one untracked file
'po/remove-potcdate.sed', but no changed tracked files.

Re: Updating gettext autoconf macros to 0.21

[Kevin J. McCarthy]

On Sun, Feb 14, 2021 at 05:34:23PM +0100, Rene Kita wrote:

Does is make sense to test this with locale "en_US.UTF-8"?


It helps to build with any locale, and at least make sure it runs. 
Testing with another locale is of course also helpful.  I quickly tried 
another one, but since I don't regularly do so, it's easy for me to miss 
seeing a problem.  :)



JFYI:
Not sure if this intended at the moment or you got some ignore magic
going, but after building this branch the repo is left in dirty state
here.


That's a good point.  I *did* notice it updated all the po files the 
first time.  I thought it might have just been an update artifact, but 
that's not a good thing if it happens to everyone who checks out the git 
repos.


Hmmm... it looks like there is a Makevars variable, PO_DEPENDS_ON_POT, 
that might address this problem.  Let me set that to 'no' and add a 
commit for that.


--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA


signature.asc
Description: PGP signature

Re: Updating gettext autoconf macros to 0.21

[Rene Kita]

On Thu, Feb 11, 2021 at 03:10:57PM -0800, Kevin J. McCarthy wrote:
> Hi Everyone,
Hi Kevin!

> TL;DR:
> I've had on my todo list for a while to dig into the gettext autoconf stuff
> and see if I could upgrade it.  I've pushed the result to branch
> 'kevin/gettext-update' on gitlab (or sr.ht).  If you have a chance, please
> give the branch a test.
Does is make sense to test this with locale "en_US.UTF-8"?

JFYI:
Not sure if this intended at the moment or you got some ignore magic
going, but after building this branch the repo is left in dirty state
here.

Regards,
Rene

Re: Updating gettext autoconf macros to 0.21

[Kevin J. McCarthy]

On Thu, Feb 11, 2021 at 07:27:00PM -0500, David J. Weller-Fahy wrote:
I've successfully configured/made the branch, and will run it for a few 
days to see if I get anything wonky. :)


Thank you Dave.

--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA


signature.asc
Description: PGP signature

Re: Updating gettext autoconf macros to 0.21

[David J. Weller-Fahy]

* Kevin J. McCarthy  [2021-02-11 18:11 -0500]:

Hi Everyone,

TL;DR:
I've had on my todo list for a while to dig into the gettext autoconf 
stuff and see if I could upgrade it.  I've pushed the result to branch 
'kevin/gettext-update' on gitlab (or sr.ht).  If you have a chance, 
please give the branch a test.


...

If you have any problems, or see something I missed, please let me 
know. Thank you!


Kevin,

I've successfully configured/made the branch, and will run it for a
few days to see if I get anything wonky. :)

Thanks!

Regards,
  -dave


signature.asc
Description: PGP signature

Updating gettext autoconf macros to 0.21

[Kevin J. McCarthy]

Hi Everyone,

TL;DR:
I've had on my todo list for a while to dig into the gettext autoconf 
stuff and see if I could upgrade it.  I've pushed the result to branch 
'kevin/gettext-update' on gitlab (or sr.ht).  If you have a chance, 
please give the branch a test.


Details:
The update is the result of running "gettextize -f --no-changelog" and 
then cleaning things up:


- The latest version doesn't have a "bundled" option, so this removed 
the intl directory and --with-included-gettext configure option.


- I've kept the added m4 files unmodified.  The old versions seemed to 
be slightly modified.  I've documented the "owner" of each m4 file in 
m4/README, to make it easier to keep track of what all the stuff in 
there is for.


- configure.ac now calls:
  AM_GNU_GETTEXT([external])
  AM_ICONV
It previously called MUTT_AM_GNU_GETTEXT, which had an MUTT_AM_ICONV 
inside of it.


- I've looked through the old gettext.m4 and other files, to see if I 
missed some important checks.  I don't believe any of the checks there 
were missing from configure.ac.


- A few places in the Mutt code had:
#ifdef HAVE_LOCALE_H
#include 
#endif
The HAVE_LOCALE_H was from the old gettext.m4 file.  Since locale.h is 
a standard C99 header, and was *already* used elsewhere in Mutt without

the #ifdef, I've pulled the #ifdef out.

- Likewise for:
  #ifdef HAVE_UNISTD_H
  #include 
  #endif

- The gettextize recommended including a copy of their "gettext.h" 
instead of directly , so I've made that change in lib.h.  If 
anyone believes this is a bad idea, please let me know.  It's easy 
enough to just keep the  include instead.


- I've added a po/LINGUAS file with the existing po files.

- I've used their template to create a po/Makevars file.

If you have any problems, or see something I missed, please let me know. 
Thank you!


--
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA


signature.asc
Description: PGP signature