Ensure countries and provinces/states are translated

@@ -37,21 +37,34 @@ function selectOpts(array $options, $selected = null, $echo = true)
  */
 function selectOptsProvinces($selected = null)
 {
-    $return = '<option>'.__('Select a State/Province', CBV_DOMAIN).'</option>';
+    $provinces = Vars::$provinces;
+    array_walk(
+        $provinces,
+        function (&$provincesOrStates) {
+            array_walk(
+                $provincesOrStates,
+                function (&$provinceOrState) {
+                    $provinceOrState = tz_($provinceOrState);
+                }
+            );
+        }
+    );
 
-    $return .= '<optgroup label="Canada">';
-    $return .= selectOpts(Vars::$provinces['CA'], $selected, false);
-    $return .= '</optgroup>';
+    $output = '<option>'.__('Select a State/Province', CBV_DOMAIN).'</option>';
 
-    $return .= '<optgroup label="United States">';
-    $return .= selectOpts(Vars::$provinces['US'], $selected, false);
-    $return .= '</optgroup>';
+    $output .= '<optgroup label="Canada">';
+    $output .= selectOpts($provinces['CA'], $selected, false);
+    $output .= '</optgroup>';
 
-    $return .= '<optgroup label="Other">';
-    $return .= '<option value="other">'.__('Outside Canada/USA', CBV_DOMAIN).'</option>';
-    $return .= '</optgroup>';
+    $output .= '<optgroup label="United States">';
+    $output .= selectOpts($provinces['US'], $selected, false);
+    $output .= '</optgroup>';
 
-    return $return;
+    $output .= '<optgroup label="Other">';
+    $output .= '<option value="other">'.__('Outside Canada/USA', CBV_DOMAIN).'</option>';
+    $output .= '</optgroup>';
+
+    return $output;
 }
 
 /**
@@ -78,17 +91,6 @@ function selectOptsCards($selected = null, $echo = true)
  *
  * @return string
  */
-function selectOptsStates($selected = null, $echo = true)
-{
-    return selectOpts(Vars::$states, $selected, $echo);
-}
-
-/**
- * @param null $selected
- * @param bool $echo
- *
- * @return string
- */
 function selectOptsPrefixes($selected = null, $echo = true)
 {
     $prefixes = array_map(
@@ -134,7 +136,15 @@ function selectOptsPrefixesNoBlank($selected = null)
  */
 function selectOptsCountries($selected = null, $echo = true)
 {
-    return selectOpts(Vars::$countries, $selected, $echo);
+    $countries = Vars::$countries;
+    array_walk(
+        $countries,
+        function (&$country) {
+            $country = tz_($country);
+        }
+    );
+
+    return selectOpts($countries, $selected, $echo);
 }
 
 /**