* Smarter detection of no-op changes to po files.
parent
99947c04cd
commit
d0804acdc2
|
@ -24,8 +24,9 @@ ikiwiki (1.44) UNRELEASED; urgency=low
|
||||||
This lets ikiwiki not build depend on perlmagic.
|
This lets ikiwiki not build depend on perlmagic.
|
||||||
* Detect old versions of xgettext and avoid using them.
|
* Detect old versions of xgettext and avoid using them.
|
||||||
* perl is broken: print "" || die fails! Work around this insanity.
|
* perl is broken: print "" || die fails! Work around this insanity.
|
||||||
|
* Smarter detection of no-op changes to po files.
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Tue, 20 Feb 2007 17:13:37 -0500
|
-- Joey Hess <joeyh@debian.org> Tue, 20 Feb 2007 18:12:44 -0500
|
||||||
|
|
||||||
ikiwiki (1.43) unstable; urgency=low
|
ikiwiki (1.43) unstable; urgency=low
|
||||||
|
|
||||||
|
|
|
@ -29,9 +29,9 @@ clean:
|
||||||
%.po: ikiwiki.pot
|
%.po: ikiwiki.pot
|
||||||
@echo -n "Merging ikiwiki.pot and $@"
|
@echo -n "Merging ikiwiki.pot and $@"
|
||||||
@msgmerge $@ ikiwiki.pot -o $@.new 2>&1
|
@msgmerge $@ ikiwiki.pot -o $@.new 2>&1
|
||||||
# Typically all that changes was a date. I'd prefer not to commit such
|
# Typically all that changes was a date or line number. I'd prefer not to
|
||||||
# changes, so detect and ignore them.
|
# commit such changes, so detect and ignore them.
|
||||||
@if [ "`diff $@ $@.new | grep '[<>]' | wc -l`" -ne 2 ]; then \
|
@if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \
|
||||||
mv -f $@.new $@; \
|
mv -f $@.new $@; \
|
||||||
else \
|
else \
|
||||||
rm -f $@.new; \
|
rm -f $@.new; \
|
||||||
|
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2007-02-19 23:10-0500\n"
|
"POT-Creation-Date: 2007-02-20 18:12-0500\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
@ -449,7 +449,7 @@ msgstr ""
|
||||||
#. translators: preprocessor directive name,
|
#. translators: preprocessor directive name,
|
||||||
#. translators: the second a page name, the
|
#. translators: the second a page name, the
|
||||||
#. translators: third a number.
|
#. translators: third a number.
|
||||||
#: ../IkiWiki.pm:558
|
#: ../IkiWiki.pm:560
|
||||||
#, perl-format
|
#, perl-format
|
||||||
msgid "%s preprocessing loop detected on %s at depth %i"
|
msgid "%s preprocessing loop detected on %s at depth %i"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
Loading…
Reference in New Issue