Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Integrated po/merge_pot-file.sh into the po/admin Automake file. It

modifies the update-po target so it uses the pot file online instead
of the one it was auto-generating.

git-svn-id: svn://cherokee-project.com/cherokee/trunk@5714 5dc97367-97f1-0310-9951-d761b3857238
  • Loading branch information...
commit e30d49083ca0869f7d447d3db59b0d521d741a55 1 parent e8cfff1
@alobbs alobbs authored
Showing with 15 additions and 18 deletions.
  1. +1 −2  po/Makefile.am
  2. +14 −2 po/admin/Makefile.in.in
  3. +0 −14 po/merge_pot-file.sh
View
3  po/Makefile.am
@@ -4,5 +4,4 @@ test:
./po_stats.py admin/*.po
EXTRA_DIST = \
-po_stats.py \
-merge_pot-file.sh
+po_stats.py
View
16 po/admin/Makefile.in.in
@@ -376,8 +376,20 @@ dist2: stamp-po $(DISTFILES)
done
update-po: Makefile
- $(MAKE) $(DOMAIN).pot-update
- test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+ ## ORIGINAL CODE:
+ # $(MAKE) $(DOMAIN).pot-update
+ # test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+ #
+ ## NEW (alo, 2010 Nov 8)
+ # Download cherokee-full.pot
+ wget -O tmp.pot http://www.cherokee-project.com/download/trunk/cherokee.pot && \
+ rm -f cherokee-full.pot && mv tmp.pot cherokee-full.pot
+ # Update po
+ for i in *.po; do \
+ msgmerge -o "$$i.new" "$$i" cherokee-full.pot && \
+ cp "$$i.new" "$$i" && \
+ rm "$$i.new"; \
+ done
$(MAKE) update-gmo
# General rule for creating PO files.
View
14 po/merge_pot-file.sh
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# Grab the big pot file
-wget -O cherokee-big.pot http://www.cherokee-project.com/download/trunk/cherokee.pot
-
-# Merge po files
-for i in admin/*.po; do
- msgmerge -o $i.new $i cherokee-big.pot && \
- cp $i.new $i && \
- rm $i.new
-done
-
-# Clean up
-rm cherokee-big.pot
Please sign in to comment.
Something went wrong with that request. Please try again.