Merge pull request #470 from 2DU/master

Master

app.py

@@ -19,7 +19,7 @@ import sys
 from func import *
 
 # 버전 표기
-r_ver = 'v3.0.4-Final-Beta'
+r_ver = 'v3.0.4-Final-Beta-' + re.sub('^[0-9]{2}', '', str(int(datetime.datetime.fromtimestamp(os.path.getmtime('app.py')).strftime('%Y%m%d'))))
 print('Version : ' + r_ver)
 
 # set.json 설정 확인
@@ -1939,9 +1939,9 @@ def other():
                     <li><a href="/manager/1">''' + load_lang('admin') + ' ' + load_lang('tool') + '''</a></li>
                 </ul>
                 <br>
-                <h2>''' + load_lang('version') + '''</h2>
+                <h2>''' + load_lang('normal_version') + '''</h2>
                 <ul>
-                    <li>''' + load_lang('version') + ' : <a id="out_link" href="https://github.com/2DU/openNAMU/blob/master/version.md">' + r_ver + '''</a></li>
+                    <li>''' + load_lang('normal_version') + ' : <a id="out_link" href="https://github.com/2DU/openNAMU/blob/master/version.md">' + r_ver + '''</a></li>
                 </ul>''',
     menu = 0
     ))

language/en-US.json

@@ -9,6 +9,7 @@
     "list" : "List",
     "revert" : "Undo",
     "version" : " Ver",
+    "normal_version" : "Version",
     "new" : "New",
     "document" : "Documents",
     "all" : "Everything",

language/ko-KR.json

@@ -9,6 +9,7 @@
     "list": "목록",
     "revert": "되돌리기",
     "version": "판",
+    "normal_version" : "버전",
     "document": "문서",
     "all": "모든",
     "ban": "차단",

set_mark/start.py

@@ -629,7 +629,7 @@ def start(conn, data, title):
     while 1:
         age_data = re.search('\[age\(([0-9]{4}-[0-9]{2}-[0-9]{2})\)\]', data)
         if age_data:
-            age = age_data.groups[0]
+            age = age_data.groups()[0]
 
             old = datetime.datetime.strptime(time[0], '%Y-%m-%d')
             will = datetime.datetime.strptime(age, '%Y-%m-%d')
@@ -643,7 +643,7 @@ def start(conn, data, title):
     while 1:
         dday_data = re.search('\[dday\(([0-9]{4}-[0-9]{2}-[0-9]{2})\)\]', data)
         if dday_data:
-            dday = dday_data.groups[0]
+            dday = dday_data.groups()[0]
 
             old = datetime.datetime.strptime(time[0], '%Y-%m-%d')
             will = datetime.datetime.strptime(dday, '%Y-%m-%d')