Switch back to default locale.

Author: barthc

gravity-forms/gw-format-date-merge-tags.php

@@ -34,7 +34,11 @@ public function init() {
 	}
 
 	public function replace_merge_tags( $text, $form, $entry, $url_encode, $esc_html, $nl2br, $format ) {
-		$locale = $this->_args['locale'];
+		$current_locale = determine_locale();
+		$locale         = $this->_args['locale'];
+		if ( $locale ) {
+			switch_to_locale( $locale );
+		}
 
 		preg_match_all( '/{[^{]*?:(\d+(\.\d+)?)(:(.*?))?}/mi', $text, $matches, PREG_SET_ORDER );
 
@@ -71,16 +75,17 @@ public function replace_merge_tags( $text, $form, $entry, $url_encode, $esc_html
 
 			$timestamp = strtotime( sprintf( '%d-%d-%d', $parsed_date['year'], $parsed_date['month'], $parsed_date['day'] ) );
 
-			if ( $locale ) {
-				switch_to_locale( $locale );
-			}
-
 			// phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date
 			$replace = wp_date( $modifier, $timestamp );
 
 			$text = str_replace( $match[0], $replace, $text );
 		}
 
+		// Switch back to default locale.
+		if ( $locale ) {
+			switch_to_locale( $current_locale );
+		}
+
 		return $text;
 	}