Merge branch 'develop'

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "5.3.0"
+__version__ = "5.3.1"

frappe/desk/form/utils.py

@@ -144,7 +144,9 @@ def get_linked_docs(doctype, name, metadata_loaded=None, no_metadata=False):
 						filters=[[dt, link.get("fieldname"), '=', name]])
 
 			except frappe.PermissionError:
-				frappe.local.message_log.pop()
+				if frappe.local.message_log:
+					frappe.local.message_log.pop()
+
 				continue
 
 			if ret:

frappe/hooks.py

@@ -26,7 +26,7 @@ to ERPNext.
 """
 
 app_icon = "octicon octicon-circuit-board"
-app_version = "5.3.0"
+app_version = "5.3.1"
 app_color = "orange"
 github_link = "https://github.com/frappe/frappe"
 

frappe/patches.txt

@@ -84,3 +84,4 @@ frappe.patches.v5_0.expire_old_scheduler_logs
 execute:frappe.permissions.reset_perms("DocType")
 execute:frappe.db.sql("delete from `tabProperty Setter` where `property` = 'idx'")
 frappe.patches.v5_2.change_checks_to_not_null
+frappe.patches.v5_3.rename_chinese_languages

frappe/patches/v5_3/rename_chinese_languages.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	language_map = {
+		"中国（简体）": "簡體中文",
+		"中國（繁體）": "正體中文"
+	}
+
+	language_in_system_settings = frappe.db.get_single_value("System Settings", "language")
+	if language_in_system_settings in language_map:
+		new_language_name = language_map[language_in_system_settings]
+		frappe.db.set_value("System Settings", "System Settings", "language", new_language_name)
+
+	for old_name, new_name in language_map.items():
+		frappe.db.sql("""update `tabUser` set language=%(new_name)s where language=%(old_name)s""",
+			{ "old_name": old_name, "new_name": new_name })

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "5.3.0"
+version = "5.3.1"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()