imacat/mia-accounting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 41 Wiki Activity

Replaced the BABEL_DEFAULT_LOCALE configuration variable with the default_locale from the Flask-Babel instance, to get rid of the dependency to the specific configuration variable.

Browse Source
This commit is contained in:
依瑪貓 2023-03-21 22:34:44 +08:00
parent 678d0aa773
commit da92a0b42c
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/accounting/models.py
View File

@ -25,8 +25,8 @@ from datetime import date
from decimal import Decimal from decimal import Decimal
import sqlalchemy as sa import sqlalchemy as sa
from flask import current_app from babel import Locale
from flask_babel import get_locale from flask_babel import get_locale, get_babel
from sqlalchemy import text from sqlalchemy import text
from accounting import db from accounting import db
@ -61,11 +61,11 @@ class BaseAccount(db.Model):
:return: The title in the current locale. :return: The title in the current locale.
""" """
current_locale = str(get_locale()) current_locale: Locale = get_locale()
if current_locale == current_app.config["BABEL_DEFAULT_LOCALE"]: if current_locale == get_babel().instance.default_locale:
return self.title_l10n return self.title_l10n
for l10n in self.l10n: for l10n in self.l10n:
if l10n.locale == current_locale: if l10n.locale == str(current_locale):
return l10n.title return l10n.title
return self.title_l10n return self.title_l10n
@ -171,11 +171,11 @@ class Account(db.Model):
:return: The title in the current locale. :return: The title in the current locale.
""" """
current_locale = str(get_locale()) current_locale: Locale = get_locale()
if current_locale == current_app.config["BABEL_DEFAULT_LOCALE"]: if current_locale == get_babel().instance.default_locale:
return self.title_l10n return self.title_l10n
for l10n in self.l10n: for l10n in self.l10n:
if l10n.locale == current_locale: if l10n.locale == str(current_locale):
return l10n.title return l10n.title
return self.title_l10n return self.title_l10n
@ -189,15 +189,15 @@ class Account(db.Model):
if self.title_l10n is None: if self.title_l10n is None:
self.title_l10n = value self.title_l10n = value
return return
current_locale = str(get_locale()) current_locale: Locale = get_locale()
if current_locale == current_app.config["BABEL_DEFAULT_LOCALE"]: if current_locale == get_babel().instance.default_locale:
self.title_l10n = value self.title_l10n = value
return return
for l10n in self.l10n: for l10n in self.l10n:
if l10n.locale == current_locale: if l10n.locale == str(current_locale):
l10n.title = value l10n.title = value
return return
self.l10n.append(AccountL10n(locale=current_locale, title=value)) self.l10n.append(AccountL10n(locale=str(current_locale), title=value))
@property @property
def is_real(self) -> bool: def is_real(self) -> bool:
@ -381,11 +381,11 @@ class Currency(db.Model):
:return: The name in the current locale. :return: The name in the current locale.
""" """
current_locale = str(get_locale()) current_locale: Locale = get_locale()
if current_locale == current_app.config["BABEL_DEFAULT_LOCALE"]: if current_locale == get_babel().instance.default_locale:
return self.name_l10n return self.name_l10n
for l10n in self.l10n: for l10n in self.l10n:
if l10n.locale == current_locale: if l10n.locale == str(current_locale):
return l10n.name return l10n.name
return self.name_l10n return self.name_l10n
@ -399,15 +399,15 @@ class Currency(db.Model):
if self.name_l10n is None: if self.name_l10n is None:
self.name_l10n = value self.name_l10n = value
return return
current_locale = str(get_locale()) current_locale: Locale = get_locale()
if current_locale == current_app.config["BABEL_DEFAULT_LOCALE"]: if current_locale == get_babel().instance.default_locale:
self.name_l10n = value self.name_l10n = value
return return
for l10n in self.l10n: for l10n in self.l10n:
if l10n.locale == current_locale: if l10n.locale == str(current_locale):
l10n.name = value l10n.name = value
return return
self.l10n.append(CurrencyL10n(locale=current_locale, name=value)) self.l10n.append(CurrencyL10n(locale=str(current_locale), name=value))
@property @property
def is_modified(self) -> bool: def is_modified(self) -> bool: