Copy beta branch from trunk again

git-svn-id: svn+ssh://svn.gnucash.org/repo/htdocs/branches/beta@20834 57a11ea4-9604-0410-9ed3-97b8803252fd

.htaccess

@@ -1,5 +1,2 @@
-Options MultiViews
 DirectoryIndex index.phtml index.php index.html
 AddType application/x-httpd-php .phtml
-Redirect permanent /rss-feed.phtml http://www.gnucash.org/atom.php
-Redirect permanent /beta/rss-feed.phtml http://www.gnucash.org/beta/atom.php

Makefile

@@ -1,44 +1,29 @@
+iso_languages = de es fr
+languages = ${iso_languages} it ja nb nl pl pt_PT zh_CN
 
-.PHONY: pot mos msgmerge de es fr nb nl pl pt_PT nmz nmz.lang nmz nmz.onefile
+.SECONDEXPANSION:
+
+.PHONY: pot mos msgmerge ${languages} nmz nmz.lang nmz nmz.onefile nmz.locale
 
 pot: po/POTFILES po/gnucash-htdocs.pot
 
 po/POTFILES: .potfiles
-	( find . -type f -name '*.php' -o -name '*.phtml' -maxdepth 1; find externals -name '*.phtml'; find search/templates -name '*.php_tmpl'; ) > po/POTFILES
+	( find . -maxdepth 1 -type f -name '*.php' -o -name '*.phtml'; find externals -name '*.phtml'; find search/templates -name '*.php_tmpl'; ) > po/POTFILES
 
 .potfiles:
 
 po/gnucash-htdocs.pot: po/POTFILES
-	xgettext -f po/POTFILES -L PHP -o po/gnucash-htdocs.pot
+	xgettext -f po/POTFILES -L PHP --keyword="T_" -o po/gnucash-htdocs.pot
 
 msgmerge: po/gnucash-htdocs.pot
-	for f in de es fr nb nl pl pt_PT ; do \
+	for f in ${languages} ; do \
 	  msgmerge -U po/$$f.po po/gnucash-htdocs.pot ; \
 	done
 
-mos: de es fr nb nl pl pt_PT
-
-de: po/de.po
-	msgfmt po/de.po -o de/LC_MESSAGES/gnucash-htdocs.mo
-
-es: po/es.po
-	msgfmt po/es.po -o es/LC_MESSAGES/gnucash-htdocs.mo
-
-fr: po/fr.po
-	msgfmt po/fr.po -o fr/LC_MESSAGES/gnucash-htdocs.mo
-
-nb: po/nb.po
-	msgfmt po/nb.po -o nb/LC_MESSAGES/gnucash-htdocs.mo
-
-nl: po/nl.po
-	msgfmt po/nl.po -o nl/LC_MESSAGES/gnucash-htdocs.mo
-
-pl: po/pl.po
-	msgfmt po/pl.po -o pl/LC_MESSAGES/gnucash-htdocs.mo
-
-pt_PT: po/pt_PT.po
-	msgfmt po/pt_PT.po -o pt_PT/LC_MESSAGES/gnucash-htdocs.mo
+mos: ${languages}
 
+${languages}: po/$$@.po
+	msgfmt $< -o locale/$@/LC_MESSAGES/gnucash-htdocs.mo
 
 ####################################################################
 #
@@ -47,29 +32,36 @@ pt_PT: po/pt_PT.po
 LOCALFILE=local.php
 URLBASE=
 FILETAIL=
+LOCALE=
 FILE=
 HOME=http://www.gnucash.org$(URLBASE)
 TMPLBASE=search/templates/NMZ.
 
 # add when we have utf-8 translations: iconv -f UTF-8 -t ISO8859-1 
 
 nmz.onefile:
-	( echo '<?php include("$(LOCALFILE)"); ' ; \
-	  echo '$$home = "$(HOME)/$$lang_dir"; ' ; \
-	  echo '$$text_dir = "."; ?>'; \
+	( echo '<?php $$locale = "$(LOCALE)"; ?>' ; \
 	  cat $(TMPLBASE)$(FILE).php_tmpl ) | php -q > \
 	  $(TMPLBASE)$(FILE)$(FILETAIL)
 
 nmz.lang:
-	$(MAKE) nmz.onefile FILE=head
-	for f in body foot result.normal result.short tips ; do \
+	for f in head body foot result.normal result.short tips ; do \
 	  $(MAKE) nmz.onefile FILE="$$f"; \
 	done
 
+nmz.locale:
+	# convert to ISO_8859-1
+	for f in $(TMPLBASE)*.$(LOCALE); do \
+	  iconv -f utf-8 -t ISO_8859-1//TRANSLIT -o $$f.local -c $$f ; \
+	  mv $$f.local $$f ; \
+	done
+
 nmz:
 	$(MAKE) nmz.lang
-	# other NMZ langs not merged into po system: ja
 	# note: PL is only "mostly" translated.  it diff's differently
-	for l in de es fr nb nl pl pt_PT ; do \
-	  $(MAKE) nmz.lang LOCALFILE=$$l/local.php FILETAIL=.$$l ; \
+	for l in en ${languages} ; do \
+	  $(MAKE) nmz.lang FILETAIL=.$$l LOCALE=$$l; \
+	done
+	for l in ${iso_languages} ; do \
+	  $(MAKE) nmz.locale LOCALE=$$l; \
 	done

README

@@ -91,7 +91,11 @@ Finally, see the size of the task ahead:
 Whilst editing the translation, run the msgfmt command from time to
 time to catch errors and let you know how much is left to do.
 
-When you come across fuzzy markers: (#, fuzzy), remove them.
+When you come across fuzzy markers: (#, fuzzy), check whether the
+proposed translation is a valid translation. If it is, then remove
+the fuzzy marker. If it is not, either edit the translation and
+remove the fuzzy marker, or leave the fuzzy marker where it is --
+this message will then be treated as untranslated.
 
 When you have no fuzzy and no untranslated messages, update the binary
 translation file for your locale:
@@ -108,17 +112,22 @@ Which will make all the known translations.
 Publishing the website
 ----------------------
 
-Once you've got the website content up to date, you need to publish
-the content from the beta site to the main website (and beta search
-site to the main search site).  To do this, you need to merge your
-changes from the 'trunk' into the 'published' branch.  Here's how you
-do that:
-
-    svn checkout .../repo/htdocs/branches/published htdocs-pub
-    cd htdocs-pub
-    svn log --stop-on-copy emulate-globals.php
-    # find the last merge point from trunk
-    svn merge -r <last_merge_point>:<head_rev> .../htdocs/trunk
-    # resolve conflicts
-    svn commit
-    # Make sure you put <head_rev> into your comment!!!!!!!
+Changes that are committed to 'trunk' are published automatically.
+No other steps are required.
+
+------------------------
+Website beta environment
+------------------------
+
+Some changes may be too drastic or experimental to push to the public
+website. There is a beta website available as well on
+
+http://www.gnucash.org/beta/
+
+To work in this beta environment, checkout the beta branch from svn:
+
+svn checkout http://svn.gnucash.org/repo/htdocs/branches/beta htdocs-beta
+
+WARNING: this branch is currently not kept in sync with trunk. So if you
+         intend to experiment with the current conten in trunk, please ask
+         one of the devs to merge the current trunk to beta first !

atom.php

@@ -1,7 +1,7 @@
 <?php
   // TODO:
   // - reasonable permalinks
-  include("local.php");
+  $top_dir = ".";
 
   $contentType = "application/atom+xml";
   $overrideContentType = $_GET["content-type"];
@@ -40,7 +40,7 @@ function date_convert_news_to_atom($news_date)
   <generator>GnuCash htdocs/trunk/atom.php 1.0 &lt;gnucash-devel@gnucash.org&gt;</generator>
   <logo>http://www.gnucash.org/images/gnucash_logo.png</logo>
   <link rel="alternate" href="http://www.gnucash.org/" />
-  <link rel="self" href="atom.php" />
+  <link rel="self" href="http://www.gnucash.org/atom.php" />
   <?php
   $news_items = get_news($newsdir, $newsdir);
   $news_items = array_slice($news_items, 0, $entry_count);