diff --git a/frappe/data/languages.txt b/frappe/data/languages.txt index 93b2924123..18c6645192 100644 --- a/frappe/data/languages.txt +++ b/frappe/data/languages.txt @@ -2,7 +2,7 @@ ar العربية bg bǎlgarski bo ལྷ་སའི་སྐད་ bs bosanski -bn বাঙালি +bn বাংলা ca català cs česky da dansk diff --git a/frappe/patches.txt b/frappe/patches.txt index 5f2eea1175..f25f0ac91d 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -96,3 +96,4 @@ execute:frappe.db.sql("delete from tabSessions where user is null") frappe.patches.v6_2.rename_backup_manager execute:frappe.delete_doc("DocType", "Backup Manager") frappe.patches.v6_4.reduce_varchar_length +frappe.patches.v6_4.rename_bengali_language \ No newline at end of file diff --git a/frappe/patches/v5_3/rename_chinese_languages.py b/frappe/patches/v5_3/rename_chinese_languages.py index f70783d2cc..8bc954c04c 100644 --- a/frappe/patches/v5_3/rename_chinese_languages.py +++ b/frappe/patches/v5_3/rename_chinese_languages.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals import frappe +from frappe.translate import rename_language def execute(): language_map = { @@ -8,11 +9,5 @@ def execute(): "中國(繁體)": "正體中文" } - 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 }) + rename_language(old_name, new_name) diff --git a/frappe/patches/v6_4/rename_bengali_language.py b/frappe/patches/v6_4/rename_bengali_language.py new file mode 100644 index 0000000000..dbbcb62f8d --- /dev/null +++ b/frappe/patches/v6_4/rename_bengali_language.py @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals +import frappe +from frappe.translate import rename_language + +def execute(): + rename_language("বাঙালি", "বাংলা") \ No newline at end of file diff --git a/frappe/translate.py b/frappe/translate.py index 89a257382c..8e8ec88a44 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -529,3 +529,11 @@ def deduplicate_messages(messages): def get_bench_dir(): return os.path.join(frappe.__file__, '..', '..', '..', '..') + +def rename_language(old_name, new_name): + language_in_system_settings = frappe.db.get_single_value("System Settings", "language") + if language_in_system_settings == old_name: + frappe.db.set_value("System Settings", "System Settings", "language", new_name) + + frappe.db.sql("""update `tabUser` set language=%(new_name)s where language=%(old_name)s""", + { "old_name": old_name, "new_name": new_name }) \ No newline at end of file