Merge branch 'master' of ssh://gitent-scm.com/git/evol/privtools

2 files changed, 19 insertions, 5 deletions

diff --git a/lang/converttopo.py b/lang/converttopo.py
index dc746bd..03c6c89 100755
--- a/lang/converttopo.py
+++ b/lang/converttopo.py
@@ -27,9 +27,12 @@ def loadFiles(dir):
 			langs.add(line[:-1])
 
 	for file in langs:
-		langFiles[file] = parseFile(dir + "/lang_" + file + ".txt", True)
+		if file == "en":
+			langFiles[file] = parseFile(dir + "/lang_" + file + ".txt", True, True)
+		else:
+			langFiles[file] = parseFile(dir + "/lang_" + file + ".txt", True, False)
 
-def parseFile(name, readFirstLine):
+def parseFile(name, readFirstLine, isBaseLang):
 	trans = dict()
 	firstLine = None
 	if os.path.exists(name):
@@ -50,7 +53,10 @@ def parseFile(name, readFirstLine):
 					continue
 
 				line2 = line[:-1]
-				trans[line1] = line2
+				if isBaseLang:
+					trans[line1] = line1
+				else:
+					trans[line1] = line2
 				line1 = ""
 				line2 = ""
 	return (trans, firstLine)
@@ -81,7 +87,7 @@ def saveFile(path, name):
 			w.write ("msgstr \"" + line2 + "\"\n\n")
 
 
-rootPath = "../../gittorious/serverdata"
+rootPath = "../../gittorious/serverdata-beta"
 
 loadFiles(rootPath + "/langs")
 saveFiles("po")
diff --git a/lang/updatelang.py b/lang/updatelang.py
index a0ccda4..9fd1459 100755
--- a/lang/updatelang.py
+++ b/lang/updatelang.py
@@ -15,6 +15,7 @@ allStrings = set()
 strre1 = re.compile("[\t +(]l[(][\"](?P<str>[^\"]+)[\"]")
 strre3 = re.compile("[\t +(]getitemlink[(][\"](?P<str>[^\"]+)[\"][)]")
 strre2 =  re.compile("^[^/](.+)[.]gat([^\t]+)[\t](script|shop)[\t](?P<str>[\w ]+)[\t]([\d]+),")
+strre4 = re.compile("[\t +(]lg[(][\"](?P<str>[^\"]+)[\"]")
 itemsplit = re.compile(",")
 
 langFiles = dict() 
@@ -38,6 +39,11 @@ def collectStrings(parentDir):
 					if len(m) > 0:
 						for str in m:
 							allStrings.add(str)
+					m = strre4.findall(line)
+					if len(m) > 0:
+						for str in m:
+							allStrings.add(str + "#0")
+							allStrings.add(str + "#1")
 					m = strre2.search(line)
 					if m is not None:
 						 allStrings.add(m.group("str"))
@@ -81,6 +87,8 @@ def parseFile(name, readFirstLine):
 				trans[line1] = line2
 				line1 = ""
 				line2 = ""
+	elif readFirstLine:
+		firstLine = "Copyright (C) 2010-2012  Evol Online\n"
 	return (trans, firstLine)
 
 
@@ -193,7 +201,7 @@ def loadItemDb(dir):
 				continue
 			itemNamesByName[rows[1].lower().strip()] = rows[2].strip()
 
-rootPath = "../../gittorious/serverdata"
+rootPath = "../../gittorious/serverdata-beta"
 
 loadItemDb(rootPath + "/db")
 collectStrings(rootPath + "/npc")