Skip to content

This may be the best solution. maint: Use babel.Locale and babel.format_decimal for deprecations #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pupitetris wants to merge 1 commit into
base: master
Choose a base branch
from
Open

This may be the best solution. maint: Use babel.Locale and babel.format_decimal for deprecations #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions tkfilebrowser/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

Constants and functions
"""
import locale
from babel.numbers import format_number
from babel import Locale
from babel.numbers import format_decimal
from babel.dates import format_date, format_datetime
from datetime import datetime
import os
Expand Down Expand Up @@ -79,10 +79,7 @@
IM_RECENT_24 = os.path.join(PATH, "images", "recent_24.png")

# --- translation
try:
LANG = locale.getdefaultlocale()[0]
except ValueError:
LANG = 'en'
LOCALE = Locale.default('LC_MESSAGES')

EN = {}
FR = {"B": "octets", "MB": "Mo", "kB": "ko", "GB": "Go", "TB": "To",
Expand All @@ -95,8 +92,8 @@
"Shortcuts": "Raccourcis", "Save As": "Enregistrer sous",
"Recent": "Récents", "Recently used": "Récemment utilisés"}
LANGUAGES = {"fr": FR, "en": EN}
if LANG[:2] == "fr":
TR = LANGUAGES["fr"]
if LOCALE.language in LANGUAGES:
TR = LANGUAGES[LOCALE.language]
else:
TR = LANGUAGES["en"]

Expand All @@ -110,23 +107,23 @@ def _(text):


def locale_date(date=None):
return format_date(date, 'short', locale=LANG)
return format_date(date, 'short', locale=LOCALE)


def locale_datetime(date=None):
return format_datetime(date, 'EEEE HH:mm', locale=LANG)
return format_datetime(date, 'EEEE HH:mm', locale=LOCALE)


def locale_number(nb):
return format_number(nb, locale=LANG)
return format_decimal(nb, locale=LOCALE)


SIZES = [_("B"), _("kB"), _("MB"), _("GB"), _("TB")]

# --- locale settings for dates
TODAY = locale_date()
YEAR = datetime.now().year
DAY = int(format_date(None, 'D', locale=LANG))
DAY = int(format_date(None, 'D', locale=LOCALE))


# --- functions
Expand Down