Kaynağa Gözat

Merge pull request #1890 from openNAMU/dev

버그 수정
잉여개발기 (SPDV) 2 yıl önce
ebeveyn
işleme
762fbec0ed

+ 4 - 1
lang/en-US.json

@@ -61,6 +61,7 @@
         "check" : "Check",
         "destruction" : "Destruction",
         "tool" : "Tool",
+        "position" : "Position",
         "recent" : "Recently",
         "password" : "Password",
         "login" : "Sign in",
@@ -292,6 +293,8 @@
                 "footnote_number" : "Footnote number output",
                 "only_number" : "Only number",
                 "footnote_real_num_view" : "Footnote original number view",
+                "category_change_title" : "Don't rename documents in category",
+                "table_scroll" : "Use scroll in tables",
             "_comment_" : "Option",
                 "change_to_normal" : "Change to plain text.",
                 "change_to_link" : "Change to Link.",
@@ -563,7 +566,7 @@
             "error_skin_set_old" : "Some older skins may only work by using the old version link.",
             "same_id_exist_error" : "There are users using the same username.",
             "long_id_error" : "Username must be shorter than 32 characters.",
-            "id_char_error" : "Only Korean letters and alphabets are allowed for Username.",
+            "id_char_error" : "Only Korean letters and alphabets and numbers are allowed for Username.",
             "file_exist_error" : "The file does not exist.",
             "password_error" : "Password does not match.",
             "recaptcha_error" : "Pass the reCAPTCHA.",

+ 5 - 2
lang/ko-KR.json

@@ -231,7 +231,7 @@
     "file_name": "파일명",
     "close_discussion": "닫힌 토론",
     "language": "언어",
-    "id_char_error": "오직 한글과 알파벳만 사용 가능합니다.",
+    "id_char_error": "오직 한글과 알파벳, 숫자만 사용 가능합니다.",
     "id_filter_add": "ID 필터 추가",
     "skin": "스킨",
     "user_head": "사용자 <HEAD>",
@@ -564,5 +564,8 @@
     "slow_thread": "토론 올리기 제한 시간",
     "edit_timeout": "렌더링 제한 시간",
     "linux_only": "리눅스 OS 전용",
-    "bbs_post_tool": "BBS 게시글 도구"
+    "bbs_post_tool": "BBS 게시글 도구",
+    "position": "위치",
+    "category_change_title": "분류 내 문서명 변경 금지",
+    "table_scroll": "표에 스크롤 사용"
 }

+ 1 - 0
route/main_sys_restart.py

@@ -11,6 +11,7 @@ def main_sys_restart():
             print('----')
             print('Restart')
 
+            python_ver = ''
             python_ver = str(sys.version_info.major) + '.' + str(sys.version_info.minor)
 
             run_list = [sys.executable, 'python' + python_ver, 'python3', 'python', 'py -' + python_ver]

+ 5 - 3
route/tool/func.py

@@ -35,6 +35,7 @@ if data_up_date == 1:
         f.write(version_list['beta']['r_ver'])
     
     if platform.system() in ('Linux', 'Windows'):
+        python_ver = ''
         python_ver = str(sys.version_info.major) + '.' + str(sys.version_info.minor)
 
         run_list = [sys.executable, 'python' + python_ver, 'python3', 'python', 'py -' + python_ver]
@@ -610,9 +611,7 @@ def update(ver_num, set_data):
 
         if ver_num < 3500355:
             # other coverage 오류 해결
-            curs.execute(db_change(
-                "update other set coverage = '' where coverage is null"
-            ))
+            curs.execute(db_change("update other set coverage = '' where coverage is null"))
 
         if ver_num < 3500358:
             curs.execute(db_change("drop index history_index"))
@@ -652,6 +651,9 @@ def update(ver_num, set_data):
             curs.execute(db_change("drop index history_index"))
             curs.execute(db_change("create index history_index on history (title, ip)"))
 
+        if ver_num < 3500365:
+            curs.execute(db_change("update back set data = '' where data is null"))
+
         conn.commit()
 
         print('Update completed')

+ 1 - 1
route/tool/func_render_namumark.py

@@ -892,7 +892,7 @@ class class_do_render_namumark:
                     
                     link_sub = link_main
                     link_view = ''
-                    if len(link_data) > 1:
+                    if len(link_data) > 1 and link_data[1]:
                         link_view = link_data[1]
 
                     link_main = self.get_tool_data_restore(link_main, do_type = 'slash')

+ 1 - 1
version.json

@@ -1,7 +1,7 @@
 {
     "beta" : {
         "r_ver" : "v3.4.6-RC3-dev227",
-        "c_ver" : "3500364",
+        "c_ver" : "3500365",
         "s_ver" : "3500111"
     }
 }