From c3c8a78937af5fe0ef0f6f06feaf0e4a56b66053 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 6 Mar 2015 14:01:10 +0300 Subject: lang: replace tabs to spaces. --- lang/converttopo.py | 108 +++++++------- lang/updatelang.py | 414 ++++++++++++++++++++++++++-------------------------- 2 files changed, 261 insertions(+), 261 deletions(-) diff --git a/lang/converttopo.py b/lang/converttopo.py index 1e6332d..279e09f 100755 --- a/lang/converttopo.py +++ b/lang/converttopo.py @@ -22,69 +22,69 @@ itemNamesByName = dict() def loadFiles(dir): - with open(dir + "/langs.txt", "r") as f: - for line in f: - langs.add(line[:-1]) + with open(dir + "/langs.txt", "r") as f: + for line in f: + langs.add(line[:-1]) - for file in langs: - if file == "en": - langFiles[file] = parseFile(dir + "/lang_" + file + ".txt", True, True) - else: - langFiles[file] = parseFile(dir + "/lang_" + file + ".txt", True, False) + for file in langs: + 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, isBaseLang): - trans = dict() - firstLine = None - if os.path.exists(name): - with open(name, "r") as f: - line1 = ""; - line2 = ""; - for line in f: - if readFirstLine is True and firstLine is None: - firstLine = line - continue - - if (line == ""): - line1 = "" - line2 = "" - continue - elif (line1 == ""): - line1 = line[:-1] - continue - - line2 = line[:-1] - if isBaseLang: - trans[line1] = line1 - else: - trans[line1] = line2 - line1 = "" - line2 = "" - return (trans, firstLine) + trans = dict() + firstLine = None + if os.path.exists(name): + with open(name, "r") as f: + line1 = ""; + line2 = ""; + for line in f: + if readFirstLine is True and firstLine is None: + firstLine = line + continue + + if (line == ""): + line1 = "" + line2 = "" + continue + elif (line1 == ""): + line1 = line[:-1] + continue + + line2 = line[:-1] + if isBaseLang: + trans[line1] = line1 + else: + trans[line1] = line2 + line1 = "" + line2 = "" + return (trans, firstLine) def saveFiles(name): - for filen in langFiles: - saveFile(name, filen) + for filen in langFiles: + saveFile(name, filen) def saveFile(path, name): - print str(name) - with open (path + "/" + name + ".po", "w") as w: - lang = langFiles[name] - w.write ("# " + lang[1] + "") - w.write ("#\n\n") - w.write ("msgid \"\"\n") - w.write ("msgstr \"\"\n") - w.write ("\"Project-Id-Version: EvolOnline\\n\"\n") - w.write ("\"MIME-Version: 1.0\\n\"\n") - w.write ("\"Content-Type: text/plain; charset=UTF-8\\n\"\n") - w.write ("\"Content-Transfer-Encoding: 8bit\\n\"\n") - w.write ("\n") - for line in lang[0].keys(): - line2 = line.replace("\"", "\\\"") - w.write ("msgid \"" + line2 + "\"\n") - line2 = lang[0][line].replace("\"", "\\\"") - w.write ("msgstr \"" + line2 + "\"\n\n") + print str(name) + with open (path + "/" + name + ".po", "w") as w: + lang = langFiles[name] + w.write ("# " + lang[1] + "") + w.write ("#\n\n") + w.write ("msgid \"\"\n") + w.write ("msgstr \"\"\n") + w.write ("\"Project-Id-Version: EvolOnline\\n\"\n") + w.write ("\"MIME-Version: 1.0\\n\"\n") + w.write ("\"Content-Type: text/plain; charset=UTF-8\\n\"\n") + w.write ("\"Content-Transfer-Encoding: 8bit\\n\"\n") + w.write ("\n") + for line in lang[0].keys(): + line2 = line.replace("\"", "\\\"") + w.write ("msgid \"" + line2 + "\"\n") + line2 = lang[0][line].replace("\"", "\\\"") + w.write ("msgstr \"" + line2 + "\"\n\n") rootPath = "../../server-data" diff --git a/lang/updatelang.py b/lang/updatelang.py index 040fc04..c93ea24 100755 --- a/lang/updatelang.py +++ b/lang/updatelang.py @@ -27,249 +27,249 @@ langs = set() itemNamesByName = dict() def collectStrings(parentDir): - global itemNamesByName - files = os.listdir(parentDir) - for file1 in files: - if file1[0] == ".": - continue - file2 = os.path.abspath(parentDir + os.path.sep + file1) - if not os.path.isfile(file2): - collectStrings(file2) - elif filt.search(file1): - with open(file2, "r") as f: - for line in f: - m = strre1.findall(line) - 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 and m.group("str")[0] != "#": - allStrings.add(m.group("str")) - m = strre3.findall(line) - if len(m) > 0: - for str in m: - if str.lower() in itemNamesByName: - allStrings.add(itemNamesByName[str.lower()]) - m = strre5.findall(line) - if len(m) > 0: - for str in m: - if str.lower() in itemNamesByName: - allStrings.add(itemNamesByName[str.lower()]) - m = strre6.findall(line) - if len(m) > 0: - for str in m: - allStrings.add(str) - m = strre7.findall(line) - if len(m) > 0: - for str in m: - allStrings.add(str[0] + "#0") - allStrings.add(str[2] + "#1") + global itemNamesByName + files = os.listdir(parentDir) + for file1 in files: + if file1[0] == ".": + continue + file2 = os.path.abspath(parentDir + os.path.sep + file1) + if not os.path.isfile(file2): + collectStrings(file2) + elif filt.search(file1): + with open(file2, "r") as f: + for line in f: + m = strre1.findall(line) + 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 and m.group("str")[0] != "#": + allStrings.add(m.group("str")) + m = strre3.findall(line) + if len(m) > 0: + for str in m: + if str.lower() in itemNamesByName: + allStrings.add(itemNamesByName[str.lower()]) + m = strre5.findall(line) + if len(m) > 0: + for str in m: + if str.lower() in itemNamesByName: + allStrings.add(itemNamesByName[str.lower()]) + m = strre6.findall(line) + if len(m) > 0: + for str in m: + allStrings.add(str) + m = strre7.findall(line) + if len(m) > 0: + for str in m: + allStrings.add(str[0] + "#0") + allStrings.add(str[2] + "#1") def loadFiles(dir): - with open(dir + "/langs.txt", "r") as f: - for line in f: - langs.add(line[:-1]) + with open(dir + "/langs.txt", "r") as f: + for line in f: + langs.add(line[:-1]) - for file in langs: - langFiles[file] = parseFile(dir + "/lang_" + file + ".txt", True) - oldLangFiles[file] = parseFile(dir + "/lang_" + file + ".old", False) + for file in langs: + langFiles[file] = parseFile(dir + "/lang_" + file + ".txt", True) + oldLangFiles[file] = parseFile(dir + "/lang_" + file + ".old", False) def parseFile(name, readFirstLine): - trans = dict() - firstLine = None - if os.path.exists(name): - with open(name, "r") as f: - line1 = ""; - line2 = ""; - for line in f: - if readFirstLine is True and firstLine is None: - firstLine = line - continue - - if (line == ""): - line1 = "" - line2 = "" - continue - elif (line1 == ""): - line1 = line[:-1] - continue - - line2 = line[:-1] - trans[line1] = line2 - line1 = "" - line2 = "" - elif readFirstLine: - firstLine = "Copyright (C) 2010-2015 Evol Online\n" - return (trans, firstLine) + trans = dict() + firstLine = None + if os.path.exists(name): + with open(name, "r") as f: + line1 = ""; + line2 = ""; + for line in f: + if readFirstLine is True and firstLine is None: + firstLine = line + continue + + if (line == ""): + line1 = "" + line2 = "" + continue + elif (line1 == ""): + line1 = line[:-1] + continue + + line2 = line[:-1] + trans[line1] = line2 + line1 = "" + line2 = "" + elif readFirstLine: + firstLine = "Copyright (C) 2010-2015 Evol Online\n" + return (trans, firstLine) def loadPoFiles(podir): files = os.listdir(podir) for name in files: - parsePoFile(name[:-3], podir + "/" + name) + parsePoFile(name[:-3], podir + "/" + name) def parsePoFile(name, path): - langFile = langFiles[name][0] - with open(path, "r") as f: - flag = 0 - line1 = "" - line2 = "" - for line in f: - if flag == 0: - idx = line.find ("msgid ") - if idx == 0: - line2 = "" - line1 = line[len("msgid "):] - line1 = line1[1:len(line1) - 2] - flag = 1 - elif flag == 1: - idx = line.find ("msgstr ") - if idx == 0: - line2 = line[len("msgstr "):] - line2 = line2[1:len(line2) - 2] - flag = 2 - if line == "\n": - if flag == 2: - if line1 != "": - if line1 in langFile and line2 != "": - langFile[line1] = line2.replace("\\\"", "\""); - flag = 0 - - idx = line.find ("\"") - if idx == 0: - line = line[1:len(line) - 2] - if flag == 1: - line1 = line1 + line - elif flag == 2: - line2 = line2 + line + langFile = langFiles[name][0] + with open(path, "r") as f: + flag = 0 + line1 = "" + line2 = "" + for line in f: + if flag == 0: + idx = line.find ("msgid ") + if idx == 0: + line2 = "" + line1 = line[len("msgid "):] + line1 = line1[1:len(line1) - 2] + flag = 1 + elif flag == 1: + idx = line.find ("msgstr ") + if idx == 0: + line2 = line[len("msgstr "):] + line2 = line2[1:len(line2) - 2] + flag = 2 + if line == "\n": + if flag == 2: + if line1 != "": + if line1 in langFile and line2 != "": + langFile[line1] = line2.replace("\\\"", "\""); + flag = 0 + + idx = line.find ("\"") + if idx == 0: + line = line[1:len(line) - 2] + if flag == 1: + line1 = line1 + line + elif flag == 2: + line2 = line2 + line def addMissingLines(): - for trans in langFiles: - newFile = langFiles[trans][0] - oldFile = oldLangFiles[trans][0] - for str in newFile: - if str not in allStrings: -# if newFile[str] != "": - oldFile[str] = newFile[str] - for str in oldFile: - if str in newFile: - del newFile[str] -# print trans + ":moved to old: " + str - - for str in allStrings: - for trans in langFiles: - newFile = langFiles[trans][0] - oldFile = oldLangFiles[trans][0] - if str not in newFile: -# print "lang: " + trans + ", str: " + str - if trans == defaultLang: -# print "newFile[str] = str" - newFile[str] = str - elif str in oldFile: - newFile[str] = oldFile[str] -# print "newFile[str] = oldFile[str]: " + newFile[str] - else: -# print "newFile[str] = """ - newFile[str] = "" -# print trans + ":new string: " + str + for trans in langFiles: + newFile = langFiles[trans][0] + oldFile = oldLangFiles[trans][0] + for str in newFile: + if str not in allStrings: +# if newFile[str] != "": + oldFile[str] = newFile[str] + for str in oldFile: + if str in newFile: + del newFile[str] +# print trans + ":moved to old: " + str + + for str in allStrings: + for trans in langFiles: + newFile = langFiles[trans][0] + oldFile = oldLangFiles[trans][0] + if str not in newFile: +# print "lang: " + trans + ", str: " + str + if trans == defaultLang: +# print "newFile[str] = str" + newFile[str] = str + elif str in oldFile: + newFile[str] = oldFile[str] +# print "newFile[str] = oldFile[str]: " + newFile[str] + else: +# print "newFile[str] = """ + newFile[str] = "" +# print trans + ":new string: " + str def sorting(): - for trans in langFiles: - newFile = langFiles[trans] - newFile = sortDict (newFile) - langFiles[trans] = newFile - oldFile = oldLangFiles[trans] - oldFile = sortDict (oldFile) - oldLangFiles[trans] = oldFile + for trans in langFiles: + newFile = langFiles[trans] + newFile = sortDict (newFile) + langFiles[trans] = newFile + oldFile = oldLangFiles[trans] + oldFile = sortDict (oldFile) + oldLangFiles[trans] = oldFile def sortDict(adict): - d2 = [] - keys = adict[0].keys() - keys.sort() + d2 = [] + keys = adict[0].keys() + keys.sort() - for key in keys: - d2.append ((key, adict[0][key])) - return (d2, adict[1]) + for key in keys: + d2.append ((key, adict[0][key])) + return (d2, adict[1]) def saveFiles(dir): - for trans in langFiles: - writeFile (dir + "/lang_" + trans + ".txt", langFiles[trans], trans, False) - writeFile (dir + "/lang_" + trans + ".old", oldLangFiles[trans], trans, True) + for trans in langFiles: + writeFile (dir + "/lang_" + trans + ".txt", langFiles[trans], trans, False) + writeFile (dir + "/lang_" + trans + ".old", oldLangFiles[trans], trans, True) def writeFile(dir, texts, trans, isold): - with open (dir, "w") as f: - if texts[1] is not None: - f.write(texts[1]) - for line in texts[0]: - if not isold or (line[1] is not None and len(line[1]) > 0): - f.write (line[0] + "\n") - trLine = line[1] - if trans == "en": - if len(trLine) > 2 and (trLine[-2:] == "#0" or trLine[-2:] == "#1"): - trLine = trLine[:-2] - f.write (trLine + "\n\n") + with open (dir, "w") as f: + if texts[1] is not None: + f.write(texts[1]) + for line in texts[0]: + if not isold or (line[1] is not None and len(line[1]) > 0): + f.write (line[0] + "\n") + trLine = line[1] + if trans == "en": + if len(trLine) > 2 and (trLine[-2:] == "#0" or trLine[-2:] == "#1"): + trLine = trLine[:-2] + f.write (trLine + "\n\n") def stripQuotes(data): - if len(data) == 0: - return data - if data[-1] == "\"": - data = data[:-1] - if data[0] == "\"": - data = data[1:] - if data[-1] == "'": - data = data[:-1] - if data[0] == "'": - data = data[1:] - return data + if len(data) == 0: + return data + if data[-1] == "\"": + data = data[:-1] + if data[0] == "\"": + data = data[1:] + if data[-1] == "'": + data = data[:-1] + if data[0] == "'": + data = data[1:] + return data def loadItemDb(dir): - global itemNamesByName - with open(dir + "/item_db.conf", "r") as f: - for line in f: - line = line.strip() - if line == "{": - itemId = "" - itemName = "" - for line in f: - line = line.strip() - if line[0] == "}": - if itemId != "" and itemName != "": - itemNamesByName[itemName.lower()] = itemName - break - if len(line) > 6 and line[:5] == "Name:": - itemName = stripQuotes(line[5:].strip()) - if len(line) > 4 and line[:3] == "Id:": - itemId = stripQuotes(line[3:].strip()) + global itemNamesByName + with open(dir + "/item_db.conf", "r") as f: + for line in f: + line = line.strip() + if line == "{": + itemId = "" + itemName = "" + for line in f: + line = line.strip() + if line[0] == "}": + if itemId != "" and itemName != "": + itemNamesByName[itemName.lower()] = itemName + break + if len(line) > 6 and line[:5] == "Name:": + itemName = stripQuotes(line[5:].strip()) + if len(line) > 4 and line[:3] == "Id:": + itemId = stripQuotes(line[3:].strip()) def dumpTranslations(): - for trans in oldLangFiles: - print "old lang: " + trans - newFile = oldLangFiles[trans][0] - for line in newFile: - print line - if line in newFile: - print newFile[line] - print "\n" - for trans in langFiles: - print "new lang: " + trans - newFile = langFiles[trans][0] - for line in newFile: - print line - if line in newFile: - print newFile[line] - print "\n" + for trans in oldLangFiles: + print "old lang: " + trans + newFile = oldLangFiles[trans][0] + for line in newFile: + print line + if line in newFile: + print newFile[line] + print "\n" + for trans in langFiles: + print "new lang: " + trans + newFile = langFiles[trans][0] + for line in newFile: + print line + if line in newFile: + print newFile[line] + print "\n" rootPath = "../../server-data/" -- cgit v1.2.3-60-g2f50