Skip to content

Commit

Permalink
fix translate keep_formatting (#720)
Browse files Browse the repository at this point in the history
  • Loading branch information
noviluni committed Oct 31, 2022
1 parent 6e8a132 commit 8023f91
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
3 changes: 2 additions & 1 deletion dateparser/languages/locale.py
Expand Up @@ -137,7 +137,8 @@ def translate(self, date_string, keep_formatting=False, settings=None):
date_string_tokens[i] = pattern.sub(replacement, word)
else:
if word in dictionary:
date_string_tokens[i] = dictionary[word] or ''
fallback = word if keep_formatting and not word.isalpha() else ''
date_string_tokens[i] = dictionary[word] or fallback
if "in" in date_string_tokens:
date_string_tokens = self._clear_future_words(date_string_tokens)

Expand Down
20 changes: 19 additions & 1 deletion tests/test_languages.py
@@ -1,11 +1,13 @@
from io import StringIO

import logging

import pytest
from parameterized import parameterized, param

from dateparser.languages import default_loader, Locale
from dateparser.languages.validation import LanguageValidator
from dateparser.conf import apply_settings
from dateparser.conf import apply_settings, settings
from dateparser.search.detection import AutoDetectLanguage, ExactLanguages
from dateparser.utils import normalize_unicode
from dateparser import parse
Expand All @@ -17,6 +19,22 @@
from tests import BaseTestCase


class TestLocaleTranslation:

@pytest.mark.parametrize("date_string,expected,locale,keep_formatting", [
('December 04, 1999, 11:04:59 PM', 'december 04, 1999, 11:04:59 pm', 'en', True),
('December 04, 1999, 11:04:59 PM', 'december 04 1999 11:04:59 pm', 'en', False),
('23 März, 18:37', '23 march, 18:37', 'de', True),
('23 März 18:37', '23 march 18:37', 'de', False),
])
def test_keep_formatting(self, date_string, expected, locale, keep_formatting):
result = default_loader.get_locale(locale).translate(
date_string=date_string, keep_formatting=keep_formatting, settings=settings
)
print(result)
assert expected == result


class TestBundledLanguages(BaseTestCase):
def setUp(self):
super().setUp()
Expand Down

0 comments on commit 8023f91

Please sign in to comment.