From 8d8ff5ec76e8b38aecdc295765215c37d1c4acd7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 15 Feb 2011 04:48:44 +0200 Subject: lang: fix some bugs and add support for formatted l script command. --- lang/updatelang.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'lang') diff --git a/lang/updatelang.py b/lang/updatelang.py index 518e403..3cd9a7c 100755 --- a/lang/updatelang.py +++ b/lang/updatelang.py @@ -11,7 +11,8 @@ defaultLang = "en" filt = re.compile(".+[.]txt", re.IGNORECASE) allStrings = set() -strre1 = re.compile("[\t +(]l[(][\"](?P[^\"]+)[\"][)]") +strre1 = re.compile("[\t +(]l[(][\"](?P[^\"]+)[\"]") +#strre3 = re.compile("[\t +(]getitemlink[(][\"](?P[^\"]+)[\"][)]") strre2 = re.compile("^[^/](.+)[.]gat([^\t]+)[\t](script|shop)[\t](?P[\w ]+)[\t]([\d]+),") langFiles = dict() @@ -76,7 +77,8 @@ def addMissingLines(): oldFile = oldLangFiles[trans] for str in newFile: if str not in allStrings: - oldFile[str] = newFile[str] + if newFile[str] != "": + oldFile[str] = newFile[str] for str in oldFile: if str in newFile: del newFile[str] @@ -123,8 +125,9 @@ def writeFile(dir, texts): f.write (line[1] + "\n\n") -collectStrings("../../serverdata/npc") -loadFiles("../../serverdata/langs") +collectStrings("../../privserverdata/npc") +#here need collect names from item_db.txt +loadFiles("../../privserverdata/langs") addMissingLines() sorting() -saveFiles("../../serverdata/langs") +saveFiles("../../privserverdata/langs") -- cgit v1.2.3-70-g09d2