Permalink
Browse files

[translations] do not wrap lines

poedit unwraps wrapped lines, causing a large diff
after translation fixes, and again at the next merge.
  • Loading branch information...
andyblac committed Dec 3, 2012
1 parent 6bf1645 commit 78f613d6b8709d0023c9018249e28b19db3e1a38
Showing with 6 additions and 6 deletions.
  1. +3 −3 Rules-po.mak
  2. +3 −3 Rules_noxml-po.mak
View
@@ -9,19 +9,19 @@ LANGPO = $(LANGS:=.po)
if UPDATE_PO
# the TRANSLATORS: allows putting translation comments before the to-be-translated line.
$(PLUGIN)-py.pot: $(srcdir)/../src/*.py
- $(XGETTEXT) -L python --from-code=UTF-8 --add-comments="TRANSLATORS:" -d $(PLUGIN) -s -o $@ $^
+ $(XGETTEXT) --no-wrap -L python --from-code=UTF-8 --add-comments="TRANSLATORS:" -d $(PLUGIN) -s -o $@ $^
$(PLUGIN)-xml.pot: $(top_srcdir)/xml2po.py $(srcdir)/../src/*.xml
$(PYTHON) $^ > $@
$(PLUGIN).pot: $(PLUGIN)-py.pot $(PLUGIN)-xml.pot
sed --in-place $(PLUGIN)-py.pot --expression=s/CHARSET/UTF-8/
sed --in-place $(PLUGIN)-xml.pot --expression=s/CHARSET/UTF-8/
- cat $^ | $(MSGUNIQ) --no-location -o $@
+ cat $^ | $(MSGUNIQ) --no-wrap --no-location -o $@
%.po: $(PLUGIN).pot
if [ -f $@ ]; then \
- $(MSGMERGE) --backup=none --no-location -s -N -U $@ $< && touch $@; \
+ $(MSGMERGE) --backup=none --no-wrap --no-location -s -N -U $@ $< && touch $@; \
else \
$(MSGINIT) -l $@ -o $@ -i $< --no-translator; \
fi
View
@@ -9,15 +9,15 @@ LANGPO = $(LANGS:=.po)
if UPDATE_PO
# the TRANSLATORS: allows putting translation comments before the to-be-translated line.
$(PLUGIN)-py.pot: $(srcdir)/../src/*.py
- $(XGETTEXT) -L python --from-code=UTF-8 --add-comments="TRANSLATORS:" -d $(PLUGIN) -s -o $@ $^
+ $(XGETTEXT) --no-wrap -L python --from-code=UTF-8 --add-comments="TRANSLATORS:" -d $(PLUGIN) -s -o $@ $^
$(PLUGIN).pot: $(PLUGIN)-py.pot
sed --in-place $(PLUGIN)-py.pot --expression=s/CHARSET/UTF-8/
- $(MSGUNIQ) $^ -o $@
+ $(MSGUNIQ) --no-wrap --no-location $^ -o $@
%.po: $(PLUGIN).pot
if [ -f $@ ]; then \
- $(MSGMERGE) --backup=none --no-location -s -N -U $@ $< && touch $@; \
+ $(MSGMERGE) --backup=none --no-wrap --no-location -s -N -U $@ $< && touch $@; \
else \
$(MSGINIT) -l $@ -o $@ -i $< --no-translator; \
fi

0 comments on commit 78f613d

Please sign in to comment.