]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
po: rename the .mini.po files to have just a .po suffix
authorDaniel P. Berrangé <berrange@redhat.com>
Mon, 18 May 2020 16:43:38 +0000 (17:43 +0100)
committerDaniel P. Berrangé <berrange@redhat.com>
Thu, 4 Jun 2020 10:18:35 +0000 (11:18 +0100)
A .mini.po file is exactly the same format as a .po file. We just used
the alternative extension as we wanted to be able to store both full and
minimized forms in the same directory.

This complicates integration with some translation tools, however, which
only really expect to see $LANG.po as a filename.

With this change we drop the rules for creating non-minimized po files,
and thus the po/*.po are always minimized. A useful side effect is that
we no longer run msgmerge during creation of the gmo files, and thus
don't need to have a date override to get reproducible builds.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
43 files changed:
po/Makefile.am
po/as.po [moved from po/as.mini.po with 100% similarity]
po/bg.po [moved from po/bg.mini.po with 100% similarity]
po/bn_IN.po [moved from po/bn_IN.mini.po with 100% similarity]
po/bs.po [moved from po/bs.mini.po with 100% similarity]
po/ca.po [moved from po/ca.mini.po with 100% similarity]
po/cs.po [moved from po/cs.mini.po with 100% similarity]
po/da.po [moved from po/da.mini.po with 100% similarity]
po/de.po [moved from po/de.mini.po with 100% similarity]
po/el.po [moved from po/el.mini.po with 100% similarity]
po/en_GB.po [moved from po/en_GB.mini.po with 100% similarity]
po/es.po [moved from po/es.mini.po with 100% similarity]
po/fi.po [moved from po/fi.mini.po with 100% similarity]
po/fr.po [moved from po/fr.mini.po with 100% similarity]
po/gu.po [moved from po/gu.mini.po with 100% similarity]
po/hi.po [moved from po/hi.mini.po with 100% similarity]
po/hu.po [moved from po/hu.mini.po with 100% similarity]
po/id.po [moved from po/id.mini.po with 100% similarity]
po/it.po [moved from po/it.mini.po with 100% similarity]
po/ja.po [moved from po/ja.mini.po with 100% similarity]
po/kn.po [moved from po/kn.mini.po with 100% similarity]
po/ko.po [moved from po/ko.mini.po with 100% similarity]
po/mk.po [moved from po/mk.mini.po with 100% similarity]
po/ml.po [moved from po/ml.mini.po with 100% similarity]
po/mr.po [moved from po/mr.mini.po with 100% similarity]
po/ms.po [moved from po/ms.mini.po with 100% similarity]
po/nb.po [moved from po/nb.mini.po with 100% similarity]
po/nl.po [moved from po/nl.mini.po with 100% similarity]
po/or.po [moved from po/or.mini.po with 100% similarity]
po/pa.po [moved from po/pa.mini.po with 100% similarity]
po/pl.po [moved from po/pl.mini.po with 100% similarity]
po/pt.po [moved from po/pt.mini.po with 100% similarity]
po/pt_BR.po [moved from po/pt_BR.mini.po with 100% similarity]
po/ru.po [moved from po/ru.mini.po with 100% similarity]
po/sr.po [moved from po/sr.mini.po with 100% similarity]
po/sr@latin.po [moved from po/sr@latin.mini.po with 100% similarity]
po/sv.po [moved from po/sv.mini.po with 100% similarity]
po/ta.po [moved from po/ta.mini.po with 100% similarity]
po/te.po [moved from po/te.mini.po with 100% similarity]
po/uk.po [moved from po/uk.mini.po with 100% similarity]
po/vi.po [moved from po/vi.mini.po with 100% similarity]
po/zh_CN.po [moved from po/zh_CN.mini.po with 100% similarity]
po/zh_TW.po [moved from po/zh_TW.mini.po with 100% similarity]

index ce9338aa942e52d809a0d0628eb9138813d66846..224f16e99347993867b4ef1f44b9b2ec2d41cf8f 100644 (file)
@@ -11,16 +11,15 @@ POTFILES: $(POTFILES_IN)
                $(SED) 's|[@]BUILDDIR[@]|$(top_builddir)|' > $@
 POTFILE_DEPS = $(shell cat POTFILES)
 POTFILE := $(DOMAIN).pot
-POMINIFILES := $(LANGS:%=%.mini.po)
 POFILES := $(LANGS:%=%.po)
 GMOFILES := $(LANGS:%=%.gmo)
 
-CLEANFILES = $(POTFILE) $(POFILES) $(GMOFILES) POTFILES
+CLEANFILES = $(POTFILE) $(GMOFILES) POTFILES
 
 EXTRA_DIST = \
        LINGUAS \
        $(POTFILES_IN) \
-       $(POMINIFILES)
+       $(POFILES)
 
 if HAVE_GNU_GETTEXT_TOOLS
 
@@ -35,33 +34,23 @@ XGETTEXT_ARGS = \
        --msgid-bugs-address="$(MSGID_BUGS_ADDRESS)" \
        $(NULL)
 
-POT_CREATION_DATE = $(shell \
-       if test -n "$$SOURCE_DATE_EPOCH"; \
-       then \
-               date --date="@$$SOURCE_DATE_EPOCH" +"%F %R%z"; \
-       else \
-               date +'%F %R%z'; \
-       fi)
-
 SED_PO_FIXUP_ARGS = \
        -e "s|text/plain; charset=CHARSET|text/plain; charset=UTF-8|g" \
        -e "s|SOME DESCRIPTIVE TITLE|Libvirt package strings|g" \
        -e "s|Copyright (C) YEAR|Copyright (C) $$(date +'%Y')|" \
-       -e "s|POT-Creation-Date:[^\]*|POT-Creation-Date: $(POT_CREATION_DATE)|" \
        $(NULL)
 
-update-po: $(POFILES)
-
 update-gmo: $(GMOFILES)
 
-update-mini-po: $(POTFILE)
+update-po: $(POTFILE)
        for lang in $(LANGS); do \
          echo "Minimizing $$lang content" && \
          $(MSGMERGE) --no-location --no-fuzzy-matching --sort-output \
            $$lang.po $(POTFILE) | \
          $(SED) $(SED_PO_FIXUP_ARGS) | \
          $(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/minimize-po.py > \
-           $(srcdir)/$$lang.mini.po ; \
+           $(srcdir)/$$lang.po-t && \
+         mv $$lang.po-t $$lang.po
        done
 
 push-pot: $(POTFILE)
@@ -77,7 +66,7 @@ pull-po: $(POTFILE)
                --create-skeletons \
                --transdir $(builddir) \
                --srcdir $(srcdir)
-       $(MAKE) update-mini-po
+       $(MAKE) update-po
        $(MAKE) update-gmo
 
 $(POTFILE): POTFILES $(POTFILE_DEPS)
@@ -86,16 +75,12 @@ $(POTFILE): POTFILES $(POTFILE_DEPS)
        $(SED) $(SED_PO_FIXUP_ARGS) < $@-t > $@
        rm -f $@-t
 
-%.po: %.mini.po $(POTFILE)
-       $(MSGMERGE) --no-fuzzy-matching $< $(POTFILE) | \
-         $(SED) $(SED_PO_FIXUP_ARGS) > $@
-
 %.gmo: %.po
        rm -f $@ $@-t
        $(MSGFMT) -c -o $@-t $<
        mv $@-t $@
 
-.PRECIOUS: $(POTFILE) $(POFILES)
+.PRECIOUS: $(POTFILE)
 
 endif HAVE_GNU_GETTEXT_TOOLS
 
similarity index 100%
rename from po/as.mini.po
rename to po/as.po
similarity index 100%
rename from po/bg.mini.po
rename to po/bg.po
similarity index 100%
rename from po/bn_IN.mini.po
rename to po/bn_IN.po
similarity index 100%
rename from po/bs.mini.po
rename to po/bs.po
similarity index 100%
rename from po/ca.mini.po
rename to po/ca.po
similarity index 100%
rename from po/cs.mini.po
rename to po/cs.po
similarity index 100%
rename from po/da.mini.po
rename to po/da.po
similarity index 100%
rename from po/de.mini.po
rename to po/de.po
similarity index 100%
rename from po/el.mini.po
rename to po/el.po
similarity index 100%
rename from po/en_GB.mini.po
rename to po/en_GB.po
similarity index 100%
rename from po/es.mini.po
rename to po/es.po
similarity index 100%
rename from po/fi.mini.po
rename to po/fi.po
similarity index 100%
rename from po/fr.mini.po
rename to po/fr.po
similarity index 100%
rename from po/gu.mini.po
rename to po/gu.po
similarity index 100%
rename from po/hi.mini.po
rename to po/hi.po
similarity index 100%
rename from po/hu.mini.po
rename to po/hu.po
similarity index 100%
rename from po/id.mini.po
rename to po/id.po
similarity index 100%
rename from po/it.mini.po
rename to po/it.po
similarity index 100%
rename from po/ja.mini.po
rename to po/ja.po
similarity index 100%
rename from po/kn.mini.po
rename to po/kn.po
similarity index 100%
rename from po/ko.mini.po
rename to po/ko.po
similarity index 100%
rename from po/mk.mini.po
rename to po/mk.po
similarity index 100%
rename from po/ml.mini.po
rename to po/ml.po
similarity index 100%
rename from po/mr.mini.po
rename to po/mr.po
similarity index 100%
rename from po/ms.mini.po
rename to po/ms.po
similarity index 100%
rename from po/nb.mini.po
rename to po/nb.po
similarity index 100%
rename from po/nl.mini.po
rename to po/nl.po
similarity index 100%
rename from po/or.mini.po
rename to po/or.po
similarity index 100%
rename from po/pa.mini.po
rename to po/pa.po
similarity index 100%
rename from po/pl.mini.po
rename to po/pl.po
similarity index 100%
rename from po/pt.mini.po
rename to po/pt.po
similarity index 100%
rename from po/pt_BR.mini.po
rename to po/pt_BR.po
similarity index 100%
rename from po/ru.mini.po
rename to po/ru.po
similarity index 100%
rename from po/sr.mini.po
rename to po/sr.po
similarity index 100%
rename from po/sr@latin.mini.po
rename to po/sr@latin.po
similarity index 100%
rename from po/sv.mini.po
rename to po/sv.po
similarity index 100%
rename from po/ta.mini.po
rename to po/ta.po
similarity index 100%
rename from po/te.mini.po
rename to po/te.po
similarity index 100%
rename from po/uk.mini.po
rename to po/uk.po
similarity index 100%
rename from po/vi.mini.po
rename to po/vi.po
similarity index 100%
rename from po/zh_CN.mini.po
rename to po/zh_CN.po
similarity index 100%
rename from po/zh_TW.mini.po
rename to po/zh_TW.po