changeset 4039:532865ba8334

update i18n scripts to access master18 wiki
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 30 Aug 2008 21:13:44 +0200
parents 5467ef800d48
children 92c5fb24d88c
files Makefile MoinMoin/i18n/tools/mail_i18n-maintainers.txt MoinMoin/i18n/tools/mail_i18n-maintainers2.txt MoinMoin/i18n/tools/po2wiki.py MoinMoin/i18n/tools/wiki2po.py
diffstat 5 files changed, 32 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Aug 26 10:25:31 2008 +0900
+++ b/Makefile	Sat Aug 30 21:13:44 2008 +0200
@@ -13,9 +13,9 @@
 
 install-docs:
 	-mkdir build
-	wget -U MoinMoin/Makefile -O build/INSTALL.html "http://master17.moinmo.in/MoinMoin/InstallDocs?action=print"
+	wget -U MoinMoin/Makefile -O build/INSTALL.html "http://master18.moinmo.in/MoinMoin/InstallDocs?action=print"
 	sed \
-		-e 's#href="/#href="http://master17.moinmo.in/#g' \
+		-e 's#href="/#href="http://master18.moinmo.in/#g' \
 		-e 's#http://[a-z\.]*/wiki/classic/#/wiki/classic/#g' \
 		-e 's#http://[a-z\.]*/wiki/modern/#/wiki/modern/#g' \
 		-e 's#http://[a-z\.]*/wiki/rightsidebar/#/wiki/rightsidebar/#g' \
@@ -25,9 +25,9 @@
         build/INSTALL.html >docs/INSTALL.html
 	-rm build/INSTALL.html
 
-	wget -U MoinMoin/Makefile -O build/UPDATE.html "http://master17.moinmo.in/HelpOnUpdating?action=print"
+	wget -U MoinMoin/Makefile -O build/UPDATE.html "http://master18.moinmo.in/HelpOnUpdating?action=print"
 	sed \
-		-e 's#href="/#href="http://master17.moinmo.in/#g' \
+		-e 's#href="/#href="http://master18.moinmo.in/#g' \
 		-e 's#http://[a-z\.]*/wiki/classic/#/wiki/classic/#g' \
 		-e 's#http://[a-z\.]*/wiki/modern/#/wiki/modern/#g' \
 		-e 's#http://[a-z\.]*/wiki/rightsidebar/#/wiki/rightsidebar/#g' \
@@ -39,7 +39,7 @@
 	-rmdir build
 
 interwiki:
-	wget -U MoinMoin/Makefile -O $(share)/data/intermap.txt "http://master17.moinmo.in/InterWikiMap?action=raw"
+	wget -U MoinMoin/Makefile -O $(share)/data/intermap.txt "http://master18.moinmo.in/InterWikiMap?action=raw"
 	chmod 664 $(share)/data/intermap.txt
 
 check-tabs:
@@ -47,14 +47,14 @@
 
 # Create documentation
 epydoc: patchlevel
-	@epydoc -o ../html-1.7 --name=MoinMoin --url=http://moinmo.in/ --graph=all --graph-font=Arial MoinMoin
+	@epydoc -o ../html-1.8 --name=MoinMoin --url=http://moinmo.in/ --graph=all --graph-font=Arial MoinMoin
 
 # Create new underlay directory from MoinMaster
 # Should be used only on TW machine
 underlay:
 	rm -rf $(share)/underlay
-	MoinMoin/script/moin.py --config-dir=/srv/moin/cfg/1.7 --wiki-url=master17.moinmo.in/ maint globaledit
-	MoinMoin/script/moin.py --config-dir=/srv/moin/cfg/1.7 --wiki-url=master17.moinmo.in/ maint reducewiki --target-dir=$(share)/underlay
+	MoinMoin/script/moin.py --config-dir=/srv/moin/cfg/1.8 --wiki-url=master18.moinmo.in/ maint globaledit
+	MoinMoin/script/moin.py --config-dir=/srv/moin/cfg/1.8 --wiki-url=master18.moinmo.in/ maint reducewiki --target-dir=$(share)/underlay
 	rm -rf $(share)/underlay/pages/InterWikiMap
 	rm -rf $(share)/underlay/pages/MoinPagesEditorGroup
 	cd $(share); rm -f underlay.tar; tar cf underlay.tar underlay
--- a/MoinMoin/i18n/tools/mail_i18n-maintainers.txt	Tue Aug 26 10:25:31 2008 +0900
+++ b/MoinMoin/i18n/tools/mail_i18n-maintainers.txt	Sat Aug 30 21:13:44 2008 +0200
@@ -13,17 +13,17 @@
 ============
 
 Please note that we currently have 2 "MoinMaster" wikis:
-    * http://master16.moinmo.in/ (currently same as http://master.moinmo.in/)
-      This wiki is for the 1.6.x releases.
-    * http://master17.moinmo.in/
+    * http://master17.moinmo.in/ (currently same as http://master.moinmo.in/)
       This wiki is for the 1.7.x releases.
+    * http://master18.moinmo.in/
+      This wiki is for the 1.8.x releases.
 
 We need your help again for updating the following (high priority and
 most important stuff is on top of the list):
 
-[X] If you didn't do this already for the 1.6 release:
+[X] If you didn't do this already for the 1.7 release:
     Check po file, system and help pages for errors due to conversion
-    to 1.6 markup:
+    to 1.6/1.7 markup:
     * Links have new syntax, see MoinMaster:HelpOnLinking
     * Macros have new syntax, see MoinMaster:HelpOnMacros
     * Check these and other help pages (the converter did most of the
@@ -41,14 +41,14 @@
 [X] "%(lang)s" help pages on the MoinMaster wiki (optional - would be
     nice, if you had the time)
 
-We need that until 2008-05-23 - because MoinMoin 1.7.0 will be released
+We need that until 2008-xx-xx - because MoinMoin 1.8.0 will be released
 then, so we can include that stuff into the distribution archive to make
 people speaking your language happy. ;)
 
 Please, after translating the current stuff, keep an eye on MoinMaster
 wikis - some strings in the PO file may still change or get added/deleted.
 
-See http://moinmo.in/MoinMoinTodo/Release%%201.7 for our planned release schedule.
+See http://moinmo.in/MoinMoinTodo/Release%%201.8 for our planned release schedule.
 
 Please reply immediately
 ========================
--- a/MoinMoin/i18n/tools/mail_i18n-maintainers2.txt	Tue Aug 26 10:25:31 2008 +0900
+++ b/MoinMoin/i18n/tools/mail_i18n-maintainers2.txt	Sat Aug 30 21:13:44 2008 +0200
@@ -3,10 +3,10 @@
 If you are still unfinished with translation - keep in mind that the deadline
 for work on MoinMaster stuff (system texts, system and help pages) is at:
 
-               2008-05-23 16:00 UTC.
+               2008-xx-x 16:00 UTC.
 
 
-We plan to release MoinMoin 1.7.0 soon. If your translation arrives before last
+We plan to release MoinMoin 1.8.0 soon. If your translation arrives before last
 release steps have begun, it might still get in.
 
 If not, we will include it in development of next version, so it will
--- a/MoinMoin/i18n/tools/po2wiki.py	Tue Aug 26 10:25:31 2008 +0900
+++ b/MoinMoin/i18n/tools/po2wiki.py	Sat Aug 30 21:13:44 2008 +0200
@@ -4,10 +4,17 @@
     prepend some processing instructions to a .po file to be able to put it
     onto moinmaster wiki, letting it get processed by gettext parser
 """
+
+master_url = "http://master18.moinmo.in/?action=xmlrpc2"
+user = "ThomasWaldmann" # must be a known Wiki account
+
+import sys, os
+import xmlrpclib
+
+password = os.environ.get("PASS", "")
+sys.path.insert(0, '../..')
+
 def run():
-    import sys, os, xmlrpclib
-    sys.path.insert(0, '../..')
-
     excluded = ["en", ] # languages managed in repository, not in wiki
 
     lang = sys.argv[1]
@@ -40,12 +47,10 @@
 %s""" % (lang, lang, data)
 
 
-    user = "ThomasWaldmann" # must be a known Wiki account
-    password = os.environ.get("PASS", "")
     pagename = "MoinI18n/%s" % lang
     pagedata = data.encode('utf-8')
 
-    wiki = xmlrpclib.ServerProxy("http://master17.moinmo.in/?action=xmlrpc2")
+    wiki = xmlrpclib.ServerProxy(master_url)
     token = wiki.getAuthToken(user, password)
     mc = xmlrpclib.MultiCall(wiki)
     mc.applyAuthToken(token)
--- a/MoinMoin/i18n/tools/wiki2po.py	Tue Aug 26 10:25:31 2008 +0900
+++ b/MoinMoin/i18n/tools/wiki2po.py	Sat Aug 30 21:13:44 2008 +0200
@@ -2,6 +2,9 @@
 """
     get latest translation page content from the wiki and write it to *.po
 """
+
+master_url = "http://master18.moinmo.in/?action=xmlrpc2"
+
 DOMAIN = "MoinMoin"
 
 def run():
@@ -13,7 +16,7 @@
     lang = sys.argv[1]
 
     if not lang in excluded:
-        wiki = xmlrpclib.ServerProxy("http://master17.moinmo.in/?action=xmlrpc2")
+        wiki = xmlrpclib.ServerProxy(master_url)
 
         pagename = "MoinI18n/%s" % lang
         print pagename