Skip to content

Commit 13b53e5

Browse files
author
metalmon
committed
Merge remote-tracking branch 'frappe/develop' into develop
2 parents dc8a648 + f65f110 commit 13b53e5

2 files changed

Lines changed: 3 additions & 0 deletions

File tree

frappe/core/doctype/translation/translation.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ def remove_html_from_source(self):
3636

3737
def on_update(self):
3838
clear_user_translation_cache(self.language)
39+
if self.has_value_changed("language") and (doc_before_save := self.get_doc_before_save()):
40+
clear_user_translation_cache(doc_before_save.language)
3941

4042
def on_trash(self):
4143
clear_user_translation_cache(self.language)

frappe/desk/page/setup_wizard/setup_wizard.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,7 @@ frappe.setup.utils = {
672672
slide.get_input("country").on("change", function () {
673673
let data = frappe.setup.data.regional_data;
674674
let country = slide.get_input("country").val();
675+
country = country.replace(/\s*\([^)]*\)/, "");
675676
if (!(country in data.country_info)) return;
676677

677678
let $timezone = slide.get_input("timezone");

0 commit comments

Comments
 (0)