Merge branch 'master' into dynamic-humanize

.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]

arrow/locales.py

@@ -1724,7 +1724,7 @@ class BulgarianLocale(SlavicBaseLocale):
 
 class UkrainianLocale(SlavicBaseLocale):
 
-    names = ["ua", "uk-ua"]
+    names = ["ua", "uk", "uk-ua"]
 
     past = "{0} тому"
     future = "за {0}"
@@ -3522,7 +3522,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",
@@ -4271,7 +4271,7 @@ class NepaliLocale(Locale):
         "month": "एक महिना",
         "months": "{0} महिना",
         "year": "एक बर्ष",
-        "years": "बर्ष",
+        "years": "{0} बर्ष",
     }
 
     meridians = {"am": "पूर्वाह्न", "pm": "अपरान्ह", "AM": "पूर्वाह्न", "PM": "अपरान्ह"}