Hello Markus,
unfortunately your commit r69811 breaks PO file compilation in trunk.
When fixing typos, PO files should not be touched directly but just
updated from the fixed source files (make pot && make update-po).
I took the liberty to revert changes to PO files and update them to
include fixed spelling, still fix_typos script should be updated to
exclude locale/po directory.
Wops! I see that the change was backported to 7.2 as r69812! The same
"dance" must be performed there (cd locale/po && svn up -r 69812:69811
&& svn ci && cd .. && make pot && make update-po && svn ci).
On Mon, Nov 14, 2016 at 2:17 PM, Maris Nartiss <maris.gis@gmail.com> wrote:
Hello Markus,
unfortunately your commit r69811 breaks PO file compilation in trunk.
strange, I recompiled twice using "make distclean" and no issues happened.
What was really broken?
When fixing typos, PO files should not be touched directly but just
updated from the fixed source files (make pot && make update-po).
It depends. Single words can be certainly fixed if done both in source
code and po files.
Probably I missed to fix a typo elsewhere in the source code? (would
need the error message to know since it didn't happen here).
I took the liberty to revert changes to PO files and update them to
include fixed spelling, still fix_typos script should be updated to
exclude locale/po directory.
That I already added yesterday:
EXCLUDED_FILES="$EXCLUDED_FILES,*/locale/po/*.po"
Wops! I see that the change was backported to 7.2 as r69812! The same
"dance" must be performed there (cd locale/po && svn up -r 69812:69811
&& svn ci && cd .. && make pot && make update-po && svn ci).
I have compiled on the 3rd machine right now and no issue appeared.
However, I'll redo the po files.
It failed to generate MO files due to duplicate MSGID's. The bad thing
is that make process finishes without error, although halfway make po
has died with a fatal error.
Just check your compiled version locale/blabla/blabla.mo files. There
should be three of them for each language. On my system it generated
just one as make po failed without notification at the end of
compilation.
+1 for exclude fix.
Māris.
2016-11-14 15:26 GMT+02:00 Markus Neteler <neteler@osgeo.org>:
Hi Maris,
On Mon, Nov 14, 2016 at 2:17 PM, Maris Nartiss <maris.gis@gmail.com> wrote:
Hello Markus,
unfortunately your commit r69811 breaks PO file compilation in trunk.
strange, I recompiled twice using "make distclean" and no issues happened.
What was really broken?
When fixing typos, PO files should not be touched directly but just
updated from the fixed source files (make pot && make update-po).
It depends. Single words can be certainly fixed if done both in source
code and po files.
Probably I missed to fix a typo elsewhere in the source code? (would
need the error message to know since it didn't happen here).
I took the liberty to revert changes to PO files and update them to
include fixed spelling, still fix_typos script should be updated to
exclude locale/po directory.
That I already added yesterday:
EXCLUDED_FILES="$EXCLUDED_FILES,*/locale/po/*.po"
Wops! I see that the change was backported to 7.2 as r69812! The same
"dance" must be performed there (cd locale/po && svn up -r 69812:69811
&& svn ci && cd .. && make pot && make update-po && svn ci).
I have compiled on the 3rd machine right now and no issue appeared.
However, I'll redo the po files.
On Mon, Nov 14, 2016 at 2:39 PM, Maris Nartiss <maris.gis@gmail.com> wrote:
It failed to generate MO files due to duplicate MSGID's. The bad thing
is that make process finishes without error, although halfway make po
has died with a fatal error.
Mhh, we need to catch that somehow in the Makefile.
I can read rather fast but meanwhile the terminal became too fast
compared to a decade ago
So, the 7.2.svn is already fixed and committed.
I used "make verify" which I missed to do yesterday.
trunk is work in progress...
Just check your compiled version locale/blabla/blabla.mo files. There
should be three of them for each language. On my system it generated
just one as make po failed without notification at the end of
compilation.
+1 for exclude fix.
While I type also trunk should be updated and changes committed to SVN.
Hope it is all back in order now. Thanks for the feedback.
