Merge branch '1.5'

* 1.5: Use flags macro Use flags macro Use flags macro Better matching of country for locale Add filter to get country for locale Skip test if HWIOAuthBundle is not installed Update test_services.xml
Sylius · Jul 26, 2019 · ceac2b7 · ceac2b7
2 parents a0017c4 + 5a3f78f
commit ceac2b7
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Resources/views/Macro/flags.html.twig b/Resources/views/Macro/flags.html.twig
@@ -4,5 +4,10 @@
 
 {% macro fromLocaleCode(locale_code) %}
     {% import _self as flags %}
-    {{ flags.fromCountryCode(locale_code|slice(-2)) }}
-{% endmacro %}
+
+    {% set country_code = locale_code|sylius_locale_country %}
+
+    {% if country_code %}
+        {{ flags.fromCountryCode(country_code) }}
+    {% endif %}
+{% endmacro %}