automatic, command-line conversion

diff --git a/mods/friendica-to-smarty-tpl.py b/mods/friendica-to-smarty-tpl.py
index ff1a102a44de894bde28b5c914df19b602d340c2..369b8ea9a885ae85f7c2822c4cb82c67a39b6f22 100755 (executable)
--- a/mods/friendica-to-smarty-tpl.py
+++ b/mods/friendica-to-smarty-tpl.py
@@ -1,10 +1,11 @@
 #!/usr/bin/python
 #
 # Script to convert Friendica internal template files into Smarty template files
-# Copyright 2012 Zach Prezkuta
+# Copyright 2013 Zach Prezkuta
 # Licensed under GPL v3
 
 import os, re, string
+import sys, getopt
 
 ldelim = '{{'
 rdelim = '}}'
@@ -170,7 +171,37 @@ def convert(filename, tofilename, php_tpl):
                tofilename.write(newline)
 
 
-path = raw_input('Path to template folder to convert: ')
+def help(pname):
+       print "\nUsage:"
+       print "\t" + pname + " -h\n\n\t\t\tShow this help screen\n"
+       print "\t" + pname + " -p directory\n\n\t\t\tConvert all .tpl files in directory to\n\t\t\tSmarty templates in directory/smarty3/\n"
+       print "\t" + pname + "\n\n\t\t\tInteractive mode\n"
+
+
+
+
+#
+# Main script
+#
+
+path = ''
+
+try:
+       opts, args = getopt.getopt(sys.argv[1:], "hp:")
+       for opt, arg in opts:
+               if opt == '-h':
+                       help(sys.argv[0])
+                       sys.exit()
+               elif opt == '-p':
+                       path = arg
+except getopt.GetoptError:
+       help(sys.argv[0])
+       sys.exit(2)
+       
+
+if path == '':
+       path = raw_input('Path to template folder to convert: ')
+
 if path[-1:] != '/':
        path = path + '/'
 

diff --git a/mods/updatetpl.py b/mods/updatetpl.py
new file mode 100755 (executable)
index 0000000..aa81591
--- /dev/null
+++ b/mods/updatetpl.py
@@ -0,0 +1,64 @@
+#!/usr/bin/python
+#
+# Script to update Smarty template files from all internal templates
+# Copyright 2013 Zach Prezkuta
+# Licensed under GPL v3
+
+
+import os
+import sys, getopt
+import subprocess
+
+
+def help(pname):
+       print "\nUsage:"
+       print "\t" + pname + " -h\n\n\t\t\tShow this help screen\n"
+       print "\t" + pname + " -p directory\n\n\t\t\tConvert all .tpl files in top-level\n\t\t\tFriendica directory to Smarty templates\n"
+       print "\t" + pname + "\n\n\t\t\tInteractive mode\n"
+
+
+
+#
+# Main script
+#
+
+path = ''
+
+try:
+       opts, args = getopt.getopt(sys.argv[1:], "hp:")
+       for opt, arg in opts:
+               if opt == '-h':
+                       help(sys.argv[0])
+                       sys.exit()
+               elif opt == '-p':
+                       path = arg
+except getopt.GetoptError:
+       help(sys.argv[0])
+       sys.exit(2)
+
+if path == '':
+       path = raw_input('Path to top-level Friendica directory: ')
+
+if path[-1:] != '/':
+       path = path + '/'
+
+tplpaths = ['view/']
+names = os.listdir(path + 'view/')
+for name in names:
+       if os.path.isdir(path + 'view/' + name):
+               if name != 'smarty3' and name != 'theme':
+                       tplpaths.append('view/' + name + '/')
+
+names = os.listdir(path + 'view/theme/')
+for name in names:
+       if os.path.isdir(path + 'view/theme/' + name):
+               tplpaths.append('view/theme/' + name + '/')
+
+fnull = open(os.devnull, "w")
+
+for tplpath in tplpaths:
+       print "Converting " + path + tplpath
+       subprocess.call(['python', path + 'mods/friendica-to-smarty-tpl.py', '-p', path + tplpath], stdout = fnull)
+
+fnull.close()
+

diff --git a/view/de/smarty3/request_notify_eml.tpl b/view/de/smarty3/request_notify_eml.tpl
index de2182e9db1d5a7e7835d80f8c8b8a909b38a782..7493935e9be1bd387c3c7d650b55e51666f501c3 100644 (file)
--- a/view/de/smarty3/request_notify_eml.tpl
+++ b/view/de/smarty3/request_notify_eml.tpl
@@ -7,7 +7,7 @@ erhalten.
 
 Du kannst sein/ihr Profil unter {{$url}} finden.
 
-Bitte melde dich an um die komplette Vorstellung einzusehen 
+Bitte melde dich an um die komplette Anfrage einzusehen 
 und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen.
 
 {{$siteurl}}