eleksir/isida-4
1
Fork 0
Code Activity

Merge branch 'master' of github.com:isida/4

Browse Source
This commit is contained in:
diSabler
2014-05-10 10:04:52 +04:00
parent bb64a3864d 883f8c30d8
commit b3036a4286
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-tools/locale_generator/locale_generator.py
View File

@@ -156,7 +156,7 @@ loc_folder = data_folder % 'locales/%s.txt'
log_folder = data_folder % 'conflogs/%s' log_folder = data_folder % 'conflogs/%s'
public_log = log_folder % 'chatlogs/%s' public_log = log_folder % 'chatlogs/%s'
system_log = log_folder % 'syslogs/%s' system_log = log_folder % 'syslogs/%s'
gmessage = [] gactmessage = []
locale_mark = 'NO_TRANSLATE' locale_mark = 'NO_TRANSLATE'
file_mark = '# file: ' file_mark = '# file: '

8
plugins/ai.py
View File

@@ -54,14 +54,14 @@ def AI_RAW(CMD, RAW, RN):
for t in DRINK: for t in DRINK:
DRINK_LOCALE = L(t, RN).lower() DRINK_LOCALE = L(t, RN).lower()
if DRINK_LOCALE in RAW_SPLIT: INIT_DRINK.append(DRINK_LOCALE) if DRINK_LOCALE in RAW_SPLIT: INIT_DRINK.append(DRINK_LOCALE)
if len(INIT_DRINK) >= 2: return CMD.replace('{RAW}', ' '.join(AI_UNIQUE(INIT_DRINK))), True if len(INIT_DRINK) == 2: return CMD.replace('{RAW}', ' '.join(AI_UNIQUE(INIT_DRINK))), True
else: else:
INIT_DRINK = []
ddate = readfile(date_file).decode('UTF').lower().split('\n') ddate = readfile(date_file).decode('UTF').lower().split('\n')
for DATE in ddate: for DATE in ddate:
DATE_SPLIT = DATE.split() DATE_SPLIT = DATE.split()
for R in RAW_SPLIT: for R in RAW_SPLIT:
if R in DATE_SPLIT: if len(R) > 3 and R in DATE_SPLIT: INIT_DRINK.append(R)
INIT_DRINK.append(R)
if INIT_DRINK: return CMD.replace('{RAW}', ' '.join(AI_UNIQUE(INIT_DRINK))), True if INIT_DRINK: return CMD.replace('{RAW}', ' '.join(AI_UNIQUE(INIT_DRINK))), True
return '', False return '', False
@@ -157,4 +157,4 @@ def AI_PARAMETER(body, type, room):
return RESULT return RESULT
gmessage.append(AI_PARSE) gactmessage.append(AI_PARSE)