Skip to content

Commit

Permalink
Replaced windows incompatible char
Browse files Browse the repository at this point in the history
When pip installing under windows the char 0xe9 doesn't decode. This should fix python-pendulum#381
  • Loading branch information
Vegemash committed Jul 2, 2019
1 parent 0962a6e commit a690dd1
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2015 Sébastien Eustace
Copyright (c) 2015 Sebastien Eustace

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Licensed under the MIT license:
# http://www.opensource.org/licenses/MIT-license
# Copyright (c) 2015 Sébastien Eustace
# Copyright (c) 2015 Sebastien Eustace

PENDULUM_RELEASE := $$(sed -n -E "s/VERSION = \"(.+)\"/\1/p" pendulum/version.py)

Expand Down
2 changes: 1 addition & 1 deletion pendulum/locales/es/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Relative time
"ago": "hace {0}",
"from_now": "dentro de {0}",
"after": "{0} después",
"after": "{0} despues",
"before": "{0} antes",
# Ordinals
"ordinal": {"other": "º"},
Expand Down
4 changes: 2 additions & 2 deletions pendulum/locales/es/locale.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
0: "dom.",
1: "lun.",
2: "mar.",
3: "mié.",
3: "mie.",
4: "jue.",
5: "vie.",
6: "sáb.",
Expand All @@ -30,7 +30,7 @@
0: "domingo",
1: "lunes",
2: "martes",
3: "miércoles",
3: "miercoles",
4: "jueves",
5: "viernes",
6: "sábado",
Expand Down
8 changes: 4 additions & 4 deletions pendulum/locales/fr/locale.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"months": {
"abbreviated": {
1: "janv.",
2: "févr.",
2: "fevr.",
3: "mars",
4: "avr.",
5: "mai",
Expand All @@ -49,7 +49,7 @@
9: "sept.",
10: "oct.",
11: "nov.",
12: "déc.",
12: "dec.",
},
"narrow": {
1: "J",
Expand All @@ -67,7 +67,7 @@
},
"wide": {
1: "janvier",
2: "février",
2: "fevrier",
3: "mars",
4: "avril",
5: "mai",
Expand All @@ -77,7 +77,7 @@
9: "septembre",
10: "octobre",
11: "novembre",
12: "décembre",
12: "decembre",
},
},
"units": {
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "pendulum"
version = "2.0.4"
description = "Python datetimes made easy"
authors = ["Sébastien Eustace <sebastien@eustace.io>"]
authors = ["Sebastien Eustace <sebastien@eustace.io>"]
license = "MIT"

readme = 'README.rst'
Expand Down
2 changes: 1 addition & 1 deletion tests/date/test_strings.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def test_repr():

def test_format_with_locale():
d = pendulum.Date(1975, 12, 25)
expected = u"jeudi 25e jour de décembre 1975"
expected = u"jeudi 25e jour de decembre 1975"
assert d.format("dddd Do [jour de] MMMM YYYY", locale="fr") == expected


Expand Down
2 changes: 1 addition & 1 deletion tests/datetime/test_strings.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def test_repr():

def test_format_with_locale():
d = pendulum.datetime(1975, 12, 25, 14, 15, 16, tz="local")
expected = u"jeudi 25e jour de décembre 1975 02:15:16 PM -05:00"
expected = u"jeudi 25e jour de decembre 1975 02:15:16 PM -05:00"
assert d.format("dddd Do [jour de] MMMM YYYY hh:mm:ss A Z", locale="fr") == expected


Expand Down
2 changes: 1 addition & 1 deletion tests/localization/test_es.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def diff_for_humans():

d = pendulum.now().add(seconds=1)
d2 = pendulum.now()
assert d.diff_for_humans(d2, locale=locale) == "unos segundos después"
assert d.diff_for_humans(d2, locale=locale) == "unos segundos despues"
assert d2.diff_for_humans(d, locale=locale) == "unos segundos antes"

assert d.diff_for_humans(d2, True, locale=locale) == "unos segundos"
Expand Down

0 comments on commit a690dd1

Please sign in to comment.