From d1005c45b41b94c7ad8f824ebbaeb878575cc267 Mon Sep 17 00:00:00 2001 From: ayobi Date: Tue, 26 Mar 2024 20:38:28 -0300 Subject: [PATCH 1/4] added account lang change if ja_JP --- microsetta_private_api/api/_account.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/microsetta_private_api/api/_account.py b/microsetta_private_api/api/_account.py index 8d1c1107f..0f278adc4 100644 --- a/microsetta_private_api/api/_account.py +++ b/microsetta_private_api/api/_account.py @@ -101,6 +101,12 @@ def register_account(body, token_info): def read_account(account_id, token_info): acc = _validate_account_access(token_info, account_id) + if acc.language == "ja_JP": + with Transaction() as t: + acct_repo = AccountRepo(t) + acc.language = "en_US" + acct_repo.update_account(acc) + t.commit() return jsonify(acc.to_api()), 200 From bda33de2c01ac2c09c2240db32d07ce0ffdf795c Mon Sep 17 00:00:00 2001 From: ayobi Date: Thu, 28 Mar 2024 14:39:35 -0300 Subject: [PATCH 2/4] changed from hard to soft language change --- microsetta_private_api/api/_account.py | 6 ------ microsetta_private_api/model/account.py | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/microsetta_private_api/api/_account.py b/microsetta_private_api/api/_account.py index 0f278adc4..8d1c1107f 100644 --- a/microsetta_private_api/api/_account.py +++ b/microsetta_private_api/api/_account.py @@ -101,12 +101,6 @@ def register_account(body, token_info): def read_account(account_id, token_info): acc = _validate_account_access(token_info, account_id) - if acc.language == "ja_JP": - with Transaction() as t: - acct_repo = AccountRepo(t) - acc.language = "en_US" - acct_repo.update_account(acc) - t.commit() return jsonify(acc.to_api()), 200 diff --git a/microsetta_private_api/model/account.py b/microsetta_private_api/model/account.py index a42f03ec9..a7d1b02dc 100644 --- a/microsetta_private_api/model/account.py +++ b/microsetta_private_api/model/account.py @@ -61,6 +61,9 @@ def __init__(self, account_id, email, self.creation_time = creation_time self.update_time = update_time self.language = language + if (self.language == "ja_JP"): + self.language = "en_US" + language = self.language self.consent_privacy_terms = consent_privacy_terms def to_api(self): From 92a1ee0f33e5f48727ed8414f423d9f87078913f Mon Sep 17 00:00:00 2001 From: ayobi Date: Thu, 28 Mar 2024 15:15:33 -0300 Subject: [PATCH 3/4] added language change jp to en for sending emails --- microsetta_private_api/tasks.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/microsetta_private_api/tasks.py b/microsetta_private_api/tasks.py index 152c631d3..6e3ef228a 100644 --- a/microsetta_private_api/tasks.py +++ b/microsetta_private_api/tasks.py @@ -8,7 +8,7 @@ from microsetta_private_api.repo.transaction import Transaction from microsetta_private_api.repo.admin_repo import AdminRepo from microsetta_private_api.repo.qiita_repo import QiitaRepo -from microsetta_private_api.localization import EN_US +from microsetta_private_api.localization import EN_US, JA_JP from microsetta_private_api.config_manager import SERVER_CONFIG import pandas as pd import tempfile @@ -22,6 +22,8 @@ @celery.task(ignore_result=True) def send_email(email, template_name, template_args, language): template = EmailMessage[template_name] + if language == JA_JP: + language = EN_US with flask_babel.force_locale(language): SendEmail.send(email, template, template_args) From 63c6c575c6466e16885224adc928ccba28d32616 Mon Sep 17 00:00:00 2001 From: ayobi Date: Fri, 26 Apr 2024 14:34:49 -0400 Subject: [PATCH 4/4] changed to using constants, removed useless line --- microsetta_private_api/model/account.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/microsetta_private_api/model/account.py b/microsetta_private_api/model/account.py index a7d1b02dc..fb54f68e4 100644 --- a/microsetta_private_api/model/account.py +++ b/microsetta_private_api/model/account.py @@ -1,6 +1,7 @@ from enum import Enum from microsetta_private_api.model.model_base import ModelBase from microsetta_private_api.model.address import Address +from microsetta_private_api.localization import EN_US, JA_JP class AuthorizationMatch(Enum): @@ -61,9 +62,8 @@ def __init__(self, account_id, email, self.creation_time = creation_time self.update_time = update_time self.language = language - if (self.language == "ja_JP"): - self.language = "en_US" - language = self.language + if (self.language == JA_JP): + self.language = EN_US self.consent_privacy_terms = consent_privacy_terms def to_api(self):