From 2ca08e60427392b2eb6a2dd1d72aa37420da7be2 Mon Sep 17 00:00:00 2001 From: Kris Fremen Date: Wed, 11 Aug 2021 22:42:21 -0400 Subject: [PATCH 1/4] Update .pre-commit-config.yaml to newest revisions of hooks. (#1020) Co-authored-by: Anish Nyayachavadi <55898433+anishnya@users.noreply.github.com> --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ac22f4c2..1eac547c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,11 +16,11 @@ repos: - id: check-merge-conflict - id: debug-statements - repo: https://github.com/timothycrosley/isort - rev: 5.9.2 + rev: 5.9.3 hooks: - id: isort - repo: https://github.com/asottile/pyupgrade - rev: v2.21.0 + rev: v2.23.3 hooks: - id: pyupgrade args: [--py36-plus] @@ -34,7 +34,7 @@ repos: - id: rst-directive-colons - id: rst-inline-touching-normal - repo: https://github.com/psf/black - rev: 21.6b0 + rev: 21.7b0 hooks: - id: black args: [--safe, --quiet, --target-version=py36] From df74acdbd4c36a0b1bf7d5d0cbba8c87a826194c Mon Sep 17 00:00:00 2001 From: cyriaka90 Date: Wed, 18 Aug 2021 08:37:15 +0200 Subject: [PATCH 2/4] Add Ukrainian Locale Name Variant (#1025) --- arrow/locales.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arrow/locales.py b/arrow/locales.py index 5a2eaa36..e7871d75 100644 --- a/arrow/locales.py +++ b/arrow/locales.py @@ -1714,7 +1714,7 @@ class BulgarianLocale(SlavicBaseLocale): class UkrainianLocale(SlavicBaseLocale): - names = ["ua", "uk-ua"] + names = ["ua", "uk", "uk-ua"] past = "{0} тому" future = "за {0}" From b1fdaf9ce9b779e636f805d46ef5014132f0a863 Mon Sep 17 00:00:00 2001 From: Anish Nyayachavadi <55898433+anishnya@users.noreply.github.com> Date: Wed, 18 Aug 2021 00:06:37 -0700 Subject: [PATCH 3/4] Added Units to Nepali Years Timeframe (#1024) --- arrow/locales.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arrow/locales.py b/arrow/locales.py index e7871d75..902b1eed 100644 --- a/arrow/locales.py +++ b/arrow/locales.py @@ -4254,7 +4254,7 @@ class NepaliLocale(Locale): "month": "एक महिना", "months": "{0} महिना", "year": "एक बर्ष", - "years": "बर्ष", + "years": "{0} बर्ष", } meridians = {"am": "पूर्वाह्न", "pm": "अपरान्ह", "AM": "पूर्वाह्न", "PM": "अपरान्ह"} From de6062c3992d7a9789dfe631aaa0bbf7e80848ac Mon Sep 17 00:00:00 2001 From: NestorTejero Date: Fri, 20 Aug 2021 07:45:57 +0200 Subject: [PATCH 4/4] 1 for numbers is written as 'un' (#1027) --- arrow/locales.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arrow/locales.py b/arrow/locales.py index 902b1eed..67145b3c 100644 --- a/arrow/locales.py +++ b/arrow/locales.py @@ -3505,7 +3505,7 @@ class CatalanLocale(Locale): "now": "Ara mateix", "second": "un segon", "seconds": "{0} segons", - "minute": "1 minut", + "minute": "un minut", "minutes": "{0} minuts", "hour": "una hora", "hours": "{0} hores",