From b76177b1e7d4bf5a347030f7745cd06a6b72279c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 15 May 2014 17:15:31 +0530 Subject: [PATCH] Merged language patch with another patch global_defaults_to_system_settings --- frappe/patches.txt | 1 - .../v4_0/set_language_in_system_settings.py | 24 ------------------- 2 files changed, 25 deletions(-) delete mode 100644 frappe/patches/v4_0/set_language_in_system_settings.py diff --git a/frappe/patches.txt b/frappe/patches.txt index 1ba701174d..3c8dbd23bd 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -28,6 +28,5 @@ frappe.patches.v4_0.deprecate_control_panel frappe.patches.v4_0.file_manager_hooks execute:frappe.get_doc("User", "Guest").save() frappe.patches.v4_0.deprecate_link_selects -frappe.patches.v4_0.set_language_in_system_settings frappe.patches.v4_0.set_user_gravatar frappe.patches.v4_0.update_custom_field_insert_after diff --git a/frappe/patches/v4_0/set_language_in_system_settings.py b/frappe/patches/v4_0/set_language_in_system_settings.py deleted file mode 100644 index 8c9b2e43d0..0000000000 --- a/frappe/patches/v4_0/set_language_in_system_settings.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -from __future__ import unicode_literals -import frappe -from collections import Counter -from frappe.core.doctype.user.user import STANDARD_USERS - -def execute(): - if frappe.db.get_value("System Settings", "System Settings", "language"): - return - - # find most common language - lang = frappe.db.sql_list("""select language from `tabUser` - where ifnull(language, '')!='' and language not like "Loading%%" and name not in ({standard_users})""".format( - standard_users=", ".join(["%s"]*len(STANDARD_USERS))), tuple(STANDARD_USERS)) - lang = Counter(lang).most_common(1) - lang = (len(lang) > 0) and lang[0][0] or "english" - - # set language in System Settings - system_settings = frappe.get_doc("System Settings") - system_settings.language = lang - system_settings.ignore_mandatory = True - system_settings.save()