Fix _locale regex to allow all valid Intl locales

webgriffe · Jul 23, 2021 · c0f7549 · c0f7549
1 parent accb0fe
commit c0f7549
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@
      resource: "@WebgriffeSyliusTableRateShippingPlugin/Resources/config/shop_routing.yml"
      prefix: /{_locale}
      requirements:
-       _locale: ^[a-z]{2}(?:_[A-Z]{2})?$
+       _locale: ^[A-Za-z]{2,4}(_([A-Za-z]{4}|[0-9]{3}))?(_([A-Za-z]{2}|[0-9]{3}))?$
    
    webgriffe_sylius_table_rate_shipping_plugin_admin:
      resource: "@WebgriffeSyliusTableRateShippingPlugin/Resources/config/admin_routing.yml"

diff --git a/tests/Application/config/routes/webgriffe_sylius_table_rate_shipping_plugin.yaml b/tests/Application/config/routes/webgriffe_sylius_table_rate_shipping_plugin.yaml
@@ -2,7 +2,7 @@ webgriffe_sylius_table_rate_shipping_plugin_shop:
   resource: "@WebgriffeSyliusTableRateShippingPlugin/Resources/config/shop_routing.yml"
   prefix: /{_locale}
   requirements:
-    _locale: ^[a-z]{2}(?:_[A-Z]{2})?$
+    _locale: ^[A-Za-z]{2,4}(_([A-Za-z]{4}|[0-9]{3}))?(_([A-Za-z]{2}|[0-9]{3}))?$
 
 webgriffe_sylius_table_rate_shipping_plugin_admina:
   resource: "@WebgriffeSyliusTableRateShippingPlugin/Resources/config/admin_routing.yml"